]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/command_parse.cpp
Fix for parameters which contain a colon (which is not the first char in the string)
[user/henk/code/inspircd.git] / src / command_parse.cpp
index 3f8e87989bbba8c0dfcbe4353eaa7175dc0b9073..7febff972904d059b40235ae35e101e5f6b17f27 100644 (file)
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "configreader.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <time.h>
-#include <string>
-#include <sstream>
-#include <vector>
-#include <sched.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
+#include <algorithm>
 #include "users.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
-#include "mode.h"
-#include "commands.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
 #include "socketengine.h"
 #include "userprocess.h"
 #include "socket.h"
-#include "dns.h"
-#include "typedefs.h"
 #include "command_parse.h"
-#include "ctables.h"
-
 #define nspace __gnu_cxx
 
-extern InspIRCd* ServerInstance;
+/*       XXX Serious WTFness XXX
+ *
+ * Well, unless someone invents a wildcard or
+ * regexp #include, and makes it a standard,
+ * we're stuck with this way of including all
+ * the commands.
+ */
+
+#include "commands/cmd_admin.h"
+#include "commands/cmd_away.h"
+#include "commands/cmd_commands.h"
+#include "commands/cmd_connect.h"
+#include "commands/cmd_die.h"
+#include "commands/cmd_eline.h"
+#include "commands/cmd_gline.h"
+#include "commands/cmd_info.h"
+#include "commands/cmd_invite.h"
+#include "commands/cmd_ison.h"
+#include "commands/cmd_join.h"
+#include "commands/cmd_kick.h"
+#include "commands/cmd_kill.h"
+#include "commands/cmd_kline.h"
+#include "commands/cmd_links.h"
+#include "commands/cmd_list.h"
+#include "commands/cmd_loadmodule.h"
+#include "commands/cmd_lusers.h"
+#include "commands/cmd_map.h"
+#include "commands/cmd_modules.h"
+#include "commands/cmd_motd.h"
+#include "commands/cmd_names.h"
+#include "commands/cmd_nick.h"
+#include "commands/cmd_notice.h"
+#include "commands/cmd_oper.h"
+#include "commands/cmd_part.h"
+#include "commands/cmd_pass.h"
+#include "commands/cmd_ping.h"
+#include "commands/cmd_pong.h"
+#include "commands/cmd_privmsg.h"
+#include "commands/cmd_qline.h"
+#include "commands/cmd_quit.h"
+#include "commands/cmd_rehash.h"
+#include "commands/cmd_restart.h"
+#include "commands/cmd_rules.h"
+#include "commands/cmd_server.h"
+#include "commands/cmd_squit.h"
+#include "commands/cmd_stats.h"
+#include "commands/cmd_summon.h"
+#include "commands/cmd_time.h"
+#include "commands/cmd_topic.h"
+#include "commands/cmd_trace.h"
+#include "commands/cmd_unloadmodule.h"
+#include "commands/cmd_user.h"
+#include "commands/cmd_userhost.h"
+#include "commands/cmd_users.h"
+#include "commands/cmd_version.h"
+#include "commands/cmd_wallops.h"
+#include "commands/cmd_who.h"
+#include "commands/cmd_whois.h"
+#include "commands/cmd_whowas.h"
+#include "commands/cmd_zline.h"
+
+bool InspIRCd::ULine(const char* server)
+{
+       if (!server)
+               return false;
+       if (!*server)
+               return true;
+
+       return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
+}
+
+int InspIRCd::OperPassCompare(const char* data,const char* input)
+{
+       int MOD_RESULT = 0;
+       FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data,input))
+       Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
+       if (MOD_RESULT == 1)
+               return 0;
+       if (MOD_RESULT == -1)
+               return 1;
+       Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
+       return strcmp(data,input);
+}
+
+long InspIRCd::Duration(const char* str)
+{
+       char n_field[MAXBUF];
+       long total = 0;
+       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 += 's';
+               return Duration(n.c_str());
+       }
+       
+       for (char* i = (char*)str; *i; 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'))
+               {
+                       strlcat(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;
+}
+
+/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
+
+bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
+{
+       char buffer[MAXBUF];
+       char itrigger[MAXBUF];
+       long matches = 0;
+       
+       if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
+               strlcpy(itrigger,"95.5",MAXBUF);
+       
+       if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
+               return false;
+       
+       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+       {
+               strlcpy(buffer,u->second->ident,MAXBUF);
+               charlcat(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 InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
+{
+       char itrigger[MAXBUF];
+       long matches = 0;
+       
+       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
+               strlcpy(itrigger,"95.5",MAXBUF);
+       
+       if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
+               return false;
+       
+       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+       {
+               if (match(u->second->GetIPString(),ip.c_str(),true))
+                       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 InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
+{
+       char itrigger[MAXBUF];
+       long matches = 0;
+       
+       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
+               strlcpy(itrigger,"95.5",MAXBUF);
+       
+       if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
+               return false;
 
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern std::vector<InspSocket*> module_sockets;
-extern std::vector<userrec*> local_users;
+       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;
+}
 
-extern int MODCOUNT;
-extern InspSocket* socket_ref[MAX_DESCRIPTORS];
-extern time_t TIME;
 
-// This table references users by file descriptor.
-// its an array to make it VERY fast, as all lookups are referenced
-// by an integer, meaning there is no need for a scan/search operation.
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
-extern Server* MyServer;
-extern ServerConfig *Config;
 
-extern user_hash clientlist;
-extern chan_hash chanlist;
 
 /* Special commands which may occur without registration of the user */
 cmd_user* command_user;
@@ -89,7 +271,7 @@ cmd_pass* command_pass;
  * Therefore, we need to deal with both lists concurrently. The first instance of this method does that by creating
  * two instances of irc::commasepstream and reading them both together until the first runs out of tokens.
  * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc.
- * Both will only parse until they reach Config->MaxTargets number of targets, to stop abuse via spam.
+ * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
  */
 int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
 {
@@ -110,7 +292,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
         * which called us, for every parameter pair until there are
         * no more left to parse.
         */
-       while (((item = items1.GetToken()) != "") && (max++ < Config->MaxTargets))
+       while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
        {
                std::string extrastuff = items2.GetToken();
                parameters[splithere] = item.c_str();
@@ -137,7 +319,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
         * Each token we parse out, call the command handler that called us
         * with it
         */
-       while (((item = items1.GetToken()) != "") && (max++ < Config->MaxTargets))
+       while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
        {
                parameters[splithere] = item.c_str();
                CommandObj->Handle(parameters,pcnt,user);
@@ -161,7 +343,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
                        {
                                if (n->second->flags_needed)
                                {
-                                       return ((user->HasPermission(commandname)) || (is_uline(user->server)));
+                                       return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server)));
                                }
                                return true;
                        }
@@ -212,8 +394,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
        while (((para[items] = tokens.GetToken()) != "") && (items < 127))
                command_p[items] = para[items++].c_str();
 
-       for (std::string::iterator makeupper = command.begin(); makeupper != command.end(); makeupper++)
-               *makeupper = toupper(*makeupper);
+       std::transform(command.begin(), command.end(), command.begin(), ::toupper);
                
        int MOD_RESULT = 0;
        FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false));
@@ -228,38 +409,32 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                if (user)
                {
                        /* activity resets the ping pending timer */
-                       user->nping = TIME + user->pingmax;
+                       user->nping = ServerInstance->Time() + user->pingmax;
                        if (cm->second->flags_needed)
                        {
                                if (!user->IsModeSet(cm->second->flags_needed))
                                {
-                                       WriteServ(user->fd,"481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
+                                       user->WriteServ("481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
+                                       return;
+                               }
+                               if (!user->HasPermission(command))
+                               {
+                                       user->WriteServ("481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
                                        return;
                                }
-                       }
-                       if ((cm->second->flags_needed) && (!user->HasPermission(command)))
-                       {
-                               WriteServ(user->fd,"481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
-                               return;
                        }
                        if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled()))
                        {
                                /* command is disabled! */
-                               WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command.c_str());
+                               user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
                                return;
                        }
                        if (items < cm->second->min_params)
                        {
+                               user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
                                /* If syntax is given, display this as the 461 reply */
-                               if (cm->second->syntax.length())
-                               {
-                                       WriteServ(user->fd,"461 %s %s :Not enough parameters.", user->nick, command.c_str())
-                                       /* Use RPL_TEXT for this */
-                                       if (Config->SyntaxHints)
-                                               WriteServ(user->fd,"304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
-                               }
-                               else
-                                       WriteServ(user->fd,"461 %s %s :Not enough parameters", user->nick, command.c_str());
+                               if ((ServerInstance->Config->SyntaxHints) && (cm->second->syntax.length()))
+                                       user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
                                return;
                        }
                        if ((user->registered == REG_ALL) || (cm->second == command_user) || (cm->second == command_nick) || (cm->second == command_pass))
@@ -284,7 +459,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                        }
                        else
                        {
-                               WriteServ(user->fd,"451 %s :You have not registered",command.c_str());
+                               user->WriteServ("451 %s :You have not registered",command.c_str());
                                return;
                        }
                }
@@ -292,7 +467,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
        else if (user)
        {
                ServerInstance->stats->statsUnknown++;
-               WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command.c_str());
+               user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
        }
 }
 
@@ -309,7 +484,7 @@ bool CommandParser::RemoveCommands(const char* source)
                        command_t* x = i->second;
                        if (x->source == std::string(source))
                        {
-                               log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str());
+                               ServerInstance->Log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str());
                                cmdlist.erase(i);
                                go_again = true;
                                break;
@@ -327,14 +502,14 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
        if (!user)
                return;
 
-       while ((a = buffer.find("\n")) != std::string::npos)
+       while ((a = buffer.rfind("\n")) != std::string::npos)
                buffer.erase(a);
-       while ((a = buffer.find("\r")) != std::string::npos)
+       while ((a = buffer.rfind("\r")) != std::string::npos)
                buffer.erase(a);
 
        if (buffer.length())
        {
-               log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
+               ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
                this->ProcessCommand(user,buffer);
        }
 }
@@ -345,13 +520,13 @@ bool CommandParser::CreateCommand(command_t *f)
        if (cmdlist.find(f->command) == cmdlist.end())
        {
                cmdlist[f->command] = f;
-               log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
+               ServerInstance->Log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
                return true;
        }
        else return false;
 }
 
-CommandParser::CommandParser()
+CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
 {
        this->SetupCommandTable();
 }
@@ -362,63 +537,64 @@ void CommandParser::SetupCommandTable()
         * full user registration) and so are saved
         * for later use.
         */
-       command_user = new cmd_user;
-       command_nick = new cmd_nick;
-       command_pass = new cmd_pass;
+       command_user = new cmd_user(ServerInstance);
+       command_nick = new cmd_nick(ServerInstance);
+       command_pass = new cmd_pass(ServerInstance);
        this->CreateCommand(command_user);
        this->CreateCommand(command_nick);
        this->CreateCommand(command_pass);
 
        /* The rest of these arent special. boo hoo.
         */
-       this->CreateCommand(new cmd_quit);
-       this->CreateCommand(new cmd_version);
-       this->CreateCommand(new cmd_ping);
-       this->CreateCommand(new cmd_pong);
-       this->CreateCommand(new cmd_admin);
-       this->CreateCommand(new cmd_privmsg);
-       this->CreateCommand(new cmd_info);
-       this->CreateCommand(new cmd_time);
-       this->CreateCommand(new cmd_whois);
-       this->CreateCommand(new cmd_wallops);
-       this->CreateCommand(new cmd_notice);
-       this->CreateCommand(new cmd_join);
-       this->CreateCommand(new cmd_names);
-       this->CreateCommand(new cmd_part);
-       this->CreateCommand(new cmd_kick);
-       this->CreateCommand(new cmd_mode);
-       this->CreateCommand(new cmd_topic);
-       this->CreateCommand(new cmd_who);
-       this->CreateCommand(new cmd_motd);
-       this->CreateCommand(new cmd_rules);
-       this->CreateCommand(new cmd_oper);
-       this->CreateCommand(new cmd_list);
-       this->CreateCommand(new cmd_die);
-       this->CreateCommand(new cmd_restart);
-       this->CreateCommand(new cmd_kill);
-       this->CreateCommand(new cmd_rehash);
-       this->CreateCommand(new cmd_lusers);
-       this->CreateCommand(new cmd_stats);
-       this->CreateCommand(new cmd_userhost);
-       this->CreateCommand(new cmd_away);
-       this->CreateCommand(new cmd_ison);
-       this->CreateCommand(new cmd_summon);
-       this->CreateCommand(new cmd_users);
-       this->CreateCommand(new cmd_invite);
-       this->CreateCommand(new cmd_trace);
-       this->CreateCommand(new cmd_whowas);
-       this->CreateCommand(new cmd_connect);
-       this->CreateCommand(new cmd_squit);
-       this->CreateCommand(new cmd_modules);
-       this->CreateCommand(new cmd_links);
-       this->CreateCommand(new cmd_map);
-       this->CreateCommand(new cmd_kline);
-       this->CreateCommand(new cmd_gline);
-       this->CreateCommand(new cmd_zline);
-       this->CreateCommand(new cmd_qline);
-       this->CreateCommand(new cmd_eline);
-       this->CreateCommand(new cmd_loadmodule);
-       this->CreateCommand(new cmd_unloadmodule);
-       this->CreateCommand(new cmd_server);
-       this->CreateCommand(new cmd_commands);
+       this->CreateCommand(new cmd_quit(ServerInstance));
+       this->CreateCommand(new cmd_version(ServerInstance));
+       this->CreateCommand(new cmd_ping(ServerInstance));
+       this->CreateCommand(new cmd_pong(ServerInstance));
+       this->CreateCommand(new cmd_admin(ServerInstance));
+       this->CreateCommand(new cmd_privmsg(ServerInstance));
+       this->CreateCommand(new cmd_info(ServerInstance));
+       this->CreateCommand(new cmd_time(ServerInstance));
+       this->CreateCommand(new cmd_whois(ServerInstance));
+       this->CreateCommand(new cmd_wallops(ServerInstance));
+       this->CreateCommand(new cmd_notice(ServerInstance));
+       this->CreateCommand(new cmd_join(ServerInstance));
+       this->CreateCommand(new cmd_names(ServerInstance));
+       this->CreateCommand(new cmd_part(ServerInstance));
+       this->CreateCommand(new cmd_kick(ServerInstance));
+       this->CreateCommand(new cmd_mode(ServerInstance));
+       this->CreateCommand(new cmd_topic(ServerInstance));
+       this->CreateCommand(new cmd_who(ServerInstance));
+       this->CreateCommand(new cmd_motd(ServerInstance));
+       this->CreateCommand(new cmd_rules(ServerInstance));
+       this->CreateCommand(new cmd_oper(ServerInstance));
+       this->CreateCommand(new cmd_list(ServerInstance));
+       this->CreateCommand(new cmd_die(ServerInstance));
+       this->CreateCommand(new cmd_restart(ServerInstance));
+       this->CreateCommand(new cmd_kill(ServerInstance));
+       this->CreateCommand(new cmd_rehash(ServerInstance));
+       this->CreateCommand(new cmd_lusers(ServerInstance));
+       this->CreateCommand(new cmd_stats(ServerInstance));
+       this->CreateCommand(new cmd_userhost(ServerInstance));
+       this->CreateCommand(new cmd_away(ServerInstance));
+       this->CreateCommand(new cmd_ison(ServerInstance));
+       this->CreateCommand(new cmd_summon(ServerInstance));
+       this->CreateCommand(new cmd_users(ServerInstance));
+       this->CreateCommand(new cmd_invite(ServerInstance));
+       this->CreateCommand(new cmd_trace(ServerInstance));
+       this->CreateCommand(new cmd_whowas(ServerInstance));
+       this->CreateCommand(new cmd_connect(ServerInstance));
+       this->CreateCommand(new cmd_squit(ServerInstance));
+       this->CreateCommand(new cmd_modules(ServerInstance));
+       this->CreateCommand(new cmd_links(ServerInstance));
+       this->CreateCommand(new cmd_map(ServerInstance));
+       this->CreateCommand(new cmd_kline(ServerInstance));
+       this->CreateCommand(new cmd_gline(ServerInstance));
+       this->CreateCommand(new cmd_zline(ServerInstance));
+       this->CreateCommand(new cmd_qline(ServerInstance));
+       this->CreateCommand(new cmd_eline(ServerInstance));
+       this->CreateCommand(new cmd_loadmodule(ServerInstance));
+       this->CreateCommand(new cmd_unloadmodule(ServerInstance));
+       this->CreateCommand(new cmd_server(ServerInstance));
+       this->CreateCommand(new cmd_commands(ServerInstance));
 }
+