Merge pull request #302 from edk0/sasl-usercloak

[solanum.git] / extensions / m_webirc.c

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index 1b48e3cb4dd5ea0fa1633b4f9a57f9434ce037e3..04f59c96ae58babd4558e77806dd7f050c38376e 100644 (file)
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -64,7 +64,13 @@ struct Message webirc_msgtab = {
 
 mapi_clist_av1 webirc_clist[] = { &webirc_msgtab, NULL };
 
-DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, NULL, NULL, NULL, webirc_desc);
+static void new_local_user(void *data);
+mapi_hfn_list_av1 webirc_hfnlist[] = {
+       { "new_local_user", (hookfn) new_local_user },
+       { NULL, NULL }
+};
+
+DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, webirc_hfnlist, NULL, NULL, webirc_desc);
 
 /*
  * mr_webirc - webirc message handler
@@ -80,6 +86,8 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
        const char *encr;
        struct rb_sockaddr_storage addr;
 
+       int secure = 0;
+
        aconf = find_address_conf(client_p->host, client_p->sockhost,
                                IsGotId(client_p) ? client_p->username : "webirc",
                                IsGotId(client_p) ? client_p->username : "webirc",
@@ -100,7 +108,7 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
        }
        if (!IsSSL(source_p) && aconf->flags & CONF_FLAGS_NEED_SSL)
        {
-               sendto_one(source_p, "NOTICE * :Your CGI:IRC block requires SSL");
+               sendto_one(source_p, "NOTICE * :Your CGI:IRC block requires TLS");
                return;
        }
 
@@ -125,6 +133,27 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 
        source_p->localClient->ip = addr;
 
+       if (parc >= 6)
+       {
+               const char *s;
+               for (s = parv[5]; s != NULL; (s = strchr(s, ' ')) && s++)
+               {
+                       if (!ircncmp(s, "secure", 6) && (s[6] == '=' || s[6] == ' ' || s[6] == '\0'))
+                               secure = 1;
+               }
+       }
+
+       if (secure && !IsSSL(source_p))
+       {
+               sendto_one(source_p, "NOTICE * :CGI:IRC is not connected securely; marking you as insecure");
+               secure = 0;
+       }
+
+       if (!secure)
+       {
+               SetInsecure(source_p);
+       }
+
        rb_inet_ntop_sock((struct sockaddr *)&source_p->localClient->ip, source_p->sockhost, sizeof(source_p->sockhost));
 
        if(strlen(parv[3]) <= HOSTLEN)
@@ -145,3 +174,13 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 
        sendto_one(source_p, "NOTICE * :CGI:IRC host/IP set to %s %s", parv[3], parv[4]);
 }
+
+static void
+new_local_user(void *data)
+{
+       struct Client *source_p = data;
+       struct ConfItem *aconf = source_p->localClient->att_conf;
+
+       if (!irccmp(aconf->info.name, "webirc."))
+               exit_client(source_p, source_p, &me, "Cannot log in using a WEBIRC block");
+}