X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=4a375f3654189cfe598b3c349a02c140ed84d5c1;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=befcde7cabad5d6891a0fab34fba36df346dd54c;hpb=33ed72a1dfae595132dd50c760b6a312ef2ce8fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index befcde7ca..4a375f365 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -26,10 +26,7 @@ #include #include #include -#include -#ifdef THREADED_DNS -#include -#endif +#include #include "users.h" #include "globals.h" #include "modules.h" @@ -40,7 +37,6 @@ #include "commands.h" #include "xline.h" #include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" #include "hashcomp.h" #include "socketengine.h" @@ -51,33 +47,18 @@ #include "command_parse.h" #include "ctables.h" -#ifdef GCC3 #define nspace __gnu_cxx -#else -#define nspace std -#endif - extern InspIRCd* ServerInstance; extern std::vector modules; extern std::vector factory; -extern std::vector module_sockets; -extern std::vector local_users; 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 */ @@ -85,216 +66,72 @@ cmd_user* command_user; cmd_nick* command_nick; cmd_pass* command_pass; -/* This function pokes and hacks at a parameter list like the following: - * - * PART #winbot,#darkgalaxy :m00! - * - * to turn it into a series of individual calls like this: - * - * PART #winbot :m00! - * PART #darkgalaxy :m00! - * - * The seperate calls are sent to a callback function provided by the caller - * (the caller will usually call itself recursively). The callback function - * must be a command handler. Calling this function on a line with no list causes - * no action to be taken. You must provide a starting and ending parameter number - * where the range of the list can be found, useful if you have a terminating - * parameter as above which is actually not part of the list, or parameters - * before the actual list as well. This code is used by many functions which - * can function as "one to list" (see the RFC) */ - -int CommandParser::LoopCall(command_t* fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins) + +/* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list. + * There are two overriden versions of this method, one of which takes two potential lists and the other takes one. + * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once, + * the channel names and their keys as follows: + * JOIN #chan1,#chan2,#chan3 key1,,key3 + * 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 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) { - /* Copy of the parameter list, because like strltok, we make a bit of - * a mess of the parameter string we're given, and we want to keep this - * private. - */ - char paramlist[MAXBUF]; - /* Temporary variable used to hold one split parameter - */ - char *param; - /* Parameter list, we can have up to 32 of these - */ - char *pars[32]; - /* Seperated items, e.g. holds the #one and #two from "#one,#two" - */ - char *sep_items[32]; - /* Seperated keys, holds the 'two' and 'three' of "two,three" - */ - char *sep_keys[32]; - /* Misc. counters, the total values hold the total number of - * seperated items in sep_items (total) and the total number of - * seperated items in sep_keys (total2) - */ - int j = 0, q = 0, total = 0, total2 = 0; - /* A temporary copy of the comma seperated key list (see the description - * of the paramlist variable) + /* First check if we have more than one item in the list, if we don't we return zero here and the handler + * which called us just carries on as it was. */ - char keylist[MAXBUF]; - /* Exactly what it says. Its nothing. We point invalid parameters at this. - */ - char nothing = 0; - - /* First, initialize our arrays */ - for (int i = 0; i < 32; i++) - sep_items[i] = sep_keys[i] = NULL; + if (!strchr(parameters[splithere],',')) + return 0; - /* Now find all parameters that are NULL, maybe above pcnt, - * and for safety, point them at 'nothing' + /* Create two lists, one for channel names, one for keys */ - for (int i = 0; i < 10; i++) - { - if (!parameters[i]) - { - parameters[i] = ¬hing; - } - } - /* Check if we're doing JOIN handling. JOIN has two lists in - * it, potentially, if we have keys, so this is a special-case - * to handle the keys if they are provided. + irc::commasepstream items1(parameters[splithere]); + irc::commasepstream items2(parameters[extra]); + std::string item = ""; + unsigned int max = 0; + + /* Attempt to iterate these lists and call the command objech + * which called us, for every parameter pair until there are + * no more left to parse. */ - if (joins) + while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) { - if (pcnt > 1) /* we have a key to copy */ - { - strlcpy(keylist,parameters[1],MAXBUF); - } + std::string extrastuff = items2.GetToken(); + parameters[splithere] = item.c_str(); + parameters[extra] = extrastuff.c_str(); + CommandObj->Handle(parameters,pcnt,user); } + return 1; +} - /* There's nothing to split! We don't do anything +int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere) +{ + /* First check if we have more than one item in the list, if we don't we return zero here and the handler + * which called us just carries on as it was. */ - if (!parameters[start] || (!strchr(parameters[start],','))) - { + if (!strchr(parameters[splithere],',')) return 0; - } - /* This function can handle multiple comma seperated - * lists as one, which is a feature no actual commands - * have yet -- this is futureproofing in case we encounter - * a command that does. - */ - *paramlist = 0; - - for (int i = start; i <= end; i++) - { - if (parameters[i]) - { - strlcat(paramlist,parameters[i],MAXBUF); - } - } - - /* Now we split off paramlist into seperate parameters using - * pointer voodoo, this parameter list goes into sep_items - */ - j = 0; - param = paramlist; - - for (char* i = paramlist; *i; i++) - { - /* Found an item */ - if (*i == ',') - { - *i = '\0'; - sep_items[j++] = param; - /* Iterate along to next item, if there is one */ - param = i+1; - if ((unsigned int)j > Config->MaxTargets) - { - /* BZZT! Too many items */ - WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,sep_items[j-1]); - return 1; - } - } - } - sep_items[j++] = param; - total = j; + /* Only one commasepstream here */ + irc::commasepstream items1(parameters[splithere]); + std::string item = ""; + unsigned int max = 0; - /* We add this extra comma here just to ensure we get all the keys - * in the event the user gave a malformed key string (yes, you guessed - * it, this is a mirc-ism) + /* Parse the commasepstream until there are no tokens remaining. + * Each token we parse out, call the command handler that called us + * with it */ - if ((joins) && (*keylist) && (total>0)) // more than one channel and is joining + while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) { - charlcat(keylist,',',MAXBUF); - } - - /* If we're doing JOIN handling (e.g. we've had to kludge for two - * lists being handled at once, real smart by the way JRO ) - * and we also have keys, we must seperate out this key list into - * our char** list sep_keys for later use. - */ - if ((joins) && (*keylist)) - { - /* There is more than one key */ - if (strchr(keylist,',')) - { - j = 0; - param = keylist; - for (char* i = keylist; *i; i++) - { - if (*i == ',') - { - *i = '\0'; - sep_keys[j++] = param; - param = i+1; - } - } - - sep_keys[j++] = param; - total2 = j; - } + parameters[splithere] = item.c_str(); + CommandObj->Handle(parameters,pcnt,user); } - - /* Now the easier bit. We call the command class's Handle function - * X times, where x is the number of parameters we've 'collated'. + /* By returning 1 we tell our caller that nothing is to be done, + * as all the previous calls handled the data. This makes the parent + * return without doing any processing. */ - for (j = 0; j < total; j++) - { - if (sep_items[j]) - { - pars[0] = sep_items[j]; - } - - for (q = end; q < pcnt-1; q++) - { - if (parameters[q+1]) - { - pars[q-end+1] = parameters[q+1]; - } - } - - if ((joins) && (parameters[1])) - { - if (pcnt > 1) - { - pars[1] = sep_keys[j]; - } - else - { - pars[1] = NULL; - } - } - - /* repeatedly call the function with the hacked parameter list */ - if ((joins) && (pcnt > 1)) - { - if (pars[1]) - { - /* pars[1] already set up and containing key from sep_keys[j] */ - fn->Handle(pars,2,u); - } - else - { - pars[1] = parameters[1]; - fn->Handle(pars,2,u); - } - } - else - { - fn->Handle(pars,pcnt-(end-start),u); - } - } - return 1; } @@ -321,7 +158,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use // calls a handler function for a command -bool CommandParser::CallHandler(const std::string &commandname,char **parameters, int pcnt, userrec *user) +bool CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user) { nspace::hash_map::iterator n = cmdlist.find(commandname); @@ -350,246 +187,26 @@ bool CommandParser::CallHandler(const std::string &commandname,char **parameters return false; } -int CommandParser::ProcessParameters(char **command_p,char *parameters) +void CommandParser::ProcessCommand(userrec *user, std::string &cmd) { - int j = 0; + const char *command_p[127]; + int items = 0; + std::string para[127]; + irc::tokenstream tokens(cmd); + std::string command = tokens.GetToken(); - if (!*parameters) - { - /* no parameters, command_p invalid! */ - return 0; - } - - if (*parameters == ':') - { - command_p[0] = parameters+1; - return 1; - } - - if (*parameters) - { - char* n = strchr(parameters,' '); - if ((!n) || (*parameters == ':')) - { - /* only one parameter */ - command_p[0] = parameters; - if (*parameters == ':') - { - if (n) - { - command_p[0]++; - } - } - - return 1; - } - } - - command_p[j++] = parameters; - - for (char* i = parameters; *i; i++) - { - if (*i == ' ') - { - command_p[j++] = i+1; - *i = '\0'; - - if (*command_p[j-1] == ':') - { - *command_p[j-1]++; /* remove dodgy ":" */ - break; - /* parameter like this marks end of the sequence */ - } - } - } - return j; /* returns total number of items in the list */ -} - -void CommandParser::ProcessCommand(userrec *user, char* cmd) -{ - char *parameters; - char *command; - char *command_p[127]; - char p[MAXBUF], temp[MAXBUF]; - int j, items, cmd_found; - int total_params = 0; - - for (int i = 0; i < 127; i++) - command_p[i] = NULL; - - if (!user || !cmd || !*cmd) - { - return; - } - - char* first_space = NULL; - - /* If the command is > 2 characters (quick and dirty way to find out) */ - if (*cmd && *(cmd+1) && *(cmd+2)) - { - for (char* q = cmd; *q; q++) - { - if (*q == ' ') - { - first_space = q; - if (*(q+1) == ':') - { - total_params++; - // found a 'trailing', we dont count them after this. - break; - } - else - total_params++; - } - } - } - - // another phidjit bug... - if (total_params > 126) - { - *first_space = 0; - WriteServ(user->fd,"421 %s %s :Too many parameters given",user->nick,cmd); - return; - } - - strlcpy(temp,cmd,MAXBUF); - - std::string tmp = cmd; - - for (int i = 0; i <= MODCOUNT; i++) - { - std::string oldtmp = tmp; - modules[i]->OnServerRaw(tmp,true,user); - if (oldtmp != tmp) - { - log(DEBUG,"A Module changed the input string!"); - log(DEBUG,"New string: %s",tmp.c_str()); - log(DEBUG,"Old string: %s",oldtmp.c_str()); - break; - } - } - - strlcpy(cmd,tmp.c_str(),MAXBUF); - strlcpy(temp,cmd,MAXBUF); - - char* has_space = strchr(cmd,' '); - int cm_length = 0; - if (!has_space) - { - /* - * no parameters, lets skip the formalities and not chop up - * the string - */ - log(DEBUG,"About to preprocess command with no params"); - items = 0; - command_p[0] = NULL; - parameters = NULL; - for (char* i = cmd; *i; i++,cm_length++) - *i = toupper(*i); - command = cmd; - } - else - { - *cmd = 0; - j = 0; - - /* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */ - for (char* i = temp; *i; i++) - { - if ((*i != 10) && (*i != 13) && (*i != 0) && (*i != 7)) - { - cmd[j++] = *i; - } - } - cmd[j] = 0; - - /* split the full string into a command plus parameters */ - parameters = p; - p[0] = ' '; - p[1] = 0; - - command = cmd; - - if (has_space) - { - for (char* i = cmd; *i; i++) - { - /* capitalise the command ONLY, leave params intact */ - *i = toupper(*i); - /* are we nearly there yet?! :P */ - if (*i == ' ') - { - command = cmd; - parameters = i+1; - *i = 0; - break; - } - } - } - else - { - for (char* i = cmd; *i; i++,cm_length++) - { - *i = toupper(*i); - } - } - } - - if (cm_length > MAXCOMMAND) - { - WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command); - return; - } - - for (char* x = command; *x; x++) - { - if (((*x < 'A') || (*x > 'Z')) && (*x != '.')) - { - if (((*x < '0') || (*x> '9')) && (*x != '-')) - { - if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",*x)) - { - ServerInstance->stats->statsUnknown++; - WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); - return; - } - } - } - } - - std::string xcommand = command; - if ((user->registered != 7) && (xcommand == "SERVER")) - { - kill_link(user,"Server connection to non-server port"); - return; - } - - /* Tweak by brain - why was this INSIDE the mainloop? */ - if (parameters) - { - if (parameters[0]) - { - items = this->ProcessParameters(command_p,parameters); - } - else - { - items = 0; - command_p[0] = NULL; - } - } - else - { - items = 0; - command_p[0] = NULL; - } + while (((para[items] = tokens.GetToken()) != "") && (items < 127)) + command_p[items] = para[items++].c_str(); + std::transform(command.begin(), command.end(), command.begin(), ::toupper); + int MOD_RESULT = 0; FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false)); if (MOD_RESULT == 1) { return; } - - nspace::hash_map::iterator cm = cmdlist.find(xcommand); + + nspace::hash_map::iterator cm = cmdlist.find(command); if (cm != cmdlist.end()) { @@ -597,71 +214,43 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) { /* activity resets the ping pending timer */ user->nping = TIME + user->pingmax; - if ((items) < cm->second->min_params) - { - log(DEBUG,"not enough parameters: %s %s",user->nick,command); - WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command); - return; - } if (cm->second->flags_needed) { - if (!user->modes[cm->second->flags_needed-65]) + if (!user->IsModeSet(cm->second->flags_needed)) { - log(DEBUG,"permission denied: %s %s",user->nick,command); - WriteServ(user->fd,"481 %s :Permission Denied- You do not have the required operator privilages",user->nick); - cmd_found = 1; + user->WriteServ("481 %s :Permission Denied- You do not have the required operator privilages",user->nick); return; } - } - if ((cm->second->flags_needed) && (!user->HasPermission(xcommand))) - { - log(DEBUG,"permission denied: %s %s",user->nick,command); - WriteServ(user->fd,"481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command); - if (!IS_LOCAL(user)) - WriteOpers("*** \2WARNING\2: Command '%s' not allowed for oper '%s', dropped.",command,user->nick); - cmd_found = 1; - return; - } - /* if the command isnt USER, PASS, or NICK, and nick is empty, - * deny command! */ - if ((cm->second != command_user) && (cm->second != command_nick) && (cm->second != command_pass)) - { - if ((!isnick(user->nick)) || (user->registered != 7)) + if (!user->HasPermission(command)) { - log(DEBUG,"not registered: %s %s",user->nick,command); - WriteServ(user->fd,"451 %s :You have not registered",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 ((user->registered == 7) && (!*user->oper) && (*Config->DisabledCommands)) + if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled())) { - std::stringstream dcmds(Config->DisabledCommands); - std::string thiscmd; - while (dcmds >> thiscmd) - { - if (!strcasecmp(thiscmd.c_str(),command)) - { - // command is disabled! - WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command); - return; - } - } + /* command is disabled! */ + user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str()); + return; } - if ((user->registered == 7) || (cm->second == command_user) || (cm->second == command_nick) || (cm->second == command_pass)) + 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 ((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)) { /* ikky /stats counters */ - if (temp) - { - cm->second->use_count++; - cm->second->total_bytes+=strlen(temp); - } + cm->second->use_count++; + cm->second->total_bytes += cmd.length(); int MOD_RESULT = 0; FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true)); if (MOD_RESULT == 1) - { return; - } /* * WARNING: nothing may come after the @@ -674,7 +263,7 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) } else { - WriteServ(user->fd,"451 %s :You have not registered",command); + user->WriteServ("451 %s :You have not registered",command.c_str()); return; } } @@ -682,7 +271,7 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) else if (user) { ServerInstance->stats->statsUnknown++; - WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); + user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); } } @@ -710,42 +299,22 @@ bool CommandParser::RemoveCommands(const char* source) return true; } -void CommandParser::ProcessBuffer(const char* cmdbuf,userrec *user) +void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) { - char cmd[MAXBUF]; + std::string::size_type a; - if (!user || !cmdbuf || !*cmdbuf) - { - log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); + if (!user) return; - } - - while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces - - if (!*cmdbuf) - return; - - strlcpy(cmd,cmdbuf,MAXBUF); - - while (charremove(cmd,10)); - while (charremove(cmd,13)); - - int sl = strlen(cmd)-1; - while (sl && (cmd[sl] == ' ')) // strip trailing spaces - { - cmd[sl--] = 0; - } - - if (!sl) - return; - - log(DEBUG,"CMDIN: %s %s",user->nick,cmd); - tidystring(cmd); + while ((a = buffer.find("\n")) != std::string::npos) + buffer.erase(a); + while ((a = buffer.find("\r")) != std::string::npos) + buffer.erase(a); - if (user && cmd) + if (buffer.length()) { - this->ProcessCommand(user,cmd); + log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str()); + this->ProcessCommand(user,buffer); } }