X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=3893ad5bf3b22df33072b95a18000a3782669b9a;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=6a4eaf7953e2237306ba6efdd4acf196809a9eeb;hpb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 6a4eaf795..3893ad5bf 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -1,25 +1,21 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - *the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - #include "users.h" #include "channels.h" #include "modules.h" #include "inspircd.h" +#include "wildcard.h" #include /* $ModDesc: Provides aliases of commands. */ @@ -37,34 +33,43 @@ class Alias : public classbase std::string requires; /** Alias requires ulined server */ 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: - ConfigReader *MyConf; + /** 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() { + ConfigReader MyConf(ServerInstance); + Aliases.clear(); - - for (int i = 0; i < MyConf->Enumerate("alias"); i++) + AliasMap.clear(); + for (int i = 0; i < MyConf.Enumerate("alias"); i++) { Alias a; std::string txt; - txt = MyConf->ReadValue("alias", "text", i); + 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")); - + 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: @@ -72,9 +77,8 @@ class ModuleAlias : public Module ModuleAlias(InspIRCd* Me) : Module::Module(Me) { - - MyConf = new ConfigReader(ServerInstance); ReadAliases(); + pars.resize(127); } void Implements(char* List) @@ -84,29 +88,89 @@ class ModuleAlias : public Module virtual ~ModuleAlias() { - DELETE(MyConf); } virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR); + 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 = ""; + + for (int j = 0; j < index; j++) + word = ss.GetToken(); + + if (everything_after) + { + std::string more = "*"; + while ((more = ss.GetToken()) != "") + { + word.append(" "); + word.append(more); + } + } + + 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) + { + newline.erase(x, find.length()); + newline.insert(x, replace); + x = newline.find(find); + } } 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) { + /* 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) && (!*user->oper)) + return 0; + if (Aliases[i].requires != "") { u = ServerInstance->FindNick(Aliases[i].requires); @@ -125,34 +189,83 @@ class ModuleAlias : public Module return 1; } } - std::string n = ""; - for (int j = 0; j < pcnt; j++) + + /* Now, search and replace in a copy of the original_line, replacing $1 through $9 and $1- etc */ + + std::string::size_type crlf = Aliases[i].replace_with.find('\n'); + + if (crlf == std::string::npos) + { + DoCommand(Aliases[i].replace_with, user, safe); + return 1; + } + else { - if (j) - n = n + " "; - n = n + parameters[j]; + irc::sepstream commands(Aliases[i].replace_with, '\n'); + std::string command = "*"; + while ((command = commands.GetToken()) != "") + { + DoCommand(command, user, safe); + } + 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; - const char* para[2]; - para[0] = target.c_str(); - para[1] = n.c_str(); - ServerInstance->CallCommandHandler(cmd,para,2,user); - return 1; } } return 0; - } + } + + void DoCommand(std::string newline, userrec* user, const std::string &original_line) + { + for (int v = 1; v < 10; v++) + { + 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); + + 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); + + /* Unescape any variable names in the user text before sending */ + SearchAndReplace(newline, "\r", "$"); + + irc::tokenstream ss(newline); + const char* parv[127]; + int x = 0; + + while (ss.GetToken(pars[x])) + { + parv[x] = pars[x].c_str(); + x++; + } + + 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) { - DELETE(MyConf); - MyConf = new ConfigReader(ServerInstance); - ReadAliases(); } };