X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=e0e4e647797aba3e1d8f2b5902f8094fd342bb28;hb=bc344671460c1675fbc31504fd1ffc03ff58a135;hp=fc07b5f2dc0469b8d60413488270e260ccc6c36a;hpb=e4371c74f90239ae3f9bd269a712aa31ce97b6f6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index fc07b5f2d..e0e4e6477 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -1,26 +1,18 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2008 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 +#include "wildcard.h" /* $ModDesc: Provides aliases of commands. */ @@ -37,12 +29,20 @@ 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: + /** 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() @@ -50,34 +50,33 @@ 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); - } + Me->Modules->Attach(I_OnPreCommand, this); + Me->Modules->Attach(I_OnRehash, this); - void Implements(char* List) - { - List[I_OnPreCommand] = List[I_OnRehash] = 1; } virtual ~ModuleAlias() @@ -86,7 +85,7 @@ class ModuleAlias : public Module virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR); + return Version(1,2,0,1,VF_VENDOR,API_VERSION); } std::string GetVar(std::string varname, const std::string &original_line) @@ -96,25 +95,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,121 +124,142 @@ 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) + virtual int OnPreCommand(const std::string &command, const std::vector ¶meters, User *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 + User *u = NULL; + + /* 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].requires != "") + /* 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.empty()) { u = ServerInstance->FindNick(Aliases[i].requires); if (!u) { - user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); + user->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); 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)) { - 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."); + ServerInstance->SNO->WriteToSnoMask('A', "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->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible."); return 1; } } /* Now, search and replace in a copy of the original_line, replacing $1 through $9 and $1- etc */ - std::string newline = Aliases[i].replace_with; + std::string::size_type crlf = Aliases[i].replace_with.find('\n'); - for (int v = 1; v < 10; v++) + if (crlf == std::string::npos) { - 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) + DoCommand(Aliases[i].replace_with, user, safe); + return 1; + } + else + { + irc::sepstream commands(Aliases[i].replace_with, '\n'); + std::string scommand; + while (commands.GetToken(scommand)) { - newline.erase(x, var.length()); - newline.insert(x, GetVar(var, original_line)); - x = newline.find(var); + DoCommand(scommand, user, safe); } + return 1; } + } + } + return 0; + } - /* Special variables */ - SearchAndReplace(newline, "$nick", user->nick); - SearchAndReplace(newline, "$ident", user->ident); - SearchAndReplace(newline, "$host", user->host); - SearchAndReplace(newline, "$vhost", user->dhost); + void DoCommand(std::string newline, User* 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); - irc::tokenstream ss(newline); - const char* parv[127]; - int x = 0; + while (x != std::string::npos) + { + newline.erase(x, var.length()); + newline.insert(x, GetVar(var, original_line)); + x = newline.find(var); + } - while ((pars[x] = ss.GetToken()) != "") - { - parv[x] = pars[x].c_str(); - ServerInstance->Log(DEBUG,"Parameter %d: %s", x, parv[x]); - x++; - } + var = "$"; + var.append(ConvToStr(v)); + x = newline.find(var); - ServerInstance->CallCommandHandler(parv[0], &parv[1], x-1, user); - return 1; + while (x != std::string::npos) + { + newline.erase(x, var.length()); + newline.insert(x, GetVar(var, original_line)); + x = newline.find(var); } } - return 0; - } - - virtual void OnRehash(const std::string ¶meter) - { - ReadAliases(); - } -}; + /* Special variables */ + SearchAndReplace(newline, "$nick", user->nick); + SearchAndReplace(newline, "$ident", user->ident); + SearchAndReplace(newline, "$host", user->host); + SearchAndReplace(newline, "$vhost", user->dhost); -class ModuleAliasFactory : public ModuleFactory -{ - public: - ModuleAliasFactory() - { - } + /* Unescape any variable names in the user text before sending */ + SearchAndReplace(newline, "\r", "$"); - ~ModuleAliasFactory() - { - } + irc::tokenstream ss(newline); + pars.clear(); + std::string command, token; - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleAlias(Me); + ss.GetToken(command); + while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS)) + { + pars.push_back(token); + } + ServerInstance->Parser->CallHandler(command, pars, user); } + + virtual void OnRehash(User* user, const std::string ¶meter) + { + ReadAliases(); + } }; - -extern "C" void * init_module( void ) -{ - return new ModuleAliasFactory; -} - +MODULE_INIT(ModuleAlias)