X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=2bf4440b0821cb30712e634b9803f705f6bbd292;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=804e9c5b58ce139bdb6179367fbee7e6602ef008;hpb=daa206e243ef797a7199b4ee9927342f6a79b90a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 804e9c5b5..2bf4440b0 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -11,11 +11,11 @@ * --------------------------------------------------- */ +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" -#include +#include "wildcard.h" /* $ModDesc: Provides aliases of commands. */ @@ -34,12 +34,18 @@ class Alias : public classbase bool uline; /** Requires oper? */ bool operonly; + /* is case sensitive params */ + bool case_sensitive; + /** Format that must be matched for use */ + std::string format; }; class ModuleAlias : public Module { private: + /** We cant use a map, there may be multiple aliases with the same name */ std::vector Aliases; + std::map AliasMap; std::vector pars; virtual void ReadAliases() @@ -47,29 +53,31 @@ class ModuleAlias : public Module ConfigReader MyConf(ServerInstance); Aliases.clear(); - + AliasMap.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.replace_with = MyConf.ReadValue("alias", "replace", i, true); a.requires = MyConf.ReadValue("alias", "requires", i); a.uline = MyConf.ReadFlag("alias", "uline", i); a.operonly = MyConf.ReadFlag("alias", "operonly", i); + a.format = MyConf.ReadValue("alias", "format", i); + a.case_sensitive = MyConf.ReadFlag("alias", "matchcase", i); Aliases.push_back(a); + AliasMap[txt] = 1; } - } public: ModuleAlias(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { ReadAliases(); - pars.resize(127); + pars.resize(MAXPARAMETERS); } void Implements(char* List) @@ -93,25 +101,21 @@ class ModuleAlias : public Module 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" : ""); + std::string word; for (int j = 0; j < index; j++) - word = ss.GetToken(); + ss.GetToken(word); if (everything_after) { - std::string more = "*"; - while ((more = ss.GetToken()) != "") + std::string more; + while (ss.GetToken(more)) { word.append(" "); word.append(more); } } - ServerInstance->Log(DEBUG,"Var is '%s'", word.c_str()); - return word; } @@ -129,22 +133,44 @@ class ModuleAlias : public Module 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 theyre not registered yet, we dont want + * to know. */ - if ((validated) || (user->registered != REG_ALL)) + if (user->registered != REG_ALL) return 0; - + + /* We dont have any commands looking like this, dont bother with the loop */ + if (AliasMap.find(command) == AliasMap.end()) + return 0; + + irc::string c = command.c_str(); + /* The parameters for the command in their original form, with the command stripped off */ + std::string compare = original_line.substr(command.length()); + while (*(compare.c_str()) == ' ') + compare.erase(compare.begin()); + + std::string safe(original_line); + + /* Escape out any $ symbols in the user provided text */ + + SearchAndReplace(safe, "$", "\r"); + for (unsigned int i = 0; i < Aliases.size(); i++) { if (Aliases[i].text == c) { - if ((Aliases[i].operonly) && (!*user->oper)) + /* Does it match the pattern? */ + if (!Aliases[i].format.empty()) + { + if (!match(Aliases[i].case_sensitive, compare.c_str(), Aliases[i].format.c_str())) + continue; + } + + if ((Aliases[i].operonly) && (!IS_OPER(user))) return 0; - if (Aliases[i].requires != "") + if (!Aliases[i].requires.empty()) { u = ServerInstance->FindNick(Aliases[i].requires); if (!u) @@ -153,7 +179,7 @@ class ModuleAlias : public Module return 1; } } - if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline)) + if ((u != NULL) && (!Aliases[i].requires.empty()) && (Aliases[i].uline)) { if (!ServerInstance->ULine(u->server)) { @@ -169,19 +195,16 @@ class ModuleAlias : public Module if (crlf == std::string::npos) { - ServerInstance->Log(DEBUG,"Single line alias: '%s'", Aliases[i].replace_with.c_str()); - DoCommand(Aliases[i].replace_with, user, original_line); + DoCommand(Aliases[i].replace_with, user, safe); return 1; } else { - ServerInstance->Log(DEBUG,"Multi line alias: '%s'", Aliases[i].replace_with.c_str()); irc::sepstream commands(Aliases[i].replace_with, '\n'); - std::string command = "*"; - while ((command = commands.GetToken()) != "") + std::string command; + while (commands.GetToken(command)) { - ServerInstance->Log(DEBUG,"Execute: '%s'", command.c_str()); - DoCommand(command, user, original_line); + DoCommand(command, user, safe); } return 1; } @@ -224,56 +247,26 @@ class ModuleAlias : public Module SearchAndReplace(newline, "$host", user->host); SearchAndReplace(newline, "$vhost", user->dhost); + /* Unescape any variable names in the user text before sending */ + SearchAndReplace(newline, "\r", "$"); + irc::tokenstream ss(newline); - const char* parv[127]; + const char* parv[MAXPARAMETERS]; int x = 0; - while ((pars[x] = ss.GetToken()) != "") + while (ss.GetToken(pars[x]) && x < MAXPARAMETERS) { parv[x] = pars[x].c_str(); - ServerInstance->Log(DEBUG,"Parameter %d: %s", x, parv[x]); x++; } - 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"); - } - else - { - ServerInstance->Log(DEBUG,"Command handler called successfully."); - } + ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user); } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(userrec* user, const std::string ¶meter) { ReadAliases(); } }; - -class ModuleAliasFactory : public ModuleFactory -{ - public: - ModuleAliasFactory() - { - } - - ~ModuleAliasFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleAlias(Me); - } -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleAliasFactory; -} - +MODULE_INIT(ModuleAlias)