X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=3373f714f6330e566f52081f439388a89c44caa6;hb=de184f9d627d26efebd2da1756b8d1d20656b6ad;hp=0be458d57aad91a21da9dfc143da2050da5763ef;hpb=291efc3c427e0ecee133e104f0af3facd8685a4f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 0be458d57..3373f714f 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -11,10 +11,9 @@ * --------------------------------------------------- */ -/* $Core: libIRCDcommand_parse */ +/* $Core */ #include "inspircd.h" -#include "wildcard.h" #include "xline.h" #include "socketengine.h" #include "socket.h" @@ -27,7 +26,7 @@ #include #endif -int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, const char* hashtype) +int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) { int MOD_RESULT = 0; FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype)) @@ -35,7 +34,7 @@ int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, co return 0; if (MOD_RESULT == -1) return 1; - return strcmp(data,input); + 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. @@ -50,6 +49,9 @@ int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, co */ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere, unsigned int extra) { + 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. */ @@ -99,6 +101,9 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere) { + 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. */ @@ -127,10 +132,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vectorHandle(new_parameters, user); dupes[item.c_str()] = true; @@ -145,7 +147,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vectorsecond; @@ -180,7 +182,7 @@ Command* CommandParser::GetHandler(const std::string &commandname) CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector& parameters, User *user) { - Commandable::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { @@ -267,7 +269,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) * the rfc says they shouldnt but also says the ircd should * discard it if they do. */ - if (*command.c_str() == ':') + if (command[0] == ':') tokens.GetToken(command); while (tokens.GetToken(token) && (command_p.size() <= MAXPARAMETERS)) @@ -275,25 +277,79 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) std::transform(command.begin(), command.end(), command.begin(), ::toupper); - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd)); - if (MOD_RESULT == 1) { - return true; - } - /* find the command, check it exists */ - Commandable::iterator cm = cmdlist.find(command); + Commandtable::iterator cm = cmdlist.find(command); if (cm == cmdlist.end()) { - if (user->registered == REG_ALL) + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd)); + if (MOD_RESULT == 1) + 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()) { - user->WriteNumeric(421, "%s %s :Unknown command",user->nick,command.c_str()); + 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; } - ServerInstance->stats->statsUnknown++; - return true; } + if (cm->second->max_params && command_p.size() > cm->second->max_params) + { + /* + * 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); + } + + /* + * We call OnPreCommand here seperately if the command exists, so the magic above can + * truncate to max_params if necessary. -- w00t + */ + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd)); + if (MOD_RESULT == 1) + return true; + /* Modify the user's penalty */ bool do_more = true; if (!user->ExemptFromPenalty) @@ -312,33 +368,42 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) { if (!user->IsModeSet(cm->second->flags_needed)) { - user->WriteNumeric(481, "%s :Permission Denied - You do not have the required operator privileges",user->nick); + 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(481, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str()); + 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 ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) { /* command is disabled! */ - user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick,command.c_str()); + 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()); + } + ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)", - command.c_str(), user->nick, user->ident, user->host); + 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(461, "%s %s :Not enough parameters.", user->nick, command.c_str()); + 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(304, "%s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str()); + 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; } if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg())) { - user->WriteNumeric(451, "%s :You have not registered",command.c_str()); + user->WriteNumeric(ERR_NOTREGISTERED, "%s :You have not registered",command.c_str()); return do_more; } else @@ -365,7 +430,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) void CommandParser::RemoveCommands(const char* source) { - Commandable::iterator i,safei; + Commandtable::iterator i,safei; for (i = cmdlist.begin(); i != cmdlist.end();) { safei = i; @@ -374,7 +439,7 @@ void CommandParser::RemoveCommands(const char* source) } } -void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source) +void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source) { Command* x = safei->second; if (x->source == std::string(source)) @@ -398,7 +463,7 @@ bool CommandParser::ProcessBuffer(std::string &buffer,User *user) if (buffer.length()) { - ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str()); + ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick.c_str(), buffer.c_str()); return this->ProcessCommand(user,buffer); } @@ -466,7 +531,7 @@ bool CommandParser::ReloadCommand(std::string cmd, User* user) if (err) { if (user) - user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick, cmd.c_str(), err); + user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick.c_str(), cmd.c_str(), err); return false; } @@ -481,16 +546,16 @@ CmdResult cmd_reload::Handle(const std::vector& parameters, User *u if (parameters.size() < 1) return CMD_FAILURE; - user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0].c_str()); + user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick.c_str(), parameters[0].c_str()); if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) { - user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0].c_str()); - ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0].c_str()); + user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str()); return CMD_SUCCESS; } else { - user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick, parameters[0].c_str()); + user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } } @@ -528,7 +593,13 @@ const char* CommandParser::LoadCommand(const char* name) void CommandParser::SetupCommandTable(User* user) { - RFCCommands.clear(); + for (SharedObjectList::iterator command = RFCCommands.begin(); command != RFCCommands.end(); command++) + { + Command *cmdptr = cmdlist.find(command->first)->second; + cmdlist.erase(cmdlist.find(command->first)); + RFCCommands.erase(command); + delete cmdptr; + } if (!user) { @@ -542,7 +613,7 @@ void CommandParser::SetupCommandTable(User* user) dirent* entry = NULL; while (0 != (entry = readdir(library))) { - if (match(entry->d_name, "cmd_*.so")) + if (InspIRCd::Match(entry->d_name, "cmd_*.so")) { if (!user) { @@ -554,7 +625,7 @@ void CommandParser::SetupCommandTable(User* user) { if (user) { - user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick, entry->d_name, err); + user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick.c_str(), entry->d_name, err); } else {