Include forward channels when bursting bans to servers.

[solanum.git] / src / chmode.c

diff --git a/src/chmode.c b/src/chmode.c
index 7dd8c14afa61a1b8269ed0c800bba26e0f98aa14..8177b3ec845701a9a818d4205cea545471189dd8 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -465,6 +465,51 @@ pretty_mask(const char *idmask)
        return mask_buf + old_mask_pos;
 }
 
+/* check_forward()
+ *
+ * input       - client, channel to set mode on, target channel name
+ * output      - true if forwarding should be allowed
+ * side effects - numeric sent if not allowed
+ */
+static int
+check_forward(struct Client *source_p, struct Channel *chptr,
+               const char *forward)
+{
+       struct Channel *targptr;
+       struct membership *msptr;
+
+       if(!check_channel_name(forward) ||
+                       (MyClient(source_p) && (strlen(forward) > LOC_CHANNELLEN || hash_find_resv(forward))))
+       {
+               sendto_one_numeric(source_p, ERR_BADCHANNAME, form_str(ERR_BADCHANNAME), forward);
+               return 0;
+       }
+       /* don't forward to inconsistent target -- jilles */
+       if(chptr->chname[0] == '#' && forward[0] == '&')
+       {
+               sendto_one_numeric(source_p, ERR_BADCHANNAME,
+                                  form_str(ERR_BADCHANNAME), forward);
+               return 0;
+       }
+       if(MyClient(source_p) && (targptr = find_channel(forward)) == NULL)
+       {
+               sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
+                                  form_str(ERR_NOSUCHCHANNEL), forward);
+               return 0;
+       }
+       if(MyClient(source_p) && !(targptr->mode.mode & MODE_FREETARGET))
+       {
+               if((msptr = find_channel_membership(targptr, source_p)) == NULL ||
+                       get_channel_access(source_p, msptr) != CHFL_CHANOP)
+               {
+                       sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+                                  me.name, source_p->name, targptr->chname);
+                       return 0;
+               }
+       }
+       return 1;
+}
+
 /* fix_key()
  *
  * input       - key to fix
@@ -805,7 +850,12 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
         * name etc.
         */
        if(strlen(mask) > IRCD_MIN(BANLEN, MODEBUFLEN - 5))
+       {
+               sendto_one_numeric(source_p, ERR_INVALIDBAN,
+                               form_str(ERR_INVALIDBAN),
+                               chptr->chname, c, raw_mask);
                return;
+       }
 
        /* Look for a $ after the first character.
         * As the first character, it marks an extban; afterwards
@@ -824,13 +874,42 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
                if (*mask == '$' && MyClient(source_p))
                {
                        if (!valid_extban(mask, source_p, chptr, mode_type))
-                               /* XXX perhaps return an error message here */
+                       {
+                               sendto_one_numeric(source_p, ERR_INVALIDBAN,
+                                               form_str(ERR_INVALIDBAN),
+                                               chptr->chname, c, raw_mask);
                                return;
+                       }
                }
 
-               if(forward != NULL && !ConfigChannel.use_forward &&
-                               MyClient(source_p))
-                       forward = NULL;
+               /* For compatibility, only check the forward channel from
+                * local clients. Accept any forward channel from servers.
+                */
+               if(forward != NULL && MyClient(source_p))
+               {
+                       /* For simplicity and future flexibility, do not
+                        * allow '$' in forwarding targets.
+                        */
+                       if(!ConfigChannel.use_forward ||
+                                       strchr(forward, '$') != NULL)
+                       {
+                               sendto_one_numeric(source_p, ERR_INVALIDBAN,
+                                               form_str(ERR_INVALIDBAN),
+                                               chptr->chname, c, raw_mask);
+                               return;
+                       }
+                       /* check_forward() sends its own error message */
+                       if(!check_forward(source_p, chptr, forward))
+                               return;
+                       /* Forwards only make sense for bans. */
+                       if(mode_type != CHFL_BAN)
+                       {
+                               sendto_one_numeric(source_p, ERR_INVALIDBAN,
+                                               form_str(ERR_INVALIDBAN),
+                                               chptr->chname, c, raw_mask);
+                               return;
+                       }
+               }
 
                /* dont allow local clients to overflow the banlist, dont
                 * let remote servers set duplicate bans
@@ -862,9 +941,9 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
                }
 
                if(removed && removed->forward)
-                       removed_mask_pos += rb_snprintf(buf, sizeof(buf), "%s$%s", removed->banstr, removed->forward);
+                       removed_mask_pos += rb_snprintf(buf + old_removed_mask_pos, sizeof(buf), "%s$%s", removed->banstr, removed->forward) + 1;
                else
-                       removed_mask_pos += rb_strlcpy(buf, mask, sizeof(buf));
+                       removed_mask_pos += rb_strlcpy(buf + old_removed_mask_pos, mask, sizeof(buf)) + 1;
                if(removed)
                {
                        free_ban(removed);
@@ -1175,8 +1254,6 @@ chm_forward(struct Client *source_p, struct Channel *chptr,
        int alevel, int parc, int *parn,
        const char **parv, int *errors, int dir, char c, long mode_type)
 {
-       struct Channel *targptr = NULL;
-       struct membership *msptr;
        const char *forward;
 
        /* if +f is disabled, ignore local attempts to set it */
@@ -1226,35 +1303,9 @@ chm_forward(struct Client *source_p, struct Channel *chptr,
 
                if(EmptyString(forward))
                        return;
-               if(!check_channel_name(forward) ||
-                               (MyClient(source_p) && (strlen(forward) > LOC_CHANNELLEN || hash_find_resv(forward))))
-               {
-                       sendto_one_numeric(source_p, ERR_BADCHANNAME, form_str(ERR_BADCHANNAME), forward);
-                       return;
-               }
-               /* don't forward to inconsistent target -- jilles */
-               if(chptr->chname[0] == '#' && forward[0] == '&')
-               {
-                       sendto_one_numeric(source_p, ERR_BADCHANNAME,
-                                          form_str(ERR_BADCHANNAME), forward);
-                       return;
-               }
-               if(MyClient(source_p) && (targptr = find_channel(forward)) == NULL)
-               {
-                       sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
-                                          form_str(ERR_NOSUCHCHANNEL), forward);
+
+               if(!check_forward(source_p, chptr, forward))
                        return;
-               }
-               if(MyClient(source_p) && !(targptr->mode.mode & MODE_FREETARGET))
-               {
-                       if((msptr = find_channel_membership(targptr, source_p)) == NULL ||
-                               get_channel_access(source_p, msptr) != CHFL_CHANOP)
-                       {
-                               sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-                                          me.name, source_p->name, targptr->chname);
-                               return;
-                       }
-               }
 
                rb_strlcpy(chptr->mode.forward, forward, sizeof(chptr->mode.forward));