Added cycle_host_change option.

[irc/rqf/shadowircd.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index ca5f74ce8de8a3b342fd79fdaf58979bdf2ab3bf..441012c32f9a2adabe13f8f0886a1677a37a6253 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -68,8 +68,8 @@ int user_modes[256] = {
        /* 0x30 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x3F */
        0,                      /* @ */
        0,                      /* A */
-       0,                      /* B */
-       0,                      /* C */
+       UMODE_BOT,              /* B */
+       UMODE_NOCTCP,           /* C */
        UMODE_DEAF,             /* D */
        0,                      /* E */
        0,                      /* F */
@@ -88,7 +88,7 @@ int user_modes[256] = {
        UMODE_SERVICE,          /* S */
        0,                      /* T */
        0,                      /* U */
-       0,                      /* V */
+       UMODE_NOINVITE,         /* V */
        0,                      /* W */
        0,                      /* X */
        0,                      /* Y */
@@ -420,7 +420,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
           (xconf = find_xline(source_p->info, 1)) != NULL)
        {
                ServerStats.is_ref++;
-               add_reject(source_p, xconf->name, NULL);
+               add_reject(source_p, xconf->host, NULL);
                exit_client(client_p, source_p, &me, "Bad user info");
                return CLIENT_EXITED;
        }
@@ -561,7 +561,9 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
        /* they get a reduced limit */
        if(find_tgchange(source_p->sockhost))
-               USED_TARGETS(source_p) = 6;
+               source_p->localClient->targets_free = TGCHANGE_INITIAL_LOW;
+       else
+               source_p->localClient->targets_free = TGCHANGE_INITIAL;
 
        monitor_signon(source_p);
        user_welcome(source_p);
@@ -589,6 +591,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
        hook_data_umode_changed hdata;
        hook_data_client hdata2;
        char sockhost[HOSTLEN];
+       struct ConfItem *aconf;
 
        if(MyClient(source_p))
                send_umode(source_p, source_p, 0, 0, ubuf);
@@ -633,6 +636,11 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
                      IsIPSpoof(source_p) ? "0" : sockhost,
                      source_p->id, source_p->info);
 
+       if(!EmptyString(source_p->certfp))
+               sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
+                               ":%s ENCAP * CERTFP :%s",
+                               use_id(source_p), source_p->certfp);
+
        if (IsDynSpoof(source_p))
        {
                sendto_server(client_p, NULL, CAP_TS6, use_euid ? CAP_EUID : NOCAPS, ":%s ENCAP * REALHOST %s",
@@ -696,6 +704,17 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
        hdata2.target = source_p;
        call_hook(h_introduce_client, &hdata2);
 
+       /* Do all the auth::autojoin wizardry once we're connected */
+       if(MyConnect(source_p))
+       {
+               aconf = source_p->localClient->att_conf;
+
+               if(aconf->autojoin != NULL)
+               {
+                       user_join(client_p, source_p, aconf->autojoin, NULL);
+               }
+       }
+
        return 0;
 }
 
@@ -712,7 +731,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 int
 valid_hostname(const char *hostname)
 {
-       const char *p = hostname;
+       const char *p = hostname, *last_slash = 0;
        int found_sep = 0;
 
        s_assert(NULL != p);
@@ -720,7 +739,7 @@ valid_hostname(const char *hostname)
        if(hostname == NULL)
                return NO;
 
-       if('.' == *p || ':' == *p)
+       if('.' == *p || ':' == *p || '/' == *p)
                return NO;
 
        while (*p)
@@ -729,13 +748,21 @@ valid_hostname(const char *hostname)
                        return NO;
                 if(*p == '.' || *p == ':')
                        found_sep++;
+               else if(*p == '/')
+               {
+                       found_sep++;
+                       last_slash = p;
+               }
                p++;
        }
 
        if(found_sep == 0)
-               return(NO);
+               return NO;
+
+       if(last_slash && IsDigit(last_slash[1]))
+               return NO;
 
-       return (YES);
+       return YES;
 }
 
 /* 
@@ -854,11 +881,34 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
        }
 }
 
+static void
+show_other_user_mode(struct Client *source_p, struct Client *target_p)
+{
+       int i;
+       char buf[BUFSIZE];
+       char *m;
+
+       m = buf;
+       *m++ = '+';
+
+       for (i = 0; i < 128; i++) /* >= 127 is extended ascii */
+               if (target_p->umodes & user_modes[i])
+                       *m++ = (char) i;
+       *m = '\0';
+
+       if (MyConnect(target_p) && target_p->snomask != 0)
+               sendto_one_notice(source_p, ":Modes for %s are %s %s",
+                               target_p->name, buf,
+                               construct_snobuf(target_p->snomask));
+       else
+               sendto_one_notice(source_p, ":Modes for %s are %s",
+                               target_p->name, buf);
+}
+
 /*
  * user_mode - set get current users mode
  *
  * m_umode() added 15/10/91 By Darren Reed.
- * parv[0] - sender
  * parv[1] - username to change mode for
  * parv[2] - modes to change
  */
@@ -906,7 +956,10 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
        if(source_p != target_p)
        {
-               sendto_one(source_p, form_str(ERR_USERSDONTMATCH), me.name, source_p->name);
+               if (MyOper(source_p) && parc < 3)
+                       show_other_user_mode(source_p, target_p);
+               else
+                       sendto_one(source_p, form_str(ERR_USERSDONTMATCH), me.name, source_p->name);
                return 0;
        }
 
@@ -1240,6 +1293,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 {
        unsigned int old = source_p->umodes, oldsnomask = source_p->snomask;
        hook_data_umode_changed hdata;
+       struct ConfItem *aconf;
 
        SetOper(source_p);
 
@@ -1287,7 +1341,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        call_hook(h_umode_changed, &hdata);
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                            "%s (%s@%s) is now an operator", source_p->name,
+                            "%s (%s!%s@%s) is now an operator", oper_p->name, source_p->name,
                             source_p->username, source_p->host);
        if(!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
                ++Count.invisi;
@@ -1301,6 +1355,18 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        sendto_one_notice(source_p, ":*** Oper privs are %s", oper_p->privset->privs);
        send_oper_motd(source_p);
 
+       aconf = source_p->localClient->att_conf;
+
+       /* Do the auth::autojoin_opers wizardry here */
+       if(aconf->autojoin_opers != NULL)
+       {
+               /* opers should never be banned from the opers channel.
+                * Plus this is post-umode being set so you'll pass +I $o or +O.
+                * Hence why we're making this a normal clean join. --jdhore
+                */
+               user_join(&me, source_p, aconf->autojoin_opers, NULL);
+       }
+
        return (1);
 }
 
@@ -1369,7 +1435,7 @@ change_nick_user_host(struct Client *target_p,    const char *nick, const char *use
        struct membership *mscptr;
        int changed = irccmp(target_p->name, nick);
        int changed_case = strcmp(target_p->name, nick);
-       int do_qjm = irccmp(target_p->username, user) || irccmp(target_p->host, host);
+       int do_qjm = irccmp(target_p->username, user) || (irccmp(target_p->host, host) && ConfigChannel.cycle_host_change);
        char mode[10], modeval[NICKLEN * 2 + 2], reason[256], *mptr;
        va_list ap;