filter: add #defines for nick,user,host

[solanum.git] / extensions / m_webirc.c

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index 1b420291f5d543d2d994eb41ddf5647609b9d009..499c40596df40957fdb4116a89b77df74348b63c 100644 (file)
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_webirc.c 3458 2007-05-18 19:51:22Z jilles $
  */
 /* Usage:
  * auth {
@@ -32,10 +30,9 @@
  * };
  * Possible flags:
  *   encrypted - password is encrypted (recommended)
- *   kline_exempt - k/g lines on the cgiirc ip are ignored
- *   gline_exempt - glines on the cgiirc ip are ignored
+ *   kline_exempt - klines on the cgiirc ip are ignored
  * dlines are checked on the cgiirc ip (of course).
- * k/d/g/x lines, auth blocks, user limits, etc are checked using the
+ * k/d/x lines, auth blocks, user limits, etc are checked using the
  * real host/ip.
  * The password should be specified unencrypted in webirc_password in
  * cgiirc.config
@@ -43,7 +40,7 @@
 
 #include "stdinc.h"
 #include "client.h"            /* client struct */
-#include "irc_string.h"
+#include "match.h"
 #include "hostmask.h"
 #include "send.h"              /* sendto_one */
 #include "numeric.h"           /* ERR_xxx */
@@ -56,85 +53,90 @@
 #include "s_conf.h"
 #include "reject.h"
 
-static int mr_webirc(struct Client *, struct Client *, int, const char **);
+static const char webirc_desc[] = "Adds support for the WebIRC system";
+
+static void mr_webirc(struct MsgBuf *msgbuf_p, struct Client *, struct Client *, int, const char **);
 
 struct Message webirc_msgtab = {
-       "WEBIRC", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
+       "WEBIRC", 0, 0, 0, 0,
        {{mr_webirc, 5}, mg_reg, mg_ignore, mg_ignore, mg_ignore, mg_reg}
 };
 
 mapi_clist_av1 webirc_clist[] = { &webirc_msgtab, NULL };
-DECLARE_MODULE_AV1(webirc, NULL, NULL, webirc_clist, NULL, NULL, "$Revision: 20702 $");
+
+DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, NULL, NULL, NULL, webirc_desc);
 
 /*
  * mr_webirc - webirc message handler
- *      parv[0] = sender prefix
  *      parv[1] = password
  *      parv[2] = fake username (we ignore this)
- *     parv[3] = fake hostname 
+ *     parv[3] = fake hostname
  *     parv[4] = fake ip
  */
-static int
-mr_webirc(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct ConfItem *aconf;
        const char *encr;
+       struct rb_sockaddr_storage addr;
 
-       if (!strchr(parv[4], '.') && !strchr(parv[4], ':'))
-       {
-               sendto_one(source_p, "NOTICE * :Invalid IP");
-               return 0;
-       }
-
-       aconf = find_address_conf(client_p->host, client_p->sockhost, 
+       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,
-                               client_p->localClient->ip.ss_family);
+                               GET_SS_FAMILY(&client_p->localClient->ip), NULL);
        if (aconf == NULL || !(aconf->status & CONF_CLIENT))
-               return 0;
+               return;
        if (!IsConfDoSpoofIp(aconf) || irccmp(aconf->info.name, "webirc."))
        {
                /* XXX */
                sendto_one(source_p, "NOTICE * :Not a CGI:IRC auth block");
-               return 0;
+               return;
        }
        if (EmptyString(aconf->passwd))
        {
                sendto_one(source_p, "NOTICE * :CGI:IRC auth blocks must have a password");
-               return 0;
+               return;
        }
 
        if (EmptyString(parv[1]))
                encr = "";
        else if (IsConfEncrypted(aconf))
-               encr = crypt(parv[1], aconf->passwd);
+               encr = rb_crypt(parv[1], aconf->passwd);
        else
                encr = parv[1];
 
-       if (strcmp(encr, aconf->passwd))
+       if (encr == NULL || strcmp(encr, aconf->passwd))
        {
                sendto_one(source_p, "NOTICE * :CGI:IRC password incorrect");
-               return 0;
+               return;
        }
 
-       strlcpy(source_p->sockhost, parv[4], sizeof(source_p->sockhost));
+       if (rb_inet_pton_sock(parv[4], &addr) <= 0)
+       {
+               sendto_one(source_p, "NOTICE * :Invalid IP");
+               return;
+       }
+
+       source_p->localClient->ip = addr;
+
+       rb_inet_ntop_sock((struct sockaddr *)&source_p->localClient->ip, source_p->sockhost, sizeof(source_p->sockhost));
+
        if(strlen(parv[3]) <= HOSTLEN)
-               strlcpy(source_p->host, parv[3], sizeof(source_p->host));
+               rb_strlcpy(source_p->host, parv[3], sizeof(source_p->host));
        else
-               strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
-
-       rb_inet_pton_sock(parv[4], (struct sockaddr *)&source_p->localClient->ip);
+               rb_strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
 
-       /* Check dlines now, k/glines will be checked on registration */
-       if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip)))
+       /* Check dlines now, klines will be checked on registration */
+       if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip,
+                              GET_SS_FAMILY(&source_p->localClient->ip))))
        {
                if(!(aconf->status & CONF_EXEMPTDLINE))
                {
                        exit_client(client_p, source_p, &me, "D-lined");
-                       return 0;
+                       return;
                }
        }
 
        sendto_one(source_p, "NOTICE * :CGI:IRC host/IP set to %s %s", parv[3], parv[4]);
-       return 0;
 }