Merge default.

--HG--
branch : shroudtrusts

chanserv/chancmds/addchan.c

@@ -37,7 +37,7 @@ int csc_doaddchan(void *source, int cargc, char **cargv) {
   reguser *founder;
   flag_t flags;
   short type=0;
-  unsigned int i;
+  unsigned int i, count;
   void *args[3];
 
   if (!rup)
@@ -102,7 +102,19 @@ int csc_doaddchan(void *source, int cargc, char **cargv) {
       chanservstdmessage(notify, QM_ALREADYREGISTERED, cip->name->content);
     return CMD_ERROR;
   }
-
+
+  count = 0;
+
+  for (rcup=founder->knownon;rcup;rcup=rcup->nextbyuser)
+    count++; 
+
+  if (count > MAXCHANNELS) {
+    chanservstdmessage(sender, QM_TOOMANYCHANNELS, cip->name->content);
+    if (notify)
+      chanservstdmessage(sender, QM_TOOMANYCHANNELS, cip->name->content);
+    return CMD_ERROR;
+  }
+
   /* Initialise the channel */ 
   rcp=getregchan();
 

chanserv/chancmds/adduser.c

@@ -33,12 +33,12 @@
 int csc_doadduser(void *source, int cargc, char **cargv) {
   nick *sender=source;
   chanindex *cip;
-  regchanuser *rcup, *rcuplist;
+  regchanuser *rcup, *trcup, *rcuplist;
   regchan *rcp;
   reguser *rup;
   flag_t addflags;
   char *flagbuf;
-  unsigned int count=0;
+  unsigned int chanlevcount=0, channelcount=0;
   int added=0;
   int i, foundflags=0;
   void *args[3];
@@ -82,9 +82,9 @@ int csc_doadduser(void *source, int cargc, char **cargv) {
   flagbuf=printflags(addflags, rcuflags);  
 
   /* ugh */
-  for (count=i=0;i<REGCHANUSERHASHSIZE;i++)
+  for (chanlevcount=i=0;i<REGCHANUSERHASHSIZE;i++)
     for (rcuplist=rcp->regusers[i];rcuplist;rcuplist=rcuplist->nextbychan)
-      count++;
+      chanlevcount++;
 
   /* If we found flags don't try to add them as a user as well.. */
   for (i=1+foundflags;i<cargc;i++) {
@@ -96,12 +96,21 @@ int csc_doadduser(void *source, int cargc, char **cargv) {
       continue;
     }
 
-    if(count++ >= MAXCHANLEVS) {
+    if(chanlevcount++ >= MAXCHANLEVS) {
       chanservstdmessage(sender, QM_TOOMANYCHANLEVS);
       chanservstdmessage(sender, QM_DONE);
       return CMD_OK;
     }
 
+    channelcount=0;
+    for (trcup=rup->knownon;trcup;trcup=trcup->nextbyuser)
+      channelcount++;
+
+    if(channelcount >= MAXCHANNELS) {
+      chanservstdmessage(sender, QM_TOOMANYCHANNELS);
+      return CMD_ERROR;
+    }
+
     rcup=getregchanuser();
     rcup->chan=rcp;
     rcup->user=rup;

chanserv/chancmds/chanlev.c

@@ -90,7 +90,7 @@ int csc_dochanlev(void *source, int cargc, char **cargv) {
   nick *sender=source;
   chanindex *cip;
   regchan *rcp;
-  regchanuser *rcup, *rcuplist;
+  regchanuser *rcup, *trcup, *rcuplist;
   regchanuser **rusers;
   reguser *rup=getreguserfromnick(sender), *target;
   char time1[TIMELEN],time2[TIMELEN];
@@ -267,17 +267,26 @@ int csc_dochanlev(void *source, int cargc, char **cargv) {
 
       if (!rcuplist) {
         /* new user, we could store a count instead... that's probably better... */
-        unsigned int count;
+        unsigned int chanlevcount, channelcount;
 
-        for (count=i=0;i<REGCHANUSERHASHSIZE;i++)
+        for (chanlevcount=i=0;i<REGCHANUSERHASHSIZE;i++)
           for (rcuplist=rcp->regusers[i];rcuplist;rcuplist=rcuplist->nextbychan)
-            count++;
+            chanlevcount++;
 
-        if(count >= MAXCHANLEVS) {
+        if(chanlevcount >= MAXCHANLEVS) {
           chanservstdmessage(sender, QM_TOOMANYCHANLEVS);
           return CMD_ERROR;
         }
-
+
+        channelcount=0;
+        for (trcup=target->knownon;trcup;trcup=trcup->nextbyuser)
+          channelcount++;
+
+        if(channelcount >= MAXCHANNELS) {
+          chanservstdmessage(sender, QM_TOOMANYCHANNELS);
+          return CMD_ERROR;
+        } 
+
 	rcuplist=getregchanuser();
 	rcuplist->user=target;
 	rcuplist->chan=rcp;

chanserv/chanserv.h

@@ -113,6 +113,9 @@
 #define MAXCHANLEVS  500
 #define MAXBANS      50
 
+/* Maximum number of channels a user may be known on */
+#define MAXCHANNELS  500
+
 /* Sources of entropy and standard length defines */
 #define ENTROPYSOURCE "/dev/urandom"
 #define ENTROPYLEN    8

chanserv/chanserv_messages.h

@@ -56,6 +56,7 @@ BeginMessages() {
   msg(QM_NOCHANBANAUTOREMOVE, "Bans on $0 will not be automatically removed.", "s"),
   msg(QM_INVALIDCHANNAME, "$0 is not a valid channel name.", "s"),
   msg(QM_ALREADYREGISTERED, "$0 is already registered.", "s"),
+  msg(QM_TOOMANYCHANNELS, "User is known on too many channels.", ""),
   msg(QM_CURUSERFLAGS, "User flags for $0: $1", "ss"),
   msg(QM_WELCOMEMESSAGEIS, "Welcome message for $0: $1", "ss"),
   msg(QM_GLOBALINFO, "Default info line: $0", "s"),

invalidbans/Makefile.in

@@ -0,0 +1,6 @@
+@include@ @includel@../build.mk@includel@
+
+.PHONY: all
+all: invalidbans.so
+
+invalidbans.so: invalidbans.o

invalidbans/invalidbans.c

@@ -0,0 +1,149 @@
+#include <string.h>
+#include "../core/schedule.h"
+#include "../control/control.h"
+#include "../lib/irc_string.h"
+#include "../localuser/localuserchannel.h"
+#include "../lib/version.h"
+
+MODULE_VERSION("");
+
+static int ib_nickext;
+
+typedef struct ibnick {
+  time_t timeout;
+  void *sched;
+} ibnick;
+
+static void ib_clear_ext(void *arg) {
+  nick *np = arg;
+
+  if (!np->exts[ib_nickext])
+    return;
+
+  free(np->exts[ib_nickext]);
+  np->exts[ib_nickext] = NULL;
+}
+
+static void ib_hook_newnick(int hooknum, void *arg) {
+  nick *np = arg;
+  np->exts[ib_nickext] = NULL;
+}
+
+static void ib_hook_lostnick(int hooknum, void *arg) {
+  nick *np = arg;
+  ibnick *inp = np->exts[ib_nickext];
+
+  if (!inp)
+    return;
+
+  deleteschedule(inp->sched, ib_clear_ext, np);
+  free(np->exts[ib_nickext]);
+}
+
+static void ib_hook_modechange(int hooknum, void *arg) {
+  void **arglist=(void **)arg;
+  channel *cp=(channel *)arglist[0];
+  nick *np=(nick *)arglist[1];
+  long changeflags=(long)arglist[2];
+  chanban *cbp;
+  const char *p;
+  int colons, colonsnext;
+  modechanges changes;
+  ibnick *inp;
+  char *mask, *pos;
+  int slot, i;
+  array bans;
+
+  if (!(changeflags & MODECHANGE_BANS))
+    return;
+
+  inp = np->exts[ib_nickext];
+
+  /* Ignore the mode change if the same user has recently
+   * set/unset a channel ban. */
+  if (inp && inp->timeout > time(NULL))
+    return;
+
+  if (inp) {
+    deleteschedule(inp->sched, ib_clear_ext, np);
+    free(inp);
+    np->exts[ib_nickext] = NULL;
+  }
+
+  array_init(&bans, 512);
+
+  for (cbp = cp->bans; cbp; cbp = cbp->next) {
+    if (!cbp->host)
+      continue;
+
+    colons = 0;
+    colonsnext = 0;
+
+    for (p = cbp->host->content; *p; p++) {
+      if (*p == ':') {
+        colons++;
+
+        if (*(p + 1) == ':')
+          colonsnext = 1;
+      }
+    }
+
+    if (colons - colonsnext >= 8) {
+      slot = array_getfreeslot(&bans);
+      mask = ((char *)bans.content) + slot * 512;
+      strncpy(mask, bantostring(cbp), 512);
+    }
+  }
+
+  if (bans.cursi > 0) {
+    localsetmodeinit(&changes, cp, NULL);
+
+    for (i = 0; i < bans.cursi; i++) {
+      mask = ((char *)bans.content) + i * 512;
+
+      pos = strchr(mask, '@');
+
+      if (!pos)
+        continue; /* This should never happen. */
+
+      pos++; /* Skip over the @ sign. */
+
+      for (; *pos; pos++) {
+        if (*pos != ':') {
+          *pos = '?';
+          break;
+        }
+      }
+
+      localdosetmode_ban(&changes, mask, MCB_ADD);
+    }
+
+    localsetmodeflush(&changes, 1);
+
+    /* Ignore the user for a short amount of time. If it's a bot
+     * it'll probably try re-setting the ban immediately. */
+    inp = malloc(sizeof(ibnick));
+    inp->timeout = time(NULL) + 15;
+    inp->sched = scheduleoneshot(inp->timeout + 1, ib_clear_ext, np);
+    np->exts[ib_nickext] = inp;
+  }
+
+  array_free(&bans);
+}
+
+void _init() {
+  registerhook(HOOK_NICK_NEWNICK, &ib_hook_newnick);
+  registerhook(HOOK_NICK_LOSTNICK, &ib_hook_lostnick);
+  registerhook(HOOK_CHANNEL_MODECHANGE, &ib_hook_modechange);
+
+  ib_nickext = registernickext("invalidbans");
+}
+
+void _fini () {
+  deregisterhook(HOOK_NICK_NEWNICK, &ib_hook_newnick);
+  deregisterhook(HOOK_NICK_LOSTNICK, &ib_hook_lostnick);
+  deregisterhook(HOOK_CHANNEL_MODECHANGE, &ib_hook_modechange);
+
+  releasenickext(ib_nickext);
+}
+

nick/nickhandlers.c

@@ -128,10 +128,6 @@ int handlenickmsg(void *source, int cargc, char **cargv) {
     }
 
     base64toip(cargv[cargc-3], &ipaddress);
-    if (!irc_in_addr_valid(&ipaddress)) {
-      Error("nick",ERR_ERROR,"Received NICK with invalid ipaddress for %s from %s.",cargv[0],sender);
-      return CMD_ERROR;
-    }
 
     /* At this stage the nick is cleared to proceed */
     np=newnick();

request/Makefile.in

@@ -6,4 +6,4 @@ LDFLAGS+=$(LIBPGSQL)
 .PHONY: all
 all: request.so
 
-request.so: lrequest.o request.o request_block.o sqrequest.o user.o 
+request.so: lrequest.o request.o request_block.o request_fasttrack.o sqrequest.o