X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=2e20fc27f65195a2e383b5b25b4961517b4d9410;hb=55d96bd075818e6da81e91ebd82cd938ec0908b2;hp=8e704e79629b92ad7b0bac31e1c3903ab47334de;hpb=51fb5084945d9144f2de1f85076d6f5bb419bc23;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 8e704e796..2e20fc27f 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -2,84 +2,37 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2010 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. * * --------------------------------------------------- */ -#include "inspircd_config.h" #include "inspircd.h" -#include "configreader.h" -#include -#include -#include -#include -#include -#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" - -#define nspace __gnu_cxx - -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 */ -cmd_user* command_user; -cmd_nick* command_nick; -cmd_pass* command_pass; +int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) +{ + ModResult res; + FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype)); + + /* Module matched */ + if (res == MOD_RES_ALLOW) + return 0; + + /* Module explicitly didnt match */ + if (res == MOD_RES_DENY) + return 1; + + /* We dont handle any hash types except for plaintext - Thanks tra26 */ + if (hashtype != "" && hashtype != "plaintext") + /* See below. 1 because they dont match */ + return 1; + + return (data != input); // this seems back to front, but returns 0 if they *match*, 1 else +} /* 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. @@ -89,80 +42,78 @@ 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) +int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere, int extra, bool usemax) { + if (splithere >= parameters.size()) + return 0; + + if (extra >= (signed)parameters.size()) + extra = -1; + /* 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],',')) + if (parameters[splithere].find(',') == std::string::npos) return 0; + /** 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; + /* Create two lists, one for channel names, one for keys */ irc::commasepstream items1(parameters[splithere]); - irc::commasepstream items2(parameters[extra]); - std::string item = ""; + irc::commasepstream items2(extra >= 0 ? 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. */ - while (((item = items1.GetToken()) != "") && (max++ < Config->MaxTargets)) + while (items1.GetToken(item) && (!usemax || max++ < ServerInstance->Config->MaxTargets)) { - std::string extrastuff = items2.GetToken(); - parameters[splithere] = item.c_str(); - parameters[extra] = extrastuff.c_str(); - CommandObj->Handle(parameters,pcnt,user); - } - return 1; -} + if (dupes.find(item.c_str()) == dupes.end()) + { + std::vector new_parameters(parameters); -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 (!items2.GetToken(extrastuff)) + extrastuff = ""; - /* Only one commasepstream here */ - irc::commasepstream items1(parameters[splithere]); - std::string item = ""; - unsigned int max = 0; + new_parameters[splithere] = item; + if (extra >= 0) + new_parameters[extra] = extrastuff; - /* 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++ < Config->MaxTargets)) - { - parameters[splithere] = item.c_str(); - CommandObj->Handle(parameters,pcnt,user); + 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(const 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 ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65])) + if (IS_LOCAL(user) && n->second->flags_needed) { - if (n->second->flags_needed) + if (user->IsModeSet(n->second->flags_needed)) { - return ((user->HasPermission(commandname)) || (is_uline(user->server))); + return (user->HasPermission(commandname)); } + } + else + { return true; } } @@ -170,249 +121,343 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use 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(const std::string &commandname,const 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 ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65])) + 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; } } + else + { + /* remote or no flags required anyway */ + bOkay = true; + } + + if (bOkay) + { + return n->second->Handle(parameters,user); + } } } - return false; + return CMD_INVALID; } -void CommandParser::ProcessCommand(userrec *user, std::string &cmd) +bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd) { - const char *command_p[127]; - int items = 0; - std::string para[127]; + std::vector command_p; irc::tokenstream tokens(cmd); - std::string command = tokens.GetToken(); - - 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); - - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false)); - if (MOD_RESULT == 1) { - return; + 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); + + while (tokens.GetToken(token) && (command_p.size() <= MAXPARAMETERS)) + command_p.push_back(token); + + std::transform(command.begin(), command.end(), command.begin(), ::toupper); + + /* 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")) + { + // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap + user->CommandFloodPenalty += cm != cmdlist.end() ? cm->second->Penalty * 1000 : 2000; } - nspace::hash_map::iterator cm = cmdlist.find(command); - - if (cm != cmdlist.end()) + + if (cm == cmdlist.end()) { - if (user) + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return true; + + /* + * 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 + */ + cm = cmdlist.find(command); + if (cm == cmdlist.end()) { - /* 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.c_str()); - WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command.c_str()); - return; - } - if (cm->second->flags_needed) - { - if (!user->IsModeSet(cm->second->flags_needed)) - { - log(DEBUG,"permission denied: %s %s",user->nick,command.c_str()); - WriteServ(user->fd,"481 %s :Permission Denied- You do not have the required operator privilages",user->nick); - return; - } - } - if ((cm->second->flags_needed) && (!user->HasPermission(command))) - { - log(DEBUG,"permission denied: %s %s",user->nick,command.c_str()); - 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 == 7) && (!*user->oper) && (cm->second->IsDisabled())) - { - /* command is disabled! */ - WriteServ(user->fd,"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)) - { - /* ikky /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,true)); - if (MOD_RESULT == 1) - return; - - /* - * WARNING: nothing may come after the - * command handler call, as the handler - * may free the user structure! - */ - - cm->second->Handle(command_p,items,user); - return; - } - else - { - WriteServ(user->fd,"451 %s :You have not registered",command.c_str()); - return; - } + 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; } } - else if (user) + + if (cm->second->max_params && command_p.size() > cm->second->max_params) { - ServerInstance->stats->statsUnknown++; - WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command.c_str()); + /* + * command_p input (assuming max_params 1): + * this + * is + * a + * test + */ + std::string lparam = ""; + + /* + * 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)) + { + // 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 + } + + /* 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); } -} -bool CommandParser::RemoveCommands(const char* source) -{ - bool go_again = true; + /* + * 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(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return true; - while (go_again) - { - go_again = false; + /* activity resets the ping pending timer */ + user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); - for (nspace::hash_map::iterator i = cmdlist.begin(); i != cmdlist.end(); i++) + if (cm->second->flags_needed) + { + if (!user->IsModeSet(cm->second->flags_needed)) { - 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; - } + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str()); + return do_more; + } + if (!user->HasPermission(command)) + { + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s", + user->nick.c_str(), user->oper->NameStr(), command.c_str()); + return do_more; } } + if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) + { + /* command is disabled! */ + if (ServerInstance->Config->DisabledDontExist) + { + 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()); + } - return true; + 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) + { + 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->name.c_str(), cm->second->syntax.c_str()); + return do_more; + } + if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg())) + { + user->WriteNumeric(ERR_NOTREGISTERED, "%s :You have not registered",command.c_str()); + return do_more; + } + else + { + /* passed all checks.. first, do the (ugly) stats counters. */ + cm->second->use_count++; + cm->second->total_bytes += cmd.length(); + + /* module calls too */ + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, true, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return do_more; + + /* + * WARNING: be careful, the user may be deleted soon + */ + CmdResult result = cm->second->Handle(command_p, user); + + FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, user, result,cmd)); + return do_more; + } } -void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) +void CommandParser::RemoveCommand(Command* x) { - std::string::size_type a; + Commandtable::iterator n = cmdlist.find(x->name); + if (n != cmdlist.end() && n->second == x) + cmdlist.erase(n); +} - if (!user) - return; +Command::~Command() +{ + ServerInstance->Parser->RemoveCommand(this); +} - while ((a = buffer.find("\n")) != std::string::npos) - buffer.erase(a); - while ((a = buffer.find("\r")) != std::string::npos) - buffer.erase(a); +bool CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user) +{ + if (!user || buffer.empty()) + return true; - if (buffer.length()) - { - log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str()); - this->ProcessCommand(user,buffer); - } + ServerInstance->Logs->Log("USERINPUT", DEBUG, "C[%s] I :%s %s", + user->uuid.c_str(), user->nick.c_str(), buffer.c_str()); + return ProcessCommand(user,buffer); } -bool CommandParser::CreateCommand(command_t *f) +bool CommandParser::AddCommand(Command *f) { /* create the command and push it onto the table */ - if (cmdlist.find(f->command) == cmdlist.end()) + if (cmdlist.find(f->name) == cmdlist.end()) { - cmdlist[f->command] = f; - log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params); + cmdlist[f->name] = f; return true; } - else return false; + return false; } CommandParser::CommandParser() { - this->SetupCommandTable(); + para.resize(128); } -void CommandParser::SetupCommandTable() +int CommandParser::TranslateUIDs(const std::vector to, const std::vector &source, std::string &dest, bool prefix_final, Command* custom_translator) { - /* 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); - 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); + std::vector::const_iterator types = to.begin(); + User* user = NULL; + unsigned int i; + int translations = 0; + dest.clear(); + + for(i=0; i < source.size(); i++) + { + TranslateType t; + std::string item = source[i]; + + if (types == to.end()) + t = TR_TEXT; + else + { + t = *types; + types++; + } + + if (prefix_final && i == source.size() - 1) + dest.append(":"); + + 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(" "); + } + + return translations; +} + +int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest) +{ + User* user = NULL; + std::string item; + int translations = 0; + dest.clear(); + + switch (to) + { + 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; + } + + return translations; }