]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/commands.cpp
Fixed bug #85
[user/henk/code/inspircd.git] / src / commands.cpp
index 81ff9cf00ea0af3e2abfbfe13ca65aa6ac70ad40..a01f3a844283602db77d8bb51ba045885af87f55 100644 (file)
@@ -64,6 +64,7 @@ using namespace std;
 #include "dynamic.h"
 #include "wildcard.h"
 #include "message.h"
+#include "commands.h"
 #include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
@@ -206,7 +207,7 @@ void handle_kick(char **parameters, int pcnt, userrec *user)
                return;
        }
        
-       if (!has_channel(user,Ptr))
+       if ((!has_channel(user,Ptr)) && (!is_uline(user->server)))
        {
                WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, parameters[0]);
                return;
@@ -475,7 +476,7 @@ void handle_topic(char **parameters, int pcnt, userrec *user)
                        {
                                if (((Ptr) && (!has_channel(user,Ptr))) && (Ptr->binarymodes & CM_SECRET))
                                {
-                                       WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
+                                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, Ptr->name);
                                        return;
                                }
                                if (Ptr->topicset)
@@ -562,7 +563,7 @@ void handle_names(char **parameters, int pcnt, userrec *user)
        {
                 if (((c) && (!has_channel(user,c))) && (c->binarymodes & CM_SECRET))
                 {
-                      WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, c->name);
+                      WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, c->name);
                       return;
                 }
                userlist(user,c);
@@ -913,8 +914,7 @@ void handle_quit(char **parameters, int pcnt, userrec *user)
                        }
                        else
                        {
-                               Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,parameters[0]);
-                               WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,parameters[0]);
+                               WriteOpers("*** Client exiting at %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,parameters[0]);
                                WriteCommonExcept(user,"QUIT :%s",parameters[0]);
                        }
                        FOREACH_MOD OnUserQuit(user,std::string(PrefixQuit)+std::string(parameters[0]));
@@ -1347,7 +1347,6 @@ void handle_modules(char **parameters, int pcnt, userrec *user)
 
 void handle_stats(char **parameters, int pcnt, userrec *user)
 {
-       char Link_ServerName[MAXBUF],Link_IPAddr[MAXBUF],Link_Port[MAXBUF];
        if (pcnt != 1)
        {
                return;
@@ -1363,14 +1362,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
 
        if (*parameters[0] == 'c')
        {
-               for (int i = 0; i < ConfValueEnum("link",&config_f); i++)
-               {
-                       ConfValue("link","name",i,Link_ServerName,&config_f);
-                       ConfValue("link","ipaddr",i,Link_IPAddr,&config_f);
-                       ConfValue("link","port",i,Link_Port,&config_f);
-                       WriteServ(user->fd,"213 %s C *@%s * %s %s 0 M",user->nick,Link_IPAddr,Link_ServerName,Link_Port);
-                       WriteServ(user->fd,"244 %s H * * %s",user->nick,Link_ServerName);
-               }
+               /* This stats symbol must be handled by a linking module */
        }
        
        if (*parameters[0] == 'i')
@@ -1395,10 +1387,11 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
 
        if (*parameters[0] == 'U')
        {
+               char ulined[MAXBUF];
                for (int i = 0; i < ConfValueEnum("uline",&config_f); i++)
                {
-                       ConfValue("uline","server",i,Link_ServerName,&config_f);
-                       WriteServ(user->fd,"248 %s U %s",user->nick,Link_ServerName);
+                       ConfValue("uline","server",i,ulined,&config_f);
+                       WriteServ(user->fd,"248 %s U %s",user->nick,ulined);
                }
        }
        
@@ -1804,6 +1797,13 @@ long duration(const char* str)
        long total = 0;
        const char* str_end = str + strlen(str);
        n_field[0] = 0;
+
+       if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y')))
+       {
+               std::string n = str;
+               n = n + "s";
+               return duration(n.c_str());
+       }
        
        for (char* i = (char*)str; i < str_end; i++)
        {
@@ -1851,12 +1851,95 @@ long duration(const char* str)
        return total;
 }
 
+/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
+
+bool host_matches_everyone(std::string mask, userrec* user)
+{
+       char insanemasks[MAXBUF];
+       char buffer[MAXBUF];
+       char itrigger[MAXBUF];
+       ConfValue("insane","hostmasks",0,insanemasks,&config_f);
+       ConfValue("insane","trigger",0,itrigger,&config_f);
+       if (*itrigger == 0)
+               strlcpy(itrigger,"95.5",MAXBUF);
+       if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))
+               return false;
+       long matches = 0;
+       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+       {
+               strlcpy(buffer,u->second->ident,MAXBUF);
+               strlcat(buffer,"@",MAXBUF);
+               strlcat(buffer,u->second->host,MAXBUF);
+               if (match(buffer,mask.c_str()))
+                       matches++;
+       }
+       float percent = ((float)matches / (float)clientlist.size()) * 100;
+       if (percent > (float)atof(itrigger))
+       {
+               WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent);
+               return true;
+       }
+       return false;
+}
+
+bool ip_matches_everyone(std::string ip, userrec* user)
+{
+       char insanemasks[MAXBUF];
+       char itrigger[MAXBUF];
+       ConfValue("insane","ipmasks",0,insanemasks,&config_f);
+       ConfValue("insane","trigger",0,itrigger,&config_f);
+       if (*itrigger == 0)
+               strlcpy(itrigger,"95.5",MAXBUF);
+       if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))
+               return false;
+       long matches = 0;
+       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+       {
+               if (match(u->second->ip,ip.c_str()))
+                       matches++;
+       }
+       float percent = ((float)matches / (float)clientlist.size()) * 100;
+       if (percent > (float)atof(itrigger))
+       {
+               WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent);
+               return true;
+       }
+       return false;
+}
+
+bool nick_matches_everyone(std::string nick, userrec* user)
+{
+       char insanemasks[MAXBUF];
+       char itrigger[MAXBUF];
+       ConfValue("insane","nickmasks",0,insanemasks,&config_f);
+       ConfValue("insane","trigger",0,itrigger,&config_f);
+       if (*itrigger == 0)
+               strlcpy(itrigger,"95.5",MAXBUF);
+       if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))
+               return false;
+       long matches = 0;
+       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+       {
+               if (match(u->second->nick,nick.c_str()))
+                       matches++;
+       }
+       float percent = ((float)matches / (float)clientlist.size()) * 100;
+       if (percent > (float)atof(itrigger))
+       {
+               WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent);
+               return true;
+       }
+       return false;
+}
 
 void handle_kline(char **parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
+               if (host_matches_everyone(parameters[0],user))
+                       return;
                add_kline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               FOREACH_MOD OnAddKLine(duration(parameters[1]), user, parameters[2], parameters[0]);
                if (!duration(parameters[1]))
                {
                        WriteOpers("*** %s added permenant K-line for %s.",user->nick,parameters[0]);
@@ -1870,6 +1953,7 @@ void handle_kline(char **parameters, int pcnt, userrec *user)
        {
                if (del_kline(parameters[0]))
                {
+                       FOREACH_MOD OnDelKLine(user, parameters[0]);
                        WriteOpers("*** %s Removed K-line on %s.",user->nick,parameters[0]);
                }
                else
@@ -1884,7 +1968,10 @@ void handle_eline(char **parameters, int pcnt, userrec *user)
 {
         if (pcnt >= 3)
         {
+               if (host_matches_everyone(parameters[0],user))
+                       return;
                 add_eline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               FOREACH_MOD OnAddELine(duration(parameters[1]), user, parameters[2], parameters[0]);
                 if (!duration(parameters[1]))
                 {
                         WriteOpers("*** %s added permenant E-line for %s.",user->nick,parameters[0]);
@@ -1898,6 +1985,7 @@ void handle_eline(char **parameters, int pcnt, userrec *user)
         {
                 if (del_eline(parameters[0]))
                 {
+                       FOREACH_MOD OnDelELine(user, parameters[0]);
                         WriteOpers("*** %s Removed E-line on %s.",user->nick,parameters[0]);
                 }
                 else
@@ -1910,10 +1998,12 @@ void handle_eline(char **parameters, int pcnt, userrec *user)
 
 void handle_gline(char **parameters, int pcnt, userrec *user)
 {
-       char netdata[MAXBUF];
        if (pcnt >= 3)
        {
+               if (host_matches_everyone(parameters[0],user))
+                       return;
                add_gline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               FOREACH_MOD OnAddGLine(duration(parameters[1]), user, parameters[2], parameters[0]);
                if (!duration(parameters[1]))
                {
                        WriteOpers("*** %s added permenant G-line for %s.",user->nick,parameters[0]);
@@ -1927,8 +2017,7 @@ void handle_gline(char **parameters, int pcnt, userrec *user)
        {
                if (del_gline(parameters[0]))
                {
-                       // . <mask> <who-removed-it>
-                       snprintf(netdata,MAXBUF,". %s %s",parameters[0],user->nick);
+                       FOREACH_MOD OnDelGLine(user, parameters[0]);
                        WriteOpers("*** %s Removed G-line on %s.",user->nick,parameters[0]);
                }
                else
@@ -1943,7 +2032,10 @@ void handle_zline(char **parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
+               if (ip_matches_everyone(parameters[0],user))
+                       return;
                add_zline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               FOREACH_MOD OnAddZLine(duration(parameters[1]), user, parameters[2], parameters[0]);
                if (!duration(parameters[1]))
                {
                        WriteOpers("*** %s added permenant Z-line for %s.",user->nick,parameters[0]);
@@ -1957,6 +2049,7 @@ void handle_zline(char **parameters, int pcnt, userrec *user)
        {
                if (del_zline(parameters[0]))
                {
+                       FOREACH_MOD OnDelZLine(user, parameters[0]);
                        WriteOpers("*** %s Removed Z-line on %s.",user->nick,parameters[0]);
                }
                else
@@ -1971,7 +2064,10 @@ void handle_qline(char **parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
+               if (nick_matches_everyone(parameters[0],user))
+                       return;
                add_qline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               FOREACH_MOD OnAddQLine(duration(parameters[1]), user, parameters[2], parameters[0]);
                if (!duration(parameters[1]))
                {
                        WriteOpers("*** %s added permenant Q-line for %s.",user->nick,parameters[0]);
@@ -1985,6 +2081,7 @@ void handle_qline(char **parameters, int pcnt, userrec *user)
        {
                if (del_qline(parameters[0]))
                {
+                       FOREACH_MOD OnDelQLine(user, parameters[0]);
                        WriteOpers("*** %s Removed Q-line on %s.",user->nick,parameters[0]);
                }
                else