]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/commands.cpp
Fixed an 'unknown token' alert when QLine triggered by services
[user/henk/code/inspircd.git] / src / commands.cpp
index f8a410dc892259e977c70f79d3b800ff60b0f03a..d5ec4307c6c04092b65e8a84e84675afa89bd4a1 100644 (file)
@@ -33,6 +33,7 @@
 #include "wildcard.h"
 #include "message.h"
 #include "mode.h"
+#include "xline.h"
 
 #ifdef GCC3
 #define nspace __gnu_cxx
@@ -86,6 +87,12 @@ extern serverrec* me[32];
 
 extern FILE *log_file;
 
+const long duration_m = 60;
+const long duration_h = duration_m * 60;
+const long duration_d = duration_h * 24;
+const long duration_w = duration_d * 7;
+const long duration_y = duration_w * 52;
+
 namespace nspace
 {
        template<> struct nspace::hash<in_addr>
@@ -1066,8 +1073,28 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
                parameters[0][1] = '\0';
        }
 
+       if (!strcmp(parameters[0],"k"))
+       {
+               stats_k(user);
+       }
+
+       if (!strcmp(parameters[0],"g"))
+       {
+               stats_g(user);
+       }
+
+       if (!strcmp(parameters[0],"q"))
+       {
+               stats_q(user);
+       }
+
+       if (!strcmp(parameters[0],"Z"))
+       {
+               stats_z(user);
+       }
+
        /* stats m (list number of times each command has been used, plus bytecount) */
-       if (!strcasecmp(parameters[0],"m"))
+       if (!strcmp(parameters[0],"m"))
        {
                for (int i = 0; i < cmdlist.size(); i++)
                {
@@ -1084,7 +1111,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
        }
 
        /* stats z (debug and memory info) */
-       if (!strcasecmp(parameters[0],"z"))
+       if (!strcmp(parameters[0],"z"))
        {
                WriteServ(user->fd,"249 %s :Users(HASH_MAP) %d (%d bytes, %d buckets)",user->nick,clientlist.size(),clientlist.size()*sizeof(userrec),clientlist.bucket_count());
                WriteServ(user->fd,"249 %s :Channels(HASH_MAP) %d (%d bytes, %d buckets)",user->nick,chanlist.size(),chanlist.size()*sizeof(chanrec),chanlist.bucket_count());
@@ -1097,7 +1124,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
        }
        
        /* stats o */
-       if (!strcasecmp(parameters[0],"o"))
+       if (!strcmp(parameters[0],"o"))
        {
                for (int i = 0; i < ConfValueEnum("oper",&config_f); i++)
                {
@@ -1112,7 +1139,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
        }
        
        /* stats l (show user I/O stats) */
-       if (!strcasecmp(parameters[0],"l"))
+       if (!strcmp(parameters[0],"l"))
        {
                WriteServ(user->fd,"211 %s :server:port nick bytes_in cmds_in bytes_out cmds_out",user->nick);
                for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
@@ -1130,7 +1157,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
        }
        
        /* stats u (show server uptime) */
-       if (!strcasecmp(parameters[0],"u"))
+       if (!strcmp(parameters[0],"u"))
        {
                time_t current_time = 0;
                current_time = time(NULL);
@@ -1360,6 +1387,12 @@ void handle_nick(char **parameters, int pcnt, userrec *user)
                                *parameters[0]++;
                        }
                }
+               if (matches_qline(parameters[0]))
+               {
+                       WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0]));
+                       WriteServ(user->fd,"432 %s %s :Invalid nickname: %s",user->nick,parameters[0],matches_qline(parameters[0]));
+                       return;
+               }
                if ((Find(parameters[0])) && (Find(parameters[0]) != user))
                {
                        WriteServ(user->fd,"433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
@@ -1374,6 +1407,13 @@ void handle_nick(char **parameters, int pcnt, userrec *user)
 
        if (user->registered == 7)
        {
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(OnUserPreNick(user,parameters[0]));
+               if (MOD_RESULT) {
+                       // if a module returns true, the nick change is silently forbidden.
+                       return;
+               }
+
                WriteCommon(user,"NICK %s",parameters[0]);
                
                // Q token must go to ALL servers!!!
@@ -1400,7 +1440,6 @@ void handle_nick(char **parameters, int pcnt, userrec *user)
                /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
                ConnectUser(user);
        }
-       log(DEBUG,"exit nickchange: %s",user->nick);
 }
 
 
@@ -1664,6 +1703,19 @@ void handle_n(char token,char* params,serverrec* source,serverrec* reply, char*
                WriteCommon(user,"NICK %s",newnick);
                if (is_uline(tcp_host))
                {
+                       int MOD_RESULT = 0;
+                       FOREACH_RESULT(OnUserPreNick(user,newnick));
+                       if (MOD_RESULT) {
+                               // if a module returns true, the nick change couldnt be allowed
+                               kill_link(user,"Nickname collision");
+                               return;
+                       }
+                       if (matches_qline(newnick))
+                       {
+                               kill_link(user,"Nickname collision");
+                               return;
+                       }
+       
                        // broadcast this because its a services thingy
                        char buffer[MAXBUF];
                        snprintf(buffer,MAXBUF,"n %s %s",user->nick,newnick);
@@ -1714,6 +1766,15 @@ void handle_AT(char token,char* params,serverrec* source,serverrec* reply, char*
        }
 }
 
+void handle_H(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host)
+{
+       log(DEBUG,"Adding ULined server %s to my map",params);
+       ircd_connector s;
+       s.SetState(STATE_DISCONNECTED);
+       s.SetServerName(params);
+       source->connectors.push_back(s);
+       WriteOpers("Non-Mesh server %s has joined the network",params);
+}
 
 void handle_N(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host)
 {
@@ -1828,6 +1889,12 @@ void handle_R(char token,char* params,serverrec* source,serverrec* reply, char*
 {
        char* server = strtok(params," ");
        char* data = strtok(NULL,"\r\n");
+       if ((!data) || (!server))
+       {
+               log(DEBUG,"Someones playing silly buggers, attempting to send to a null server or send a null message (BUG?)");
+               return;
+       }
+               
        log(DEBUG,"Forwarded packet '%s' to '%s'",data,server);
        NetSendToOne(server,data);
 }
@@ -1917,6 +1984,7 @@ void handle_dollar(char token,char* params,serverrec* source,serverrec* reply, c
 void handle_amp(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host)
 {
        log(DEBUG,"Netsplit! %s split from mesh, removing!",params);
+       WriteOpers("*** NOTICE - Controlled netsplit: %s split from %s",params,ServerName);
        bool go_again = true;
        while (go_again)
        {
@@ -1963,6 +2031,131 @@ void handle_amp(char token,char* params,serverrec* source,serverrec* reply, char
 
 long authcookie;
 
+void handle_hash(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host)
+{
+       // # <mask> <who-set-it> <time-set> <duration> :<reason>
+       log(DEBUG,"Adding G-line");
+       char* mask = strtok(params," ");
+       char* who = strtok(NULL," ");
+       char* create_time = strtok(NULL," ");
+       char* duration = strtok(NULL," :");
+       char* reason = strtok(NULL,"\r\n");
+       add_gline(atoi(duration),who,reason,mask);
+       // we must update the creation time on this gline
+       // now that we've added it, or it wont expire at the right time.
+       gline_set_creation_time(mask,atoi(create_time));
+       if (!atoi(duration))
+       {
+               WriteOpers("*** %s Added permenant G-Line on %s.",who,mask);
+       }
+       else
+       {
+               WriteOpers("*** %s Added timed G-Line on %s to expire in %d seconds.",who,mask,atoi(duration));
+       }
+       apply_lines();
+}
+
+void handle_dot(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host)
+{
+       log(DEBUG,"Removing G-line");
+       char* mask = strtok(params," ");
+       char* who = strtok(NULL," ");
+       if (mask)
+       {
+               if (del_gline(mask))
+               {
+                       if (who)
+                       {
+                               WriteOpers("*** %s Removed G-line on %s.",who,mask);
+                       }
+               }
+       }
+}
+
+void handle_add_sqline(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host)
+{
+       // { <mask> <who-set-it> <time-set> <duration> :<reason>
+       log(DEBUG,"Adding Q-line");
+       char* mask = strtok(params," ");
+       char* who = strtok(NULL," ");
+       char* create_time = strtok(NULL," ");
+       char* duration = strtok(NULL," :");
+       char* reason = strtok(NULL,"\r\n");
+       add_qline(atoi(duration),who,reason,mask);
+       // we must update the creation time on this gline
+       // now that we've added it, or it wont expire at the right time.
+       qline_set_creation_time(mask,atoi(create_time));
+       qline_make_global(mask);
+       if (!atoi(duration))
+       {
+               WriteOpers("*** %s Added permenant Q-Line on %s.",who,mask);
+       }
+       else
+       {
+               WriteOpers("*** %s Added timed Q-Line on %s to expire in %d seconds.",who,mask,atoi(duration));
+       }
+       apply_lines();
+}
+
+void handle_del_sqline(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host)
+{
+       log(DEBUG,"Removing Q-line");
+       char* mask = strtok(params," ");
+       char* who = strtok(NULL," ");
+       if (mask)
+       {
+               if (del_qline(mask))
+               {
+                       if (who)
+                       {
+                               WriteOpers("*** %s Removed Q-line on %s.",who,mask);
+                       }
+               }
+       }
+}
+
+void handle_add_szline(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host)
+{
+       // } <mask> <who-set-it> <time-set> <duration> :<reason>
+       log(DEBUG,"Adding Z-line");
+       char* mask = strtok(params," ");
+       char* who = strtok(NULL," ");
+       char* create_time = strtok(NULL," ");
+       char* duration = strtok(NULL," :");
+       char* reason = strtok(NULL,"\r\n");
+       add_zline(atoi(duration),who,reason,mask);
+       // we must update the creation time on this gline
+       // now that we've added it, or it wont expire at the right time.
+       zline_set_creation_time(mask,atoi(create_time));
+       zline_make_global(mask);
+       if (!atoi(duration))
+       {
+               WriteOpers("*** %s Added permenant Z-Line on %s.",who,mask);
+       }
+       else
+       {
+               WriteOpers("*** %s Added timed Z-Line on %s to expire in %d seconds.",who,mask,atoi(duration));
+       }
+       apply_lines();
+}
+
+void handle_del_szline(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host)
+{
+       log(DEBUG,"Removing Z-line");
+       char* mask = strtok(params," ");
+       char* who = strtok(NULL," ");
+       if (mask)
+       {
+               if (del_zline(mask))
+               {
+                       if (who)
+                       {
+                               WriteOpers("*** %s Removed Q-line on %s.",who,mask);
+                       }
+               }
+       }
+}
+
 
 void process_restricted_commands(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host,char* ipaddr,int port)
 {
@@ -2098,6 +2291,11 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                case 'Q':
                        handle_Q(token,params,source,reply,tcp_host);
                break;
+               // H <SERVER>
+               // introduce non-meshable server (such as a services server)
+               case 'H':
+                       handle_H(token,params,source,reply,tcp_host);
+               break;
                // K <SOURCE> <DEST> :<REASON>
                // remote kill
                case 'K':
@@ -2108,6 +2306,36 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                case '@':
                        handle_AT(token,params,source,reply,tcp_host);
                break;
+               // # <mask> <who-set-it> <time-set> <duration> :<reason>
+               // add gline
+               case '#':
+                       handle_hash(token,params,source,reply,tcp_host);
+               break;
+               // . <mask> <who>
+               // remove gline
+               case '.':
+                       handle_dot(token,params,source,reply,tcp_host);
+               break;
+               // # <mask> <who-set-it> <time-set> <duration> :<reason>
+               // add gline
+               case '{':
+                       handle_add_sqline(token,params,source,reply,tcp_host);
+               break;
+               // . <mask> <who>
+               // remove gline
+               case '[':
+                       handle_del_sqline(token,params,source,reply,tcp_host);
+               break;
+               // # <mask> <who-set-it> <time-set> <duration> :<reason>
+               // add gline
+               case '}':
+                       handle_add_szline(token,params,source,reply,tcp_host);
+               break;
+               // . <mask> <who>
+               // remove gline
+               case ']':
+                       handle_del_szline(token,params,source,reply,tcp_host);
+               break;
                // F <TS>
                // end netburst
                case 'F':
@@ -2148,6 +2376,13 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
 
 void handle_link_packet(char* udp_msg, char* tcp_host, serverrec *serv)
 {
+       if ((!strncmp(udp_msg,"USER ",5)) || (!strncmp(udp_msg,"NICK ",5)))
+       {
+               // a user on a server port, just close their connection.
+               RemoveServer(tcp_host);
+               return;
+       }
+
        char response[10240];
        char token = udp_msg[0];
        char* old = udp_msg;
@@ -2178,6 +2413,10 @@ void handle_link_packet(char* udp_msg, char* tcp_host, serverrec *serv)
                {
                        token = '*';
                }
+               if (!strcmp(command,"432"))
+               {
+                       token = '*';
+               }
                if (!strcmp(command,"NOTICE"))
                {
                        snprintf(udp_msg,MAXBUF,"V %s %s",source,data);
@@ -2230,6 +2469,20 @@ void handle_link_packet(char* udp_msg, char* tcp_host, serverrec *serv)
                        log(DEBUG,"Rewrote KICK from services to: '%s'",udp_msg);
                        token = udp_msg[0];
                }
+               if (!strcmp(command,"SVSJOIN"))
+               {
+                       snprintf(udp_msg,MAXBUF,"J %s",data);
+                       NetSendToOne(tcp_host,udp_msg);
+                       char* nick = strtok(data," ");
+                       char* chan = strtok(NULL," ");
+                       log(DEBUG,"Rewrote SVSJOIN from services to: '%s'",udp_msg);
+                       userrec* u = Find(nick);
+                       if (u)
+                       {
+                               add_channel(u,chan,"",true);
+                       }
+                       token = udp_msg[0];
+               }
                
        }
 
@@ -2419,6 +2672,7 @@ void handle_link_packet(char* udp_msg, char* tcp_host, serverrec *serv)
                                                        {
                                                                char buffer[MAXBUF];
                                                                me[j]->connectors[k].SetDescription(serverdesc);
+                                                               me[j]->connectors[k].SetState(STATE_CONNECTED);
                                                                sprintf(buffer,"X 0");
                                                                serv->SendPacket(buffer,tcp_host);
                                                                DoSync(me[j],tcp_host);
@@ -2490,6 +2744,9 @@ void handle_link_packet(char* udp_msg, char* tcp_host, serverrec *serv)
                                                                serv->SendPacket(buffer,servername);
                                                                DoSync(me[j],servername);
                                                                NetSendMyRoutingTable();
+                                                               sprintf(buffer,"H %s",servername);
+                                                               NetSendToAllExcept(servername,buffer);
+                                                               WriteOpers("Non-Mesh server %s has joined the network",servername);
                                                                return;
                                                        }
                                                }
@@ -2544,3 +2801,176 @@ void handle_link_packet(char* udp_msg, char* tcp_host, serverrec *serv)
        }
 }
 
+long duration(char* str)
+{
+       char n_field[MAXBUF];
+       long total = 0;
+       char* str_end = str + strlen(str);
+       n_field[0] = 0;
+       
+       for (char* i = str; i < str_end; i++)
+       {
+               // if we have digits, build up a string for the value in n_field,
+               // up to 10 digits in size.
+               if ((*i >= '0') && (*i <= '9'))
+               {
+                       strncat(n_field,i,10);
+               }
+               else
+               {
+                       // we dont have a digit, check for numeric tokens
+                       switch (tolower(*i))
+                       {
+                               case 's':
+                                       total += atoi(n_field);
+                               break;
+
+                               case 'm':
+                                       total += (atoi(n_field)*duration_m);
+                               break;
+
+                               case 'h':
+                                       total += (atoi(n_field)*duration_h);
+                               break;
+
+                               case 'd':
+                                       total += (atoi(n_field)*duration_d);
+                               break;
+
+                               case 'w':
+                                       total += (atoi(n_field)*duration_w);
+                               break;
+
+                               case 'y':
+                                       total += (atoi(n_field)*duration_y);
+                               break;
+                       }
+                       n_field[0] = 0;
+               }
+       }
+       // add trailing seconds
+       total += atoi(n_field);
+       
+       return total;
+}
+
+
+void handle_kline(char **parameters, int pcnt, userrec *user)
+{
+       if (pcnt >= 3)
+       {
+               add_kline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               if (!duration(parameters[1]))
+               {
+                       WriteOpers("*** %s added permenant K-line for %s.",user->nick,parameters[0]);
+               }
+               else
+               {
+                       WriteOpers("*** %s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+               }
+       }
+       else
+       {
+               if (del_kline(parameters[0]))
+               {
+                       WriteOpers("*** %s Removed K-line on %s.",user->nick,parameters[0]);
+               }
+               else
+               {
+                       WriteServ(user->fd,"NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick,parameters[0]);
+               }
+       }
+       apply_lines();
+}
+
+void handle_gline(char **parameters, int pcnt, userrec *user)
+{
+       char netdata[MAXBUF];
+       if (pcnt >= 3)
+       {
+               add_gline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               // # <mask> <who-set-it> <time-set> <duration> :<reason>
+               snprintf(netdata,MAXBUF,"# %s %s %ld %ld :%s",parameters[0],user->nick,time(NULL),duration(parameters[1]),parameters[2]);
+               NetSendToAll(netdata);
+               if (!duration(parameters[1]))
+               {
+                       WriteOpers("*** %s added permenant G-line for %s.",user->nick,parameters[0]);
+               }
+               else
+               {
+                       WriteOpers("*** %s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+               }
+       }
+       else
+       {
+               if (del_gline(parameters[0]))
+               {
+                       // . <mask> <who-removed-it>
+                       snprintf(netdata,MAXBUF,". %s %s",parameters[0],user->nick);
+                       WriteOpers("*** %s Removed G-line on %s.",user->nick,parameters[0]);
+               }
+               else
+               {
+                       WriteServ(user->fd,"NOTICE %s :*** G-Line %s not found in list, try /stats g.",user->nick,parameters[0]);
+               }
+       }
+       apply_lines();
+}
+
+void handle_zline(char **parameters, int pcnt, userrec *user)
+{
+       if (pcnt >= 3)
+       {
+               add_zline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               if (!duration(parameters[1]))
+               {
+                       WriteOpers("*** %s added permenant Z-line for %s.",user->nick,parameters[0]);
+               }
+               else
+               {
+                       WriteOpers("*** %s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+               }
+       }
+       else
+       {
+               if (del_zline(parameters[0]))
+               {
+                       WriteOpers("*** %s Removed Z-line on %s.",user->nick,parameters[0]);
+               }
+               else
+               {
+                       WriteServ(user->fd,"NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,parameters[0]);
+               }
+       }
+       apply_lines();
+}
+
+void handle_qline(char **parameters, int pcnt, userrec *user)
+{
+       if (pcnt >= 3)
+       {
+               add_qline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               if (!duration(parameters[1]))
+               {
+                       WriteOpers("*** %s added permenant Q-line for %s.",user->nick,parameters[0]);
+               }
+               else
+               {
+                       WriteOpers("*** %s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+               }
+       }
+       else
+       {
+               if (del_qline(parameters[0]))
+               {
+                       WriteOpers("*** %s Removed Q-line on %s.",user->nick,parameters[0]);
+               }
+               else
+               {
+                       WriteServ(user->fd,"NOTICE %s :*** Q-Line %s not found in list, try /stats k.",user->nick,parameters[0]);
+               }
+       }
+       apply_lines();
+}
+
+