X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=e751db6d338e55dcdd74950b9a1827ca8d5a2112;hb=45776df702235ec38625403778daff4c7aed4e4e;hp=3ce91afda59f37b402435085e6f22cb7163420a4;hpb=3712db9cc6365e556a803daf32416ae929e95330;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 3ce91afda..e751db6d3 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -1,4 +1,4 @@ - /* +------------------------------------+ +/* +------------------------------------+ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * @@ -12,17 +12,18 @@ */ #include "inspircd.h" -#include "configreader.h" -#include -#include -#include -#include "users.h" -#include "modules.h" #include "wildcard.h" #include "xline.h" #include "socketengine.h" #include "socket.h" #include "command_parse.h" +#include "exitcodes.h" + +/* Directory Searching for Unix-Only */ +#ifndef WIN32 +#include +#include +#endif bool InspIRCd::ULine(const char* server) { @@ -31,162 +32,74 @@ bool InspIRCd::ULine(const char* server) if (!*server) return true; - return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end()); + 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; FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber)) - Log(DEBUG,"OperPassCompare: %d",MOD_RESULT); if (MOD_RESULT == 1) return 0; if (MOD_RESULT == -1) return 1; - Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input)); return strcmp(data,input); } -long InspIRCd::Duration(const char* str) +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) { - char n_field[MAXBUF]; + unsigned char multiplier = 0; long total = 0; - n_field[0] = 0; + long times = 1; + long subtotal = 0; - if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y'))) - { - std::string n = str; - n += 's'; - return Duration(n.c_str()); - } - - for (char* i = (char*)str; *i; i++) + /* Iterate each item in the string, looking for number or multiplier */ + for (std::string::const_reverse_iterator i = str.rbegin(); i != str.rend(); ++i) { - // if we have digits, build up a string for the value in n_field, - // up to 10 digits in size. + /* Found a number, queue it onto the current number */ if ((*i >= '0') && (*i <= '9')) { - strlcat(n_field,i,10); + subtotal = subtotal + ((*i - '0') * times); + times = times * 10; } else { - // we dont have a digit, check for numeric tokens - switch (tolower(*i)) - { - case 's': - total += atoi(n_field); - break; - - case 'm': - total += (atoi(n_field)*duration_m); - break; - - case 'h': - total += (atoi(n_field)*duration_h); - break; - - case 'd': - total += (atoi(n_field)*duration_d); - break; - - case 'w': - total += (atoi(n_field)*duration_w); - break; + /* 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]; - case 'y': - total += (atoi(n_field)*duration_y); - break; - } - n_field[0] = 0; + /* Next subtotal please */ + subtotal = 0; + multiplier = *i; + times = 1; } } - // add trailing seconds - total += atoi(n_field); - - return total; -} - -/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */ - -bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user) -{ - char buffer[MAXBUF]; - char itrigger[MAXBUF]; - long matches = 0; - - if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF)) - strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0)) - return false; - - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - strlcpy(buffer,u->second->ident,MAXBUF); - charlcat(buffer,'@',MAXBUF); - strlcat(buffer,u->second->host,MAXBUF); - if (match(buffer,mask.c_str())) - matches++; - } - float percent = ((float)matches / (float)clientlist.size()) * 100; - if (percent > (float)atof(itrigger)) - { - WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent); - return true; - } - return false; -} - -bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user) -{ - char itrigger[MAXBUF]; - long matches = 0; - - if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF)) - strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0)) - return false; - - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - if (match(u->second->GetIPString(),ip.c_str(),true)) - matches++; - } - - float percent = ((float)matches / (float)clientlist.size()) * 100; - if (percent > (float)atof(itrigger)) - { - WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent); - return true; - } - return false; -} - -bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user) -{ - char itrigger[MAXBUF]; - long matches = 0; - - if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF)) - strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0)) - return false; - - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + if (multiplier) { - if (match(u->second->nick,nick.c_str())) - matches++; + total += subtotal * duration_multi[multiplier]; + subtotal = 0; } - - float percent = ((float)matches / (float)clientlist.size()) * 100; - if (percent > (float)atof(itrigger)) - { - WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent); - return true; - } - return false; + /* 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. @@ -217,29 +130,30 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p */ irc::commasepstream items1(parameters[splithere]); irc::commasepstream items2(parameters[extra]); - std::string item = "*"; + 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++ < ServerInstance->Config->MaxTargets)) + while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) { if (dupes.find(item.c_str()) == dupes.end()) { - const char* new_parameters[127]; + const char* new_parameters[MAXPARAMETERS]; - for (int t = 0; (t < pcnt) && (t < 127); t++) + for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++) new_parameters[t] = parameters[t]; - std::string extrastuff = items2.GetToken(); + if (!items2.GetToken(extrastuff)) + extrastuff = ""; new_parameters[splithere] = item.c_str(); new_parameters[extra] = extrastuff.c_str(); - if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED) - return 1; + CommandObj->Handle(new_parameters,pcnt,user); dupes[item.c_str()] = true; } @@ -258,22 +172,21 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p std::map dupes; /* Only one commasepstream here */ - ServerInstance->Log(DEBUG,"Splitting '%s'",parameters[splithere]); irc::commasepstream items1(parameters[splithere]); - std::string item = "*"; + 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 */ - while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) + while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) { if (dupes.find(item.c_str()) == dupes.end()) { - const char* new_parameters[127]; + const char* new_parameters[MAXPARAMETERS]; - for (int t = 0; (t < pcnt) && (t < 127); t++) + for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++) new_parameters[t] = parameters[t]; new_parameters[splithere] = item.c_str(); @@ -284,8 +197,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p * record out from under us (e.g. if we /kill a comma sep list, and we're * in that list ourselves) abort if we're gone. */ - if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED) - return 1; + CommandObj->Handle(new_parameters,pcnt,user); dupes[item.c_str()] = true; } @@ -299,18 +211,21 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + command_table::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { if ((pcnt>=n->second->min_params) && (n->second->source != "")) { - 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)) || (ServerInstance->ULine(user->server))); + return (user->HasPermission(commandname)); } + } + else + { return true; } } @@ -320,7 +235,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use command_t* CommandParser::GetHandler(const std::string &commandname) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + command_table::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) return n->second; @@ -331,26 +246,35 @@ command_t* CommandParser::GetHandler(const std::string &commandname) CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + command_table::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { if (pcnt >= 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))) - { - return n->second->Handle(parameters,pcnt,user); - } - } - else + /* if user is local, and flags are needed .. */ + + if (user->IsModeSet(n->second->flags_needed)) { - return n->second->Handle(parameters,pcnt,user); + /* 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,pcnt,user); + } } } return CMD_INVALID; @@ -358,12 +282,21 @@ CmdResult CommandParser::CallHandler(const std::string &commandname,const char** void CommandParser::ProcessCommand(userrec *user, std::string &cmd) { - const char *command_p[127]; + const char *command_p[MAXPARAMETERS]; int items = 0; irc::tokenstream tokens(cmd); - std::string command = tokens.GetToken(); + std::string command; + tokens.GetToken(command); - while (((para[items] = tokens.GetToken()) != "") && (items < 127)) + /* 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.c_str() == ':') + tokens.GetToken(command); + + while (tokens.GetToken(para[items]) && (items < MAXPARAMETERS)) { command_p[items] = para[items].c_str(); items++; @@ -377,7 +310,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd) return; } - nspace::hash_map::iterator cm = cmdlist.find(command); + command_table::iterator cm = cmdlist.find(command); if (cm != cmdlist.end()) { @@ -389,26 +322,27 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd) { if (!user->IsModeSet(cm->second->flags_needed)) { - user->WriteServ("481 %s :Permission Denied- You do not have the required operator privileges",user->nick); + 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()); + 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) && (!*user->oper) && (cm->second->IsDisabled())) + 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 syntax is given, display this as the 461 reply */ - if ((ServerInstance->Config->SyntaxHints) && (cm->second->syntax.length())) + 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; } @@ -424,16 +358,11 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd) return; /* - * 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,items,user); - if (result != CMD_USER_DELETED) - { - FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); - } + FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); return; } else @@ -452,7 +381,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd) bool CommandParser::RemoveCommands(const char* source) { - nspace::hash_map::iterator i,safei; + command_table::iterator i,safei; for (i = cmdlist.begin(); i != cmdlist.end(); i++) { safei = i; @@ -470,13 +399,13 @@ bool CommandParser::RemoveCommands(const char* source) return true; } -void CommandParser::RemoveCommand(nspace::hash_map::iterator safei, const char* source) +void CommandParser::RemoveCommand(command_table::iterator safei, const char* source) { command_t* x = safei->second; if (x->source == std::string(source)) { - ServerInstance->Log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str()); cmdlist.erase(safei); + delete x; } } @@ -494,8 +423,11 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) if (buffer.length()) { - ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str()); - this->ProcessCommand(user,buffer); + if (!user->muted) + { + ServerInstance->Log(DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str()); + this->ProcessCommand(user,buffer); + } } } @@ -504,10 +436,7 @@ bool CommandParser::CreateCommand(command_t *f, void* so_handle) if (so_handle) { if (RFCCommands.find(f->command) == RFCCommands.end()) - { RFCCommands[f->command] = so_handle; - ServerInstance->Log(DEFAULT,"Monitoring RFC-specified reloadable command at %8x",so_handle); - } else { ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded."); @@ -519,7 +448,6 @@ bool CommandParser::CreateCommand(command_t *f, void* so_handle) if (cmdlist.find(f->command) == cmdlist.end()) { cmdlist[f->command] = f; - ServerInstance->Log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params); return true; } else return false; @@ -528,22 +456,21 @@ bool CommandParser::CreateCommand(command_t *f, void* so_handle) CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) { para.resize(128); - this->SetupCommandTable(); } -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) + if (err && !(*v)) { - ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err); + ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name, err); return false; } return true; } -bool CommandParser::ReloadCommand(const char* cmd) +bool CommandParser::ReloadCommand(const char* cmd, userrec* user) { char filename[MAXBUF]; char commandname[MAXBUF]; @@ -570,7 +497,13 @@ bool CommandParser::ReloadCommand(const char* cmd) RFCCommands.erase(command); snprintf(filename, MAXBUF, "cmd_%s.so", commandname); - this->LoadCommand(filename); + const char* err = this->LoadCommand(filename); + if (err) + { + if (user) + user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick, cmd, err); + return false; + } return true; } @@ -581,7 +514,7 @@ bool CommandParser::ReloadCommand(const char* cmd) CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user) { user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]); - if (ServerInstance->Parser->ReloadCommand(parameters[0])) + if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) { user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0]); ServerInstance->WriteOpers("*** RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0]); @@ -589,39 +522,52 @@ CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user) } else { - user->WriteServ("NOTICE %s :*** Could not reload command '%s'", user->nick, parameters[0]); + user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick, parameters[0]); return CMD_FAILURE; } } -void CommandParser::LoadCommand(const char* name) +const char* CommandParser::LoadCommand(const char* name) { char filename[MAXBUF]; void* h; command_t* (*cmd_factory_func)(InspIRCd*); - snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name); - ServerInstance->Log(DEBUG,"Load command: %s", filename); + /* Command already exists? Succeed silently - this is needed for REHASH */ + if (RFCCommands.find(name) != RFCCommands.end()) + { + ServerInstance->Log(DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name); + return NULL; + } + snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name); h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); if (!h) { - ServerInstance->Log(SPARSE, "Error loading core command: %s", dlerror()); - return; + const char* n = dlerror(); + 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); this->CreateCommand(newcommand, h); } + return NULL; } -void CommandParser::SetupCommandTable() +void CommandParser::SetupCommandTable(userrec* user) { RFCCommands.clear(); + if (!user) + { + printf("\nLoading core commands"); + fflush(stdout); + } + DIR* library = opendir(LIBRARYDIR); if (library) { @@ -630,12 +576,107 @@ void CommandParser::SetupCommandTable() { if (match(entry->d_name, "cmd_*.so")) { - this->LoadCommand(entry->d_name); + if (!user) + { + printf("."); + fflush(stdout); + } + const char* err = this->LoadCommand(entry->d_name); + if (err) + { + if (user) + { + user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick, entry->d_name, err); + } + else + { + printf("Error loading %s: %s", entry->d_name, err); + exit(EXIT_STATUS_BADHANDLER); + } + } } } closedir(library); + if (!user) + printf("\n"); + } + + if (cmdlist.find("RELOAD") == cmdlist.end()) + this->CreateCommand(new cmd_reload(ServerInstance)); +} + +int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest) +{ + userrec* user = NULL; + std::string item; + int translations = 0; + + 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: + { + /* Translate comma seperated list of nicknames */ + irc::commasepstream items(source); + while (items.GetToken(item)) + { + user = ServerInstance->FindNick(item); + if (user) + { + dest.append(user->uuid); + translations++; + } + else + dest.append(source); + dest.append(","); + } + if (!dest.empty()) + dest.erase(dest.end() - 1); + } + break; + case TR_SPACENICKLIST: + { + /* Translate space seperated list of nicknames */ + irc::spacesepstream items(source); + while (items.GetToken(item)) + { + user = ServerInstance->FindNick(item); + if (user) + { + dest.append(user->uuid); + translations++; + } + else + dest.append(source); + dest.append(" "); + } + if (!dest.empty()) + dest.erase(dest.end() - 1); + } + break; + case TR_END: + case TR_TEXT: + default: + /* Do nothing */ + dest = source; + break; } - this->CreateCommand(new cmd_reload(ServerInstance)); + return translations; }