X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=88e07e2d0f677076df7eb7e786ce393375c86140;hb=124bc04e841f9ca527b99c37563f19a85dec63fc;hp=80b55e0a4ab911b90a92b02cde7457d52fd355f4;hpb=9a526c77cc57921d81f4d8617b7e42bdb72dc79c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 80b55e0a4..88e07e2d0 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -19,160 +19,258 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" #include /* $ModDesc: Provides aliases of commands. */ -class Alias +/** An alias definition + */ +class Alias : public classbase { - public: - irc::string text; - std::string replace_with; - std::string requires; - bool uline; + public: + /** The text of the alias command */ + irc::string text; + /** Text to replace with */ + std::string replace_with; + /** Nickname required to perform alias */ + std::string requires; + /** Alias requires ulined server */ + bool uline; + /** Requires oper? */ + bool operonly; }; class ModuleAlias : public Module { - private: - Server *Srv; - ConfigReader *MyConf; - std::vector Aliases; + private: + std::vector Aliases; + std::vector pars; - virtual void ReadAliases() - { - Aliases.clear(); - - for (int i = 0; i < MyConf->Enumerate("alias"); i++) - { - Alias a; - std::string txt; - txt = MyConf->ReadValue("alias", "text", i); - a.text = txt.c_str(); - a.replace_with = MyConf->ReadValue("alias", "replace", i); - a.requires = MyConf->ReadValue("alias", "requires", i); - - a.uline = ((MyConf->ReadValue("alias", "uline", i) == "yes") || - (MyConf->ReadValue("alias", "uline", i) == "1") || - (MyConf->ReadValue("alias", "uline", i) == "true")); - - Aliases.push_back(a); - } - - } + virtual void ReadAliases() + { + ConfigReader MyConf(ServerInstance); - public: + Aliases.clear(); - ModuleAlias(Server* Me) - : Module::Module(Me) + for (int i = 0; i < MyConf.Enumerate("alias"); i++) { - Srv = Me; - MyConf = new ConfigReader; - ReadAliases(); + Alias a; + std::string txt; + txt = MyConf.ReadValue("alias", "text", i); + a.text = txt.c_str(); + a.replace_with = MyConf.ReadValue("alias", "replace", i); + a.requires = MyConf.ReadValue("alias", "requires", i); + a.uline = MyConf.ReadFlag("alias", "uline", i); + a.operonly = MyConf.ReadFlag("alias", "operonly", i); + Aliases.push_back(a); } - void Implements(char* List) - { - List[I_OnPreCommand] = List[I_OnRehash] = 1; - } + } + + public: - virtual ~ModuleAlias() + ModuleAlias(InspIRCd* Me) + : Module::Module(Me) + { + ReadAliases(); + pars.resize(127); + } + + void Implements(char* List) + { + List[I_OnPreCommand] = List[I_OnRehash] = 1; + } + + virtual ~ModuleAlias() + { + } + + virtual Version GetVersion() + { + return Version(1,1,0,1,VF_VENDOR,API_VERSION); + } + + std::string GetVar(std::string varname, const std::string &original_line) + { + irc::spacesepstream ss(original_line); + varname.erase(varname.begin()); + int index = *(varname.begin()) - 48; + varname.erase(varname.begin()); + bool everything_after = (varname == "-"); + std::string word = ""; + + ServerInstance->Log(DEBUG,"Get var %d%s", index , everything_after ? " and all after it" : ""); + + for (int j = 0; j < index; j++) + word = ss.GetToken(); + + if (everything_after) { - delete MyConf; + std::string more = "*"; + while ((more = ss.GetToken()) != "") + { + word.append(" "); + word.append(more); + } } - - virtual Version GetVersion() + + ServerInstance->Log(DEBUG,"Var is '%s'", word.c_str()); + + return word; + } + + void SearchAndReplace(std::string& newline, const std::string &find, const std::string &replace) + { + std::string::size_type x = newline.find(find); + while (x != std::string::npos) { - return Version(1,0,0,1,VF_VENDOR); + newline.erase(x, find.length()); + newline.insert(x, replace); + x = newline.find(find); } + } - virtual int OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + { + userrec *u = NULL; + irc::string c = command.c_str(); + /* If the command is valid, we dont want to know, + * and if theyre not registered yet, we dont want + * to know either + */ + if ((validated) || (user->registered != REG_ALL)) + return 0; + + for (unsigned int i = 0; i < Aliases.size(); i++) { - userrec *u = NULL; - irc::string c = command.c_str(); - - /* If the command is valid, we dont want to know, - * and if theyre not registered yet, we dont want - * to know either - */ - if ((validated) || (user->registered != 7)) - return 0; - - for (unsigned int i = 0; i < Aliases.size(); i++) + if (Aliases[i].text == c) { - if (Aliases[i].text == c) + if ((Aliases[i].operonly) && (!*user->oper)) + return 0; + + if (Aliases[i].requires != "") { - if (Aliases[i].requires != "") - { - u = Srv->FindNick(Aliases[i].requires); - if (!u) - { - Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); - return 1; - } - } - if (Aliases[i].uline) + u = ServerInstance->FindNick(Aliases[i].requires); + if (!u) { - if (!Srv->IsUlined(u->server)) - { - Srv->SendOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); - Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible."); - return 1; - } + user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); + return 1; } - - std::string n = ""; - for (int j = 0; j < pcnt; j++) + } + if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline)) + { + if (!ServerInstance->ULine(u->server)) { - if (j) - n = n + " "; - n = n + parameters[j]; + ServerInstance->WriteOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); + user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible."); + return 1; } - /* Final param now in n as one string */ - std::stringstream stuff(Aliases[i].replace_with); + } - std::string cmd = ""; - std::string target = ""; - stuff >> cmd; - stuff >> target; + /* Now, search and replace in a copy of the original_line, replacing $1 through $9 and $1- etc */ - char* para[2]; - para[0] = (char*)target.c_str(); - para[1] = (char*)n.c_str(); + std::string::size_type crlf = Aliases[i].replace_with.find('\n'); - Srv->CallCommandHandler(cmd,para,2,user); + if (crlf == std::string::npos) + { + DoCommand(Aliases[i].replace_with, user, original_line); + return 1; + } + else + { + irc::sepstream commands(Aliases[i].replace_with, '\n'); + std::string command = "*"; + while ((command = commands.GetToken()) != "") + { + DoCommand(command, user, original_line); + } return 1; } } - return 0; - } - - virtual void OnRehash(const std::string ¶meter) + } + return 0; + } + + void DoCommand(std::string newline, userrec* user, const std::string &original_line) + { + for (int v = 1; v < 10; v++) { - delete MyConf; - MyConf = new ConfigReader; - - ReadAliases(); - } -}; + std::string var = "$"; + var.append(ConvToStr(v)); + var.append("-"); + std::string::size_type x = newline.find(var); + + while (x != std::string::npos) + { + newline.erase(x, var.length()); + newline.insert(x, GetVar(var, original_line)); + x = newline.find(var); + } + var = "$"; + var.append(ConvToStr(v)); + x = newline.find(var); -class ModuleAliasFactory : public ModuleFactory -{ - public: - ModuleAliasFactory() + while (x != std::string::npos) + { + newline.erase(x, var.length()); + newline.insert(x, GetVar(var, original_line)); + x = newline.find(var); + } + } + + /* Special variables */ + SearchAndReplace(newline, "$nick", user->nick); + SearchAndReplace(newline, "$ident", user->ident); + SearchAndReplace(newline, "$host", user->host); + SearchAndReplace(newline, "$vhost", user->dhost); + + irc::tokenstream ss(newline); + const char* parv[127]; + int x = 0; + + while ((pars[x] = ss.GetToken()) != "") { + parv[x] = pars[x].c_str(); + ServerInstance->Log(DEBUG,"Parameter %d: %s", x, parv[x]); + x++; } - - ~ModuleAliasFactory() + + ServerInstance->Log(DEBUG,"Call command handler on %s", parv[0]); + + if (ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user) == CMD_INVALID) { + ServerInstance->Log(DEBUG,"Unknown command or not enough parameters"); } - - virtual Module * CreateModule(Server* Me) + else { - return new ModuleAlias(Me); + ServerInstance->Log(DEBUG,"Command handler called successfully."); } + } + + virtual void OnRehash(const std::string ¶meter) + { + ReadAliases(); + } +}; + + +class ModuleAliasFactory : public ModuleFactory +{ + public: + ModuleAliasFactory() + { + } + + ~ModuleAliasFactory() + { + } + + virtual Module * CreateModule(InspIRCd* Me) + { + return new ModuleAlias(Me); + } };