X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=f07a4ffd78aabf50676815e8e90e8d4f92acc21b;hb=4487dde76ffbdb21e7dc319b3b87d09c3cf60d8c;hp=e0085f9d7b3f1d91d22bf4da9abd6908bf07590a;hpb=231e833e4b84534131197569cb161c1349875708;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index e0085f9d7..f07a4ffd7 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -25,24 +25,6 @@ #include #endif -bool InspIRCd::ULine(const char* server) -{ - if (!server) - return false; - if (!*server) - return true; - - return (Config->ulines.find(server) != Config->ulines.end()); -} - -bool InspIRCd::SilentULine(const char* server) -{ - std::map::iterator n = Config->ulines.find(server); - if (n != Config->ulines.end()) - return n->second; - else return false; -} - int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) { int MOD_RESULT = 0; @@ -54,54 +36,6 @@ int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) return strcmp(data,input); } -std::string InspIRCd::TimeString(time_t curtime) -{ - return std::string(ctime(&curtime),24); -} - -/** Refactored by Brain, Jun 2007. Much faster with some clever O(1) array - * lookups and pointer maths. - */ -long InspIRCd::Duration(const std::string &str) -{ - unsigned char multiplier = 0; - long total = 0; - long times = 1; - long subtotal = 0; - - /* Iterate each item in the string, looking for number or multiplier */ - for (std::string::const_reverse_iterator i = str.rbegin(); i != str.rend(); ++i) - { - /* Found a number, queue it onto the current number */ - if ((*i >= '0') && (*i <= '9')) - { - subtotal = subtotal + ((*i - '0') * times); - times = times * 10; - } - else - { - /* Found something thats not a number, find out how much - * it multiplies the built up number by, multiply the total - * and reset the built up number. - */ - if (subtotal) - total += subtotal * duration_multi[multiplier]; - - /* Next subtotal please */ - subtotal = 0; - multiplier = *i; - times = 1; - } - } - if (multiplier) - { - total += subtotal * duration_multi[multiplier]; - subtotal = 0; - } - /* Any trailing values built up are treated as raw seconds */ - return total + subtotal; -} - /* 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, @@ -112,7 +46,7 @@ long InspIRCd::Duration(const std::string &str) * 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) +int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra) { /* 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. @@ -161,7 +95,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p return 1; } -int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere) +int CommandParser::LoopCall(User* user, Command* 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. @@ -209,9 +143,9 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p return 1; } -bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user) +bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, User * user) { - command_table::iterator n = cmdlist.find(commandname); + Commandable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { @@ -233,9 +167,9 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use return false; } -command_t* CommandParser::GetHandler(const std::string &commandname) +Command* CommandParser::GetHandler(const std::string &commandname) { - command_table::iterator n = cmdlist.find(commandname); + Commandable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) return n->second; @@ -244,9 +178,9 @@ command_t* CommandParser::GetHandler(const std::string &commandname) // calls a handler function for a command -CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user) +CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user) { - command_table::iterator n = cmdlist.find(commandname); + Commandable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { @@ -280,7 +214,7 @@ CmdResult CommandParser::CallHandler(const std::string &commandname,const char** return CMD_INVALID; } -void CommandParser::ProcessCommand(userrec *user, std::string &cmd) +void CommandParser::ProcessCommand(User *user, std::string &cmd) { const char *command_p[MAXPARAMETERS]; int items = 0; @@ -310,78 +244,86 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd) return; } - command_table::iterator cm = cmdlist.find(command); + if (!user) + { + /* + * before, we went and found the command even with no user.. seems nonsensical. + * I'm not entirely sure when we would be passed NULL, but let's handle it + * anyway, by dropping it like a hot potato. -- w00t + */ + return; + } + + /* find the command, check it exists */ + Commandable::iterator cm = cmdlist.find(command); - if (cm != cmdlist.end()) + if (cm == cmdlist.end()) { - if (user) + ServerInstance->stats->statsUnknown++; + user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); + return; + } + + /* activity resets the ping pending timer */ + user->nping = ServerInstance->Time() + user->pingmax; + if (cm->second->flags_needed) + { + if (!user->IsModeSet(cm->second->flags_needed)) { - /* activity resets the ping pending timer */ - user->nping = ServerInstance->Time() + user->pingmax; - if (cm->second->flags_needed) - { - if (!user->IsModeSet(cm->second->flags_needed)) - { - user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",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 ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) - { - /* command is disabled! */ - user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str()); - ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)", - command.c_str(), user->nick, user->ident, user->host); - return; - } - if (items < cm->second->min_params) - { - user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str()); - if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (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->WorksBeforeReg())) - { - /* 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,cmd)); - if (MOD_RESULT == 1) - return; - - /* - * WARNING: be careful, the user may be deleted soon - */ - CmdResult result = cm->second->Handle(command_p,items,user); - - FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); - return; - } - else - { - user->WriteServ("451 %s :You have not registered",command.c_str()); - return; - } + user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",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; } } - else if (user) + if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) { - ServerInstance->stats->statsUnknown++; - user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); + /* command is disabled! */ + user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str()); + ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)", + command.c_str(), user->nick, user->ident, user->host); + return; + } + if (items < cm->second->min_params) + { + user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str()); + if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (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->WorksBeforeReg())) + { + user->WriteServ("451 %s :You have not registered",command.c_str()); + return; + } + else + { + /* passed all checks.. first, do the (ugly) stats counters. */ + cm->second->use_count++; + cm->second->total_bytes += cmd.length(); + + /* module calls too */ + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd)); + if (MOD_RESULT == 1) + return; + + /* + * WARNING: be careful, the user may be deleted soon + */ + CmdResult result = cm->second->Handle(command_p,items,user); + + FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); + return; } } bool CommandParser::RemoveCommands(const char* source) { - command_table::iterator i,safei; + Commandable::iterator i,safei; for (i = cmdlist.begin(); i != cmdlist.end(); i++) { safei = i; @@ -399,9 +341,9 @@ bool CommandParser::RemoveCommands(const char* source) return true; } -void CommandParser::RemoveCommand(command_table::iterator safei, const char* source) +void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source) { - command_t* x = safei->second; + Command* x = safei->second; if (x->source == std::string(source)) { cmdlist.erase(safei); @@ -409,7 +351,7 @@ void CommandParser::RemoveCommand(command_table::iterator safei, const char* sou } } -void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) +void CommandParser::ProcessBuffer(std::string &buffer,User *user) { std::string::size_type a; @@ -425,13 +367,13 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) { if (!user->muted) { - ServerInstance->Log(DEBUG,"C[%d] -> :%s %s",user->GetFd(), user->nick, buffer.c_str()); + ServerInstance->Log(DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str()); this->ProcessCommand(user,buffer); } } } -bool CommandParser::CreateCommand(command_t *f, void* so_handle) +bool CommandParser::CreateCommand(Command *f, void* so_handle) { if (so_handle) { @@ -458,19 +400,19 @@ CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) para.resize(128); } -bool CommandParser::FindSym(void** v, void* h) +bool CommandParser::FindSym(void** v, void* h, const std::string &name) { *v = dlsym(h, "init_command"); const char* err = dlerror(); if (err && !(*v)) { - ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err); + ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name.c_str(), err); return false; } return true; } -bool CommandParser::ReloadCommand(const char* cmd, userrec* user) +bool CommandParser::ReloadCommand(const char* cmd, User* user) { char filename[MAXBUF]; char commandname[MAXBUF]; @@ -485,7 +427,7 @@ bool CommandParser::ReloadCommand(const char* cmd, userrec* user) if (command != RFCCommands.end()) { - command_t* cmdptr = cmdlist.find(commandname)->second; + Command* cmdptr = cmdlist.find(commandname)->second; cmdlist.erase(cmdlist.find(commandname)); for (char* x = commandname; *x; x++) @@ -511,7 +453,7 @@ bool CommandParser::ReloadCommand(const char* cmd, userrec* user) return false; } -CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user) +CmdResult cmd_reload::Handle(const char** parameters, int pcnt, User *user) { user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]); if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) @@ -531,7 +473,7 @@ const char* CommandParser::LoadCommand(const char* name) { char filename[MAXBUF]; void* h; - command_t* (*cmd_factory_func)(InspIRCd*); + Command* (*cmd_factory_func)(InspIRCd*); /* Command already exists? Succeed silently - this is needed for REHASH */ if (RFCCommands.find(name) != RFCCommands.end()) @@ -546,19 +488,19 @@ const char* CommandParser::LoadCommand(const char* name) if (!h) { const char* n = dlerror(); - ServerInstance->Log(SPARSE, "Error loading core command: %s", n); + ServerInstance->Log(SPARSE, "Error loading core command %s: %s", name, n); return n; } - if (this->FindSym((void **)&cmd_factory_func, h)) + if (this->FindSym((void **)&cmd_factory_func, h, name)) { - command_t* newcommand = cmd_factory_func(ServerInstance); + Command* newcommand = cmd_factory_func(ServerInstance); this->CreateCommand(newcommand, h); } return NULL; } -void CommandParser::SetupCommandTable(userrec* user) +void CommandParser::SetupCommandTable(User* user) { RFCCommands.clear(); @@ -607,27 +549,23 @@ void CommandParser::SetupCommandTable(userrec* user) int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest) { - userrec* user = NULL; + User* user = NULL; std::string item; int translations = 0; + dest.clear(); switch (to) { case TR_NICK: /* Translate single nickname */ - ServerInstance->Log(DEBUG,"TR_NICK"); user = ServerInstance->FindNick(source); if (user) { - ServerInstance->Log(DEBUG,"Managed UUID"); dest = user->uuid; translations++; } else - { - ServerInstance->Log(DEBUG,"Had to use source.. (%s)", source.c_str()); dest = source; - } break; case TR_NICKLIST: { @@ -642,7 +580,7 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st translations++; } else - dest.append(source); + dest.append(item); dest.append(","); } if (!dest.empty()) @@ -662,7 +600,7 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st translations++; } else - dest.append(source); + dest.append(item); dest.append(" "); } if (!dest.empty())