X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=4a375f3654189cfe598b3c349a02c140ed84d5c1;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=e5fc8fd7d9b34575b699f6d6cb92ed0de468bf37;hpb=9b4ff0ba5d363b6e1557666861932fa0ab527e7f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index e5fc8fd7d..4a375f365 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -14,11 +14,9 @@ * --------------------------------------------------- */ -using namespace std; - #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" +#include "configreader.h" #include #include #include @@ -26,19 +24,9 @@ using namespace std; #include #include #include -#ifdef GCC3 -#include -#else -#include -#endif -#include #include #include -#include -#include -#ifdef THREADED_DNS -#include -#endif +#include #include "users.h" #include "globals.h" #include "modules.h" @@ -49,7 +37,6 @@ using namespace std; #include "commands.h" #include "xline.h" #include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" #include "hashcomp.h" #include "socketengine.h" @@ -60,203 +47,95 @@ using namespace std; #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; -/* 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) +/* Special commands which may occur without registration of the user */ +cmd_user* command_user; +cmd_nick* command_nick; +cmd_pass* command_pass; + + +/* 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) { - char plist[MAXBUF]; - char *param; - char *pars[32]; - char blog[32][MAXBUF]; - char blog2[32][MAXBUF]; - int j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0; - char keystr[MAXBUF]; - char moo[MAXBUF]; - - for (int i = 0; i <32; i++) - { - *blog[i] = 0; - *blog2[i] = 0; - } - - *moo = 0; - for (int i = 0; i <10; i++) - { - if (!parameters[i]) - { - parameters[i] = moo; - } - } - if (joins) - { - if (pcnt > 1) /* we have a key to copy */ - { - strlcpy(keystr,parameters[1],MAXBUF); - } - } - - if (!parameters[start] || (!strchr(parameters[start],','))) - { + /* 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 (!strchr(parameters[splithere],',')) return 0; - } - *plist = 0; + /* Create two lists, one for channel names, one for keys + */ + irc::commasepstream items1(parameters[splithere]); + irc::commasepstream items2(parameters[extra]); + std::string item = ""; + unsigned int max = 0; - for (int i = start; i <= end; i++) + /* 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. + */ + while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) { - if (parameters[i]) - { - strlcat(plist,parameters[i],MAXBUF); - } - } - - j = 0; - param = plist; - - t = strlen(plist); - - for (int i = 0; i < t; i++) - { - if (plist[i] == ',') - { - plist[i] = '\0'; - strlcpy(blog[j++],param,MAXBUF); - param = plist+i+1; - if ((unsigned int)j > Config->MaxTargets) - { - WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,blog[j-1]); - return 1; - } - } + std::string extrastuff = items2.GetToken(); + parameters[splithere] = item.c_str(); + parameters[extra] = extrastuff.c_str(); + CommandObj->Handle(parameters,pcnt,user); } + return 1; +} - strlcpy(blog[j++],param,MAXBUF); - total = j; +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 (!strchr(parameters[splithere],',')) + return 0; - if ((joins) && (keystr) && (total>0)) // more than one channel and is joining - { - strcat(keystr,","); - } + /* Only one commasepstream here */ + irc::commasepstream items1(parameters[splithere]); + std::string item = ""; + unsigned int max = 0; - if ((joins) && (keystr)) + /* Parse the commasepstream until there are no tokens remaining. + * Each token we parse out, call the command handler that called us + * with it + */ + while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) { - if (strchr(keystr,',')) - { - j = 0; - param = keystr; - t2 = strlen(keystr); - - for (int i = 0; i < t2; i++) - { - if (keystr[i] == ',') - { - keystr[i] = '\0'; - strlcpy(blog2[j++],param,MAXBUF); - param = keystr+i+1; - } - } - - strlcpy(blog2[j++],param,MAXBUF); - total2 = j; - } + parameters[splithere] = item.c_str(); + CommandObj->Handle(parameters,pcnt,user); } - - for (j = 0; j < total; j++) - { - if (blog[j]) - { - pars[0] = blog[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] = blog2[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 blog2[j] - fn->Handle(pars,2,u); - } - else - { - pars[1] = parameters[1]; - fn->Handle(pars,2,u); - } - } - else - { - fn->Handle(pars,pcnt-(end-start),u); - } - } - + /* 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. + */ return 1; } -bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec * user) +bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user) { nspace::hash_map::iterator n = cmdlist.find(commandname); @@ -264,31 +143,22 @@ bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec * { if ((pcnt>=n->second->min_params) && (n->second->source != "")) { - if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed)) + if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65])) { if (n->second->flags_needed) { - if ((user->HasPermission(commandname)) || (is_uline(user->server))) - { - return true; - } - else - { - return false; - } + return ((user->HasPermission(commandname)) || (is_uline(user->server))); } - return true; } } } - return false; } // calls a handler function for a command -void CommandParser::CallHandler(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); @@ -296,268 +166,47 @@ void CommandParser::CallHandler(std::string &commandname,char **parameters, int { if (pcnt >= n->second->min_params) { - if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed)) + if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65])) { if (n->second->flags_needed) { - if ((user->HasPermission(commandname)) || (is_uline(user->server))) + if ((user->HasPermission(commandname)) || (!IS_LOCAL(user))) { n->second->Handle(parameters,pcnt,user); + return true; } } else { n->second->Handle(parameters,pcnt,user); + return true; } } } } + return false; } -int CommandParser::ProcessParameters(char **command_p,char *parameters) -{ - int j = 0; - int q = strlen(parameters); - - if (!q) - { - /* no parameters, command_p invalid! */ - return 0; - } - - if (parameters[0] == ':') - { - command_p[0] = parameters+1; - return 1; - } - - if (q) - { - if ((strchr(parameters,' ')==NULL) || (parameters[0] == ':')) - { - /* only one parameter */ - command_p[0] = parameters; - if (parameters[0] == ':') - { - if (strchr(parameters,' ') != NULL) - { - command_p[0]++; - } - } - - return 1; - } - } - - command_p[j++] = parameters; - - for (int i = 0; i <= q; i++) - { - if (parameters[i] == ' ') - { - command_p[j++] = parameters+i+1; - parameters[i] = '\0'; - - if (command_p[j-1][0] == ':') - { - *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) +void CommandParser::ProcessCommand(userrec *user, std::string &cmd) { - char *parameters; - char *command; - char *command_p[127]; - char p[MAXBUF], temp[MAXBUF]; - int j, items, cmd_found; - int total_params = 0; - unsigned int xl; - - for (int i = 0; i < 127; i++) - command_p[i] = NULL; - - if (!user || !cmd || !*cmd) - { - return; - } - - xl = strlen(cmd); - - if (xl > 2) - { - for (unsigned int q = 0; q < xl - 1; q++) - { - if (cmd[q] == ' ') - { - if (cmd[q+1] == ':') - { - total_params++; - // found a 'trailing', we dont count them after this. - break; - } - else - total_params++; - } - } - } - - // another phidjit bug... - if (total_params > 126) - { - *(strchr(cmd,' ')) = '\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; - } - } + const char *command_p[127]; + int items = 0; + std::string para[127]; + irc::tokenstream tokens(cmd); + std::string command = tokens.GetToken(); - strlcpy(cmd,tmp.c_str(),MAXBUF); - strlcpy(temp,cmd,MAXBUF); - - if (!strchr(cmd,' ')) - { - /* - * 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; - unsigned int tl = strlen(cmd); - for (unsigned int i = 0; i <= tl; i++) - { - cmd[i] = toupper(cmd[i]); - } - command = cmd; - } - else - { - *cmd = 0; - j = 0; - - unsigned int vl = strlen(temp); - /* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */ - for (unsigned int i = 0; i < vl; i++) - { - if ((temp[i] != 10) && (temp[i] != 13) && (temp[i] != 0) && (temp[i] != 7)) - { - cmd[j++] = temp[i]; - cmd[j] = 0; - } - } - - /* split the full string into a command plus parameters */ - parameters = p; - p[0] = ' '; - p[1] = 0; - - command = cmd; - - if (strchr(cmd,' ')) - { - unsigned int cl = strlen(cmd); - - for (unsigned int i = 0; i <= cl; i++) - { - /* capitalise the command ONLY, leave params intact */ - cmd[i] = toupper(cmd[i]); - /* are we nearly there yet?! :P */ - if (cmd[i] == ' ') - { - command = cmd; - parameters = cmd+i+1; - cmd[i] = '\0'; - break; - } - } - } - else - { - for (char* i = cmd; *i; i++) - { - *i = toupper(*i); - } - } - } - - if (strlen(command)>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()) { @@ -565,68 +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) + if (cm->second->flags_needed) { - log(DEBUG,"not enough parameters: %s %s",user->nick,command); - WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command); - return; + if (!user->IsModeSet(cm->second->flags_needed)) + { + 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 ((!strchr(user->modes,cm->second->flags_needed)) && (cm->second->flags_needed)) + if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled())) { - 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; + /* command is disabled! */ + user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str()); return; } - if ((cm->second->flags_needed) && (!user->HasPermission(xcommand))) + if (items < cm->second->min_params) { - 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); - cmd_found = 1; + 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 the command isnt USER, PASS, or NICK, and nick is empty, - * deny command! */ - if ((strncmp(command,"USER",4)) && (strncmp(command,"NICK",4)) && (strncmp(command,"PASS",4))) - { - if ((!isnick(user->nick)) || (user->registered != 7)) - { - log(DEBUG,"not registered: %s %s",user->nick,command); - WriteServ(user->fd,"451 %s :You have not registered",command); - return; - } - } - if ((user->registered == 7) && (!strchr(user->modes,'o'))) - { - std::stringstream dcmds(Config->DisabledCommands); - while (!dcmds.eof()) - { - std::string thiscmd; - 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; - } - } - } - if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4))) + 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 @@ -639,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; } } @@ -647,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()); } } @@ -675,78 +299,35 @@ 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) - { - log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); - return; - } - if (!cmdbuf) - { - log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); return; - } - if (!cmdbuf[0]) - { - return; - } - - while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces - - strlcpy(cmd,cmdbuf,MAXBUF); - - if (!cmd[0]) - { - return; - } - - - /* XXX - This is ugly as sin, and incomprehensible - why are we doing this twice, for instance? --w00t */ - int sl = strlen(cmd)-1; - if ((cmd[sl] == 13) || (cmd[sl] == 10)) - { - cmd[sl] = '\0'; - } + while ((a = buffer.find("\n")) != std::string::npos) + buffer.erase(a); + while ((a = buffer.find("\r")) != std::string::npos) + buffer.erase(a); - sl = strlen(cmd)-1; - - if ((cmd[sl] == 13) || (cmd[sl] == 10)) + if (buffer.length()) { - cmd[sl] = '\0'; - } - - sl = strlen(cmd)-1; - - - while (cmd[sl] == ' ') // strip trailing spaces - { - cmd[sl] = '\0'; - sl = strlen(cmd)-1; - } - - if (!cmd[0]) - { - return; - } - - log(DEBUG,"CMDIN: %s %s",user->nick,cmd); - tidystring(cmd); - if ((user) && (cmd)) - { - this->ProcessCommand(user,cmd); + log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str()); + this->ProcessCommand(user,buffer); } } bool CommandParser::CreateCommand(command_t *f) { /* create the command and push it onto the table */ - cmdlist[f->command] = f; - log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params); - return true; + 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); + return true; + } + else return false; } CommandParser::CommandParser() @@ -756,8 +337,19 @@ CommandParser::CommandParser() void CommandParser::SetupCommandTable() { - this->CreateCommand(new cmd_user); - this->CreateCommand(new cmd_nick); + /* These three are special (can occur without + * 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; + 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); @@ -792,7 +384,6 @@ void CommandParser::SetupCommandTable() this->CreateCommand(new cmd_summon); this->CreateCommand(new cmd_users); this->CreateCommand(new cmd_invite); - this->CreateCommand(new cmd_pass); this->CreateCommand(new cmd_trace); this->CreateCommand(new cmd_whowas); this->CreateCommand(new cmd_connect); @@ -810,4 +401,3 @@ void CommandParser::SetupCommandTable() this->CreateCommand(new cmd_server); this->CreateCommand(new cmd_commands); } -