X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=e0e4e647797aba3e1d8f2b5902f8094fd342bb28;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=a0d361e78b7f668728f29023ea8934c346d5cf17;hpb=48411d8c6b214282174519d5e31e8a4144c135cc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index a0d361e78..e0e4e6477 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -1,181 +1,265 @@ -/* +------------------------------------+ - * | 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 * - * Inspire is copyright (C) 2002-2004 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 "helperfuncs.h" -#include +#include "inspircd.h" +#include "wildcard.h" /* $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; + /* 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; - - /* XXX - small issue, why is this marked public when it's not (really) intended for external use - * Fixed 30/11/05 by Brain as suggestion by w00t */ - 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); - } - - } + private: + /** We cant use a map, there may be multiple aliases with the same name */ + std::vector Aliases; + std::map AliasMap; + std::vector pars; - public: - - ModuleAlias(Server* Me) - : Module::Module(Me) + virtual void ReadAliases() + { + ConfigReader MyConf(ServerInstance); + + Aliases.clear(); + AliasMap.clear(); + 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, 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: - virtual ~ModuleAlias() + ModuleAlias(InspIRCd* Me) + : Module(Me) + { + ReadAliases(); + Me->Modules->Attach(I_OnPreCommand, this); + Me->Modules->Attach(I_OnRehash, this); + + } + + virtual ~ModuleAlias() + { + } + + virtual Version GetVersion() + { + return Version(1,2,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++) + ss.GetToken(word); + + if (everything_after) { - delete MyConf; + std::string more; + while (ss.GetToken(more)) + { + word.append(" "); + word.append(more); + } } - - virtual Version GetVersion() + + 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, const std::vector ¶meters, User *user, bool validated, const std::string &original_line) + { + User *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()); - virtual int OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user, bool validated) + 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++) { - userrec *u = NULL; - irc::string c = command.c_str(); - - /* If the command is valid, we dont want to know */ - if (validated) - return 0; - - for (unsigned int i = 0; i < Aliases.size(); i++) + if (Aliases[i].text == c) { - log(DEBUG,"Check against alias %s: %s",Aliases[i].text.c_str(),c.c_str()); - if (Aliases[i].text == c) + /* Does it match the pattern? */ + if (!Aliases[i].format.empty()) { - if (Aliases[i].requires != "") - { - u = Srv->FindNick(Aliases[i].requires); - } - - if ((Aliases[i].requires != "") && (!u)) + 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) { - Srv->SendServ(user->fd,"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 (Aliases[i].uline) + } + if ((u != NULL) && (!Aliases[i].requires.empty()) && (Aliases[i].uline)) + { + if (!ServerInstance->ULine(u->server)) { - 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; - } + 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; } + } - std::stringstream stuff(Aliases[i].replace_with); - for (int j = 1; j < pcnt; j++) - { - if (j) - stuff << " "; - stuff << parameters[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'); - std::vector items; - while (!stuff.eof()) + 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 scommand; + while (commands.GetToken(scommand)) { - std::string data; - stuff >> data; - items.push_back(data); + DoCommand(scommand, user, safe); } - - char* para[127]; - - for (unsigned int j = 1; j < items.size(); j++) - para[j-1] = (char*)items[j].c_str(); - - Srv->CallCommandHandler(items[0],para,items.size()-1,user); return 1; } } - return 0; - } - - virtual void OnRehash(std::string parameter) + } + return 0; + } + + void DoCommand(std::string newline, User* 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); + } -class ModuleAliasFactory : public ModuleFactory -{ - public: - ModuleAliasFactory() - { - } - - ~ModuleAliasFactory() - { + 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); + } } - - virtual Module * CreateModule(Server* Me) + + /* 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); + pars.clear(); + std::string command, token; + + ss.GetToken(command); + while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS)) { - return new ModuleAlias(Me); + 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)