m_echotags: Oops...

[solanum.git] / extensions / m_webirc.c

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index a262da65faa8130a3b30f169f9a0b064056e11b7..5985eec7ab7b2368f7038a79468f7fddc3ede6b8 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 {
@@ -55,10 +53,10 @@
 #include "s_conf.h"
 #include "reject.h"
 
-static int mr_webirc(struct Client *, struct Client *, int, const char **);
+static int 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}
 };
 
@@ -66,25 +64,28 @@ mapi_clist_av1 webirc_clist[] = { &webirc_msgtab, NULL };
 DECLARE_MODULE_AV1(webirc, NULL, NULL, webirc_clist, NULL, NULL, "$Revision: 20702 $");
 
 /*
- * mr_webirc - webirc messages.handler
+ * mr_webirc - webirc message handler
  *      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[])
+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], ':'))
+       if ((!strchr(parv[4], '.') && !strchr(parv[4], ':')) ||
+                       strlen(parv[4]) + (*parv[4] == ':') >=
+                       sizeof(source_p->sockhost))
        {
                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,
@@ -116,18 +117,31 @@ mr_webirc(struct Client *client_p, struct Client *source_p, int parc, const char
                return 0;
        }
 
+       if (rb_inet_pton_sock(parv[4], (struct sockaddr *)&addr) <= 0)
+       {
+               sendto_one(source_p, "NOTICE * :Invalid IP");
+               return 0;
+       }
 
-       rb_strlcpy(source_p->sockhost, parv[4], sizeof(source_p->sockhost));
+       if (*parv[4] == ':')
+       {
+               source_p->sockhost[0] = '0';
+               rb_strlcpy(source_p->sockhost + 1, parv[4],
+                               sizeof(source_p->sockhost) - 1);
+       }
+       else
+               rb_strlcpy(source_p->sockhost, parv[4],
+                               sizeof(source_p->sockhost));
 
        if(strlen(parv[3]) <= HOSTLEN)
                rb_strlcpy(source_p->host, parv[3], sizeof(source_p->host));
        else
                rb_strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
-       
-       rb_inet_pton_sock(parv[4], (struct sockaddr *)&source_p->localClient->ip);
+
+       source_p->localClient->ip = addr;
 
        /* Check dlines now, klines will be checked on registration */
-       if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip, 
+       if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip,
                               source_p->localClient->ip.ss_family)))
        {
                if(!(aconf->status & CONF_EXEMPTDLINE))