X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=e4eb57e80bb10cad9d03dbc4d494a0d237e7c256;hb=0ed3ef9dee2cb8f4b0c37da218a2fd1eee8c31f6;hp=4d30129157293b9890da98afd4190403e68ba165;hpb=283ad2ba9fe3fa9dacf9bc8395169a71d0d79ad5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 4d3012915..e4eb57e80 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -2,868 +2,557 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; +/* $Core */ -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#include -#include -#include -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include -#include -#ifdef THREADED_DNS -#include -#endif -#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" +#include "exitcodes.h" -#ifdef GCC3 -#define nspace __gnu_cxx -#else -#define nspace std +/* Directory Searching for Unix-Only */ +#ifndef WIN32 +#include +#include #endif +int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) +{ + ModResult res; + FIRST_MOD_RESULT(this, OnPassCompare, res, (ex, data, input, hashtype)); -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; + /* Module matched */ + if (res == MOD_RES_ALLOW) + return 0; -// 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]; + /* Module explicitly didnt match */ + if (res == MOD_RES_DENY) + return 1; -extern Server* MyServer; -extern ServerConfig *Config; + /* We dont handle any hash types except for plaintext - Thanks tra26 */ + if (hashtype != "" && hashtype != "plaintext") + /* See below. 1 because they dont match */ + return 1; -extern user_hash clientlist; -extern chan_hash chanlist; + return (data != input); // this seems back to front, but returns 0 if they *match*, 1 else +} -/* 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(User* user, Command* CommandObj, const std::vector& parameters, 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) - */ - char keylist[MAXBUF]; - /* Exactly what it says. Its nothing. We point invalid parameters at this. + if (splithere >= parameters.size()) + return 0; + + /* 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 nothing = 0; + if (parameters[splithere].find(',') == std::string::npos) + return 0; - /* First, initialize our arrays */ - for (int i = 0; i < 32; i++) - sep_items[i] = sep_keys[i] = NULL; + /** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm. + * By using std::set (thanks for the idea w00t) we can cut this down a ton. + * ...VOOODOOOO! + */ + std::set dupes; - /* 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 extrastuff; + 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 (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) { - if (pcnt > 1) /* we have a key to copy */ + if (dupes.find(item.c_str()) == dupes.end()) { - strlcpy(keylist,parameters[1],MAXBUF); - } - } + std::vector new_parameters; - /* There's nothing to split! We don't do anything - */ - if (!parameters[start] || (!strchr(parameters[start],','))) - { - return 0; - } + for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++) + new_parameters.push_back(parameters[t]); - /* 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; + if (!items2.GetToken(extrastuff)) + extrastuff = ""; - for (int i = start; i <= end; i++) - { - if (parameters[i]) - { - strlcat(paramlist,parameters[i],MAXBUF); - } - } + new_parameters[splithere] = item.c_str(); + new_parameters[extra] = extrastuff.c_str(); - /* Now we split off paramlist into seperate parameters using - * pointer voodoo, this parameter list goes into sep_items - */ - j = 0; - param = paramlist; + CommandObj->Handle(new_parameters, user); - 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; - } + dupes.insert(item.c_str()); } } - sep_items[j++] = param; - total = j; + return 1; +} - /* 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) - */ - if ((joins) && (*keylist) && (total>0)) // more than one channel and is joining - { - charlcat(keylist,',',MAXBUF); - } +int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere) +{ + if (splithere >= parameters.size()) + return 0; - /* 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. + /* 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 ((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; - } - } + if (parameters[splithere].find(',') == std::string::npos) + return 0; - sep_keys[j++] = param; - total2 = j; - } - } + std::set dupes; - /* Now the easier bit. We call the command class's Handle function - * X times, where x is the number of parameters we've 'collated'. + /* Only one commasepstream here */ + irc::commasepstream items1(parameters[splithere]); + std::string item; + unsigned int max = 0; + + /* Parse the commasepstream until there are no tokens remaining. + * Each token we parse out, call the command handler that called us + * with it */ - for (j = 0; j < total; j++) + while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) { - if (sep_items[j]) + if (dupes.find(item.c_str()) == dupes.end()) { - pars[0] = sep_items[j]; - } + std::vector new_parameters; - for (q = end; q < pcnt-1; q++) - { - if (parameters[q+1]) - { - pars[q-end+1] = parameters[q+1]; - } - } + for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++) + new_parameters.push_back(parameters[t]); - if ((joins) && (parameters[1])) - { - if (pcnt > 1) - { - pars[1] = sep_keys[j]; - } - else - { - pars[1] = NULL; - } - } + new_parameters[splithere] = item.c_str(); - /* 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); + /* Execute the command handler. */ + CommandObj->Handle(new_parameters, user); + + dupes.insert(item.c_str()); } } - + /* 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, unsigned int pcnt, User * user) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { - if ((pcnt>=n->second->min_params) && (n->second->source != "")) + if ((pcnt >= n->second->min_params)) { - if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed)) + if (IS_LOCAL(user) && n->second->flags_needed) { - if (n->second->flags_needed) + if (user->IsModeSet(n->second->flags_needed)) { - if ((user->HasPermission(commandname)) || (is_uline(user->server))) - { - return true; - } - else - { - return false; - } + return (user->HasPermission(commandname)); } - + } + else + { return true; } } } - return false; } +Command* CommandParser::GetHandler(const std::string &commandname) +{ + Commandtable::iterator n = cmdlist.find(commandname); + if (n != cmdlist.end()) + return n->second; + + return NULL; +} + // calls a handler function for a command -bool CommandParser::CallHandler(std::string &commandname,char **parameters, int pcnt, userrec *user) +CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector& parameters, User *user) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { - if (pcnt >= n->second->min_params) + if (parameters.size() >= n->second->min_params) { - if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed)) + bool bOkay = false; + + if (IS_LOCAL(user) && n->second->flags_needed) { - if (n->second->flags_needed) - { - if ((user->HasPermission(commandname)) || (!IS_LOCAL(user))) - { - n->second->Handle(parameters,pcnt,user); - return true; - } - } - else + /* if user is local, and flags are needed .. */ + + if (user->IsModeSet(n->second->flags_needed)) { - n->second->Handle(parameters,pcnt,user); - return true; + /* if user has the flags, and now has the permissions, go ahead */ + if (user->HasPermission(commandname)) + bOkay = true; } } - } - } - return false; -} - -int CommandParser::ProcessParameters(char **command_p,char *parameters) -{ - int j = 0; - //int q = strlen(parameters); - - 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 == ':') + else { - if (n) - { - command_p[0]++; - } + /* remote or no flags required anyway */ + bOkay = true; } - 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] == ':') + if (bOkay) { - *command_p[j-1]++; /* remove dodgy ":" */ - break; - /* parameter like this marks end of the sequence */ + return n->second->Handle(parameters,user); } } } - //command_p[j] = parameters+i+1; - //*i = '\0'; - - return j; /* returns total number of items in the list */ + return CMD_INVALID; } -void CommandParser::ProcessCommand(userrec *user, char* cmd) +void CommandParser::DoLines(User* current, bool one_only) { - 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) + while (current->BufferIsReady()) { - return; - } + // use GetBuffer to copy single lines into the sanitized string + std::string single_line = current->GetBuffer(); + current->bytes_in += single_line.length(); + current->cmds_in++; + if (single_line.length() > MAXBUF - 2) // MAXBUF is 514 to allow for neccessary line terminators + single_line.resize(MAXBUF - 2); // So to trim to 512 here, we use MAXBUF - 2 - 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++; - } - } + // ProcessBuffer returns false if the user has gone over penalty + if (!ServerInstance->Parser->ProcessBuffer(single_line, current) || one_only) + break; } +} - // another phidjit bug... - if (total_params > 126) - { - *(strchr(cmd,' ')) = '\0'; - WriteServ(user->fd,"421 %s %s :Too many parameters given",user->nick,cmd); - return; - } +bool CommandParser::ProcessCommand(User *user, std::string &cmd) +{ + std::vector command_p; + irc::tokenstream tokens(cmd); + std::string command, token; + tokens.GetToken(command); + + /* A client sent a nick prefix on their command (ick) + * rhapsody and some braindead bouncers do this -- + * the rfc says they shouldnt but also says the ircd should + * discard it if they do. + */ + if (command[0] == ':') + tokens.GetToken(command); - strlcpy(temp,cmd,MAXBUF); + while (tokens.GetToken(token) && (command_p.size() <= MAXPARAMETERS)) + command_p.push_back(token); - std::string tmp = cmd; + std::transform(command.begin(), command.end(), command.begin(), ::toupper); - for (int i = 0; i <= MODCOUNT; i++) + /* find the command, check it exists */ + Commandtable::iterator cm = cmdlist.find(command); + + /* Modify the user's penalty regardless of whether or not the command exists */ + bool do_more = true; + if (!user->HasPrivPermission("users/flood/no-throttle")) { - 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; - } + // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap + user->IncreasePenalty(cm != cmdlist.end() ? cm->second->Penalty : 2); + do_more = (user->Penalty < 10); } - strlcpy(cmd,tmp.c_str(),MAXBUF); - strlcpy(temp,cmd,MAXBUF); - if (!strchr(cmd,' ')) + if (cm == cmdlist.end()) { + ModResult MOD_RESULT; + FIRST_MOD_RESULT(ServerInstance, OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return true; + /* - * no parameters, lets skip the formalities and not chop up - * the string + * This double lookup is in case a module (abbreviation) wishes to change a command. + * Sure, the double lookup is a bit painful, but bear in mind this only happens for unknowns anyway. + * + * Thanks dz for making me actually understand why this is necessary! + * -- w00t */ - 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++) + cm = cmdlist.find(command); + if (cm == cmdlist.end()) { - cmd[i] = toupper(cmd[i]); + if (user->registered == REG_ALL) + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str()); + ServerInstance->stats->statsUnknown++; + return true; } - command = cmd; } - else + + if (cm->second->max_params && command_p.size() > cm->second->max_params) { - *cmd = 0; - j = 0; + /* + * command_p input (assuming max_params 1): + * this + * is + * a + * test + */ + std::string lparam = ""; - unsigned int vl = strlen(temp); - /* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */ - for (unsigned int i = 0; i < vl; i++) + /* + * The '-1' here is a clever trick, we'll go backwards throwing everything into a temporary param + * and then just toss that into the array. + * -- w00t + */ + while (command_p.size() > (cm->second->max_params - 1)) { - if ((temp[i] != 10) && (temp[i] != 13) && (temp[i] != 0) && (temp[i] != 7)) - { - cmd[j++] = temp[i]; - cmd[j] = 0; - } + // BE CAREFUL: .end() returns past the end of the vector, hence decrement. + std::vector::iterator it = --command_p.end(); + + lparam.insert(0, " " + *(it)); + command_p.erase(it); // remove last element } - /* split the full string into a command plus parameters */ - parameters = p; - p[0] = ' '; - p[1] = 0; + /* we now have (each iteration): + * ' test' + * ' a test' + * ' is a test' <-- final string + * ...now remove the ' ' at the start... + */ + lparam.erase(lparam.begin()); + + /* param is now 'is a test', which is exactly what we wanted! */ + command_p.push_back(lparam); + } - command = cmd; + /* + * We call OnPreCommand here seperately if the command exists, so the magic above can + * truncate to max_params if necessary. -- w00t + */ + ModResult MOD_RESULT; + FIRST_MOD_RESULT(ServerInstance, OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return true; - if (strchr(cmd,' ')) - { - unsigned int cl = strlen(cmd); + /* activity resets the ping pending timer */ + if (user->MyClass) + user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); - 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; - } - } + if (cm->second->flags_needed) + { + if (!user->IsModeSet(cm->second->flags_needed)) + { + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str()); + return do_more; } - else + if (!user->HasPermission(command)) { - for (char* i = cmd; *i; i++) - { - *i = toupper(*i); - } + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick.c_str(),user->oper.c_str(),command.c_str()); + return do_more; } } - - if (strlen(command)>MAXCOMMAND) - { - WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command); - return; - } - - for (char* x = command; *x; x++) + if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) { - if (((*x < 'A') || (*x > 'Z')) && (*x != '.')) + /* command is disabled! */ + if (ServerInstance->Config->DisabledDontExist) { - if (((*x < '0') || (*x> '9')) && (*x != '-')) - { - if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",*x)) - { - ServerInstance->stats->statsUnknown++; - WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); - return; - } - } + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str()); + } + else + { + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :This command has been disabled.", + user->nick.c_str(), command.c_str()); } - } - std::string xcommand = command; - if ((user->registered != 7) && (xcommand == "SERVER")) + ServerInstance->SNO->WriteToSnoMask('t', "%s denied for %s (%s@%s)", + command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str()); + return do_more; + } + if (command_p.size() < cm->second->min_params) { - kill_link(user,"Server connection to non-server port"); - return; + user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str()); + if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length())) + user->WriteNumeric(RPL_SYNTAX, "%s :SYNTAX %s %s", user->nick.c_str(), cm->second->command.c_str(), cm->second->syntax.c_str()); + return do_more; } - - /* Tweak by brain - why was this INSIDE the mainloop? */ - if (parameters) + if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg())) { - if (parameters[0]) - { - items = this->ProcessParameters(command_p,parameters); - } - else - { - items = 0; - command_p[0] = NULL; - } + user->WriteNumeric(ERR_NOTREGISTERED, "%s :You have not registered",command.c_str()); + return do_more; } else { - items = 0; - command_p[0] = NULL; - } + /* passed all checks.. first, do the (ugly) stats counters. */ + cm->second->use_count++; + cm->second->total_bytes += cmd.length(); - 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); - - if (cm != cmdlist.end()) - { - if (user) - { - /* 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 ((!strchr(user->modes,cm->second->flags_needed)) && (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; - 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 ((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) && (!*user->oper) && (*Config->DisabledCommands)) - { - 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; - } - } - } - if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4))) - { - /* ikky /stats counters */ - if (temp) - { - cm->second->use_count++; - cm->second->total_bytes+=strlen(temp); - } - - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true)); - if (MOD_RESULT == 1) - { - return; - } + /* module calls too */ + FIRST_MOD_RESULT(ServerInstance, OnPreCommand, MOD_RESULT, (command, command_p, user, true, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return do_more; - /* - * WARNING: nothing may come after the - * command handler call, as the handler - * may free the user structure! - */ + /* + * WARNING: be careful, the user may be deleted soon + */ + CmdResult result = cm->second->Handle(command_p, user); - cm->second->Handle(command_p,items,user); - return; - } - else - { - WriteServ(user->fd,"451 %s :You have not registered",command); - return; - } - } + FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, user, result,cmd)); + return do_more; } - else if (user) +} + +void CommandParser::RemoveCommands(Module* source) +{ + Commandtable::iterator i,safei; + for (i = cmdlist.begin(); i != cmdlist.end();) { - ServerInstance->stats->statsUnknown++; - WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); + safei = i; + i++; + RemoveCommand(safei, source); } } -bool CommandParser::RemoveCommands(const char* source) +void CommandParser::RemoveCommand(Commandtable::iterator safei, Module* source) { - bool go_again = true; - - while (go_again) + Command* x = safei->second; + if (x->creator == source) { - go_again = false; - - for (nspace::hash_map::iterator i = cmdlist.begin(); i != cmdlist.end(); i++) - { - 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()); - cmdlist.erase(i); - go_again = true; - break; - } - } + cmdlist.erase(safei); } - - return true; } -void CommandParser::ProcessBuffer(const char* cmdbuf,userrec *user) +bool CommandParser::ProcessBuffer(std::string &buffer,User *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 + return true; - strlcpy(cmd,cmdbuf,MAXBUF); + while ((a = buffer.rfind("\n")) != std::string::npos) + buffer.erase(a); + while ((a = buffer.rfind("\r")) != std::string::npos) + buffer.erase(a); - if (!cmd[0]) + if (buffer.length()) { - return; + ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick.c_str(), buffer.c_str()); + return this->ProcessCommand(user,buffer); } + return true; +} - /* 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)) +bool CommandParser::CreateCommand(Command *f) +{ + /* create the command and push it onto the table */ + if (cmdlist.find(f->command) == cmdlist.end()) { - cmd[sl] = '\0'; + cmdlist[f->command] = f; + return true; } + return false; +} + +CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) +{ + para.resize(128); +} - sl = strlen(cmd)-1; +int CommandParser::TranslateUIDs(const std::vector to, const std::vector &source, std::string &dest, bool prefix_final, Command* custom_translator) +{ + std::vector::const_iterator types = to.begin(); + User* user = NULL; + unsigned int i; + int translations = 0; + dest.clear(); - if ((cmd[sl] == 13) || (cmd[sl] == 10)) + for(i=0; i < source.size(); i++) { - cmd[sl] = '\0'; - } - - sl = strlen(cmd)-1; + TranslateType t; + std::string item = source[i]; + if (types == to.end()) + t = TR_TEXT; + else + { + t = *types; + types++; + } - while (cmd[sl] == ' ') // strip trailing spaces - { - cmd[sl] = '\0'; - sl = strlen(cmd)-1; - } + if (prefix_final && i == source.size() - 1) + dest.append(":"); - if (!cmd[0]) - { - return; + switch (t) + { + case TR_NICK: + /* Translate single nickname */ + user = ServerInstance->FindNick(item); + if (user) + { + dest.append(user->uuid); + translations++; + } + else + dest.append(item); + break; + case TR_CUSTOM: + if (custom_translator) + custom_translator->EncodeParameter(item, i); + dest.append(item); + break; + case TR_END: + case TR_TEXT: + default: + /* Do nothing */ + dest.append(item); + break; + } + if (i != source.size() - 1) + dest.append(" "); } - log(DEBUG,"CMDIN: %s %s",user->nick,cmd); - tidystring(cmd); - if ((user) && (cmd)) - { - this->ProcessCommand(user,cmd); - } + return translations; } -bool CommandParser::CreateCommand(command_t *f) +int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest) { - /* create the command and push it onto the table */ - if (cmdlist.find(f->command) == cmdlist.end()) + User* user = NULL; + std::string item; + int translations = 0; + dest.clear(); + + switch (to) { - cmdlist[f->command] = f; - log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params); - return true; + case TR_NICK: + /* Translate single nickname */ + user = ServerInstance->FindNick(source); + if (user) + { + dest = user->uuid; + translations++; + } + else + dest = source; + break; + case TR_END: + case TR_TEXT: + default: + /* Do nothing */ + dest = source; + break; } - else return false; -} - -CommandParser::CommandParser() -{ - this->SetupCommandTable(); -} -void CommandParser::SetupCommandTable() -{ - this->CreateCommand(new cmd_user); - this->CreateCommand(new cmd_nick); - 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_pass); - 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); + return translations; } -