m_shedding: user shedding module based on oftc-hybrid

[solanum.git] / extensions / m_webirc.c

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index 04f59c96ae58babd4558e77806dd7f050c38376e..f999996c03037798540b502e4e6b721aa1030dc7 100644 (file)
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -66,7 +66,8 @@ mapi_clist_av1 webirc_clist[] = { &webirc_msgtab, NULL };
 
 static void new_local_user(void *data);
 mapi_hfn_list_av1 webirc_hfnlist[] = {
-       { "new_local_user", (hookfn) new_local_user },
+       /* unintuitive but correct--we want to be called first */
+       { "new_local_user", new_local_user, HOOK_LOWEST },
        { NULL, NULL }
 };
 
@@ -74,8 +75,8 @@ DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, webirc_hfnlist, NULL,
 
 /*
  * mr_webirc - webirc message handler
- *      parv[1] = password
- *      parv[2] = fake username (we ignore this)
+ *     parv[1] = password
+ *     parv[2] = fake username (we ignore this)
  *     parv[3] = fake hostname
  *     parv[4] = fake ip
  */
@@ -88,27 +89,34 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 
        int secure = 0;
 
+       if (source_p->flags & FLAGS_SENTUSER || !EmptyString(source_p->name))
+       {
+               exit_client(client_p, source_p, &me, "WEBIRC may not follow NICK/USER");
+       }
+
        aconf = find_address_conf(client_p->host, client_p->sockhost,
                                IsGotId(client_p) ? client_p->username : "webirc",
                                IsGotId(client_p) ? client_p->username : "webirc",
                                (struct sockaddr *) &client_p->localClient->ip,
                                GET_SS_FAMILY(&client_p->localClient->ip), NULL);
+
        if (aconf == NULL || !(aconf->status & CONF_CLIENT))
                return;
+
        if (!IsConfDoSpoofIp(aconf) || irccmp(aconf->info.name, "webirc."))
        {
                /* XXX */
-               sendto_one(source_p, "NOTICE * :Not a CGI:IRC auth block");
+               exit_client(client_p, source_p, &me, "Not a CGI:IRC auth block");
                return;
        }
        if (EmptyString(aconf->passwd))
        {
-               sendto_one(source_p, "NOTICE * :CGI:IRC auth blocks must have a password");
+               exit_client(client_p, source_p, &me, "CGI:IRC auth blocks must have a password");
                return;
        }
-       if (!IsSSL(source_p) && aconf->flags & CONF_FLAGS_NEED_SSL)
+       if (!IsSecure(source_p) && aconf->flags & CONF_FLAGS_NEED_SSL)
        {
-               sendto_one(source_p, "NOTICE * :Your CGI:IRC block requires TLS");
+               exit_client(client_p, source_p, &me, "Your CGI:IRC block requires TLS");
                return;
        }
 
@@ -121,17 +129,19 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 
        if (encr == NULL || strcmp(encr, aconf->passwd))
        {
-               sendto_one(source_p, "NOTICE * :CGI:IRC password incorrect");
+               exit_client(client_p, source_p, &me, "CGI:IRC password incorrect");
                return;
        }
 
        if (rb_inet_pton_sock(parv[4], &addr) <= 0)
        {
-               sendto_one(source_p, "NOTICE * :Invalid IP");
+               exit_client(client_p, source_p, &me, "Invalid IP");
                return;
        }
 
        source_p->localClient->ip = addr;
+       source_p->username[0] = '\0';
+       ClearGotId(source_p);
 
        if (parc >= 6)
        {
@@ -143,7 +153,7 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
                }
        }
 
-       if (secure && !IsSSL(source_p))
+       if (secure && !IsSecure(source_p))
        {
                sendto_one(source_p, "NOTICE * :CGI:IRC is not connected securely; marking you as insecure");
                secure = 0;
@@ -151,7 +161,7 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 
        if (!secure)
        {
-               SetInsecure(source_p);
+               ClearSecure(source_p);
        }
 
        rb_inet_ntop_sock((struct sockaddr *)&source_p->localClient->ip, source_p->sockhost, sizeof(source_p->sockhost));
@@ -181,6 +191,9 @@ new_local_user(void *data)
        struct Client *source_p = data;
        struct ConfItem *aconf = source_p->localClient->att_conf;
 
+       if (aconf == NULL)
+               return;
+
        if (!irccmp(aconf->info.name, "webirc."))
                exit_client(source_p, source_p, &me, "Cannot log in using a WEBIRC block");
 }