X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=3893ad5bf3b22df33072b95a18000a3782669b9a;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=ddfede7f2533b036347b921e6f2d7d56bfd8db92;hpb=740b09e2aee345c6fde199986d8eab6e0db224e3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index ddfede7f2..3893ad5bf 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -2,12 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * @@ -17,126 +14,260 @@ #include "users.h" #include "channels.h" #include "modules.h" +#include "inspircd.h" +#include "wildcard.h" #include -/* $ModDesc: Changes the ident of connecting bottler clients to 'bottler' */ +/* $ModDesc: Provides aliases of commands. */ -class Alias +/** An alias definition + */ +class Alias : public classbase { public: - std::string text; - std::string replace_with; - std::string requires; - bool uline; + /** 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; + /* is case sensitive params */ + bool case_sensitive; + /** Format that must be matched for use */ + std::string format; }; class ModuleAlias : public Module { private: - - Server *Srv; - ConfigReader *MyConf; - std::vector Aliases; - public: - + /** 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; - a.text = MyConf->ReadValue("alias", "text", i); - 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")); - + std::string txt; + txt = MyConf.ReadValue("alias", "text", i); + a.text = txt.c_str(); + 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() + ModuleAlias(InspIRCd* Me) + : Module::Module(Me) { - Srv = new Server; - MyConf = new ConfigReader; - ReadAliases(); + pars.resize(127); } - + + void Implements(char* List) + { + List[I_OnPreCommand] = List[I_OnRehash] = 1; + } + virtual ~ModuleAlias() { - delete Srv; - delete MyConf; } - + virtual Version GetVersion() { - return Version(1,0,0,0); + 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 void OnServerRaw(std::string &raw, bool inbound, userrec* user) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) { - if (inbound) + userrec *u = NULL; + + /* If theyre not registered yet, we dont want + * to know. + */ + 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++) { - char data[MAXBUF]; - strncpy(data,raw.c_str(),MAXBUF); - char* dptr = data; - - for (int i = 0; i < Aliases.size(); i++) + if (Aliases[i].text == c) { - if (!strncasecmp(Aliases[i].text.c_str(),data,Aliases[i].text.length())) + /* Does it match the pattern? */ + if (!Aliases[i].format.empty()) { - userrec* u = NULL; - - if (Aliases[i].requires != "") - { - u = Srv->FindNick(Aliases[i].requires); - } - - if ((Aliases[i].requires != "") && (!u)) - { - Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); - raw = "PONG :"+Srv->GetServerName(); - return; - } - if (Aliases[i].uline) + 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); + if (!u) { - if (!Srv->IsUlined(u->server)) - { - Srv->SendOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+Aliases[i].text+" 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."); - raw = "PONG :"+Srv->GetServerName(); - return; - } + user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); + return 1; } - - dptr += Aliases[i].text.length(); - if (strlen(dptr)) + } + if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline)) + { + if (!ServerInstance->ULine(u->server)) { - raw = Aliases[i].replace_with + std::string(dptr); + 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; } - else + } + + /* 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 + { + irc::sepstream commands(Aliases[i].replace_with, '\n'); + std::string command = "*"; + while ((command = commands.GetToken()) != "") { - raw = Aliases[i].replace_with; + DoCommand(command, user, safe); } - return; + return 1; } } } - } - - virtual void OnRehash() + 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(userrec* user, const std::string ¶meter) { - delete MyConf; - MyConf = new ConfigReader; - ReadAliases(); - } + } }; @@ -146,16 +277,15 @@ class ModuleAliasFactory : public ModuleFactory ModuleAliasFactory() { } - + ~ModuleAliasFactory() { } - - virtual Module * CreateModule() + + virtual Module * CreateModule(InspIRCd* Me) { - return new ModuleAlias; + return new ModuleAlias(Me); } - };