X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=3f3c3b1ba916e2667a90b6bfdbedc10a21bee85d;hb=7107ec12d8640d35cfe3d5002db1bc1deb33625d;hp=096bdb5881f06887555ae4b683053bc28f511bea;hpb=a41015121dd1f01e9391a8a2b4d850a1b7f6820b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 096bdb588..3f3c3b1ba 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -21,17 +21,29 @@ class Alias : public classbase { public: /** The text of the alias command */ - irc::string text; + irc::string AliasedCommand; + /** Text to replace with */ - std::string replace_with; + std::string ReplaceFormat; + /** Nickname required to perform alias */ - std::string requires; + std::string RequiredNick; + /** Alias requires ulined server */ - bool uline; + bool ULineOnly; + /** Requires oper? */ - bool operonly; + bool OperOnly; + /* is case sensitive params */ - bool case_sensitive; + bool CaseSensitive; + + /* whether or not it may be executed via fantasy (default OFF) */ + bool ChannelCommand; + + /* whether or not it may be executed via /command (default ON) */ + bool UserCommand; + /** Format that must be matched for use */ std::string format; }; @@ -39,15 +51,26 @@ class Alias : public classbase class ModuleAlias : public Module { private: + + char fprefix; + /* We cant use a map, there may be multiple aliases with the same name. * We can, however, use a fancy invention: the multimap. Maps a key to one or more values. * -- w00t */ std::multimap Aliases; + /* whether or not +B users are allowed to use fantasy commands */ + bool AllowBots; + virtual void ReadAliases() { - ConfigReader MyConf(ServerInstance); + ConfigReader MyConf; + + AllowBots = MyConf.ReadFlag("fantasy", "allowbots", "no", 0); + + std::string fpre = MyConf.ReadValue("fantasy","prefix",0); + fprefix = fpre.empty() ? '!' : fpre[0]; Aliases.clear(); for (int i = 0; i < MyConf.Enumerate("alias"); i++) @@ -55,25 +78,27 @@ class ModuleAlias : public Module 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.AliasedCommand = txt.c_str(); + a.ReplaceFormat = MyConf.ReadValue("alias", "replace", i, true); + a.RequiredNick = MyConf.ReadValue("alias", "requires", i); + a.ULineOnly = MyConf.ReadFlag("alias", "uline", i); + a.ChannelCommand = MyConf.ReadFlag("alias", "channelcommand", "no", i); + a.UserCommand = MyConf.ReadFlag("alias", "usercommand", "yes", i); + a.OperOnly = MyConf.ReadFlag("alias", "operonly", i); a.format = MyConf.ReadValue("alias", "format", i); - a.case_sensitive = MyConf.ReadFlag("alias", "matchcase", i); + a.CaseSensitive = MyConf.ReadFlag("alias", "matchcase", i); Aliases.insert(std::make_pair(txt, a)); } } public: - ModuleAlias(InspIRCd* Me) - : Module(Me) - { + ModuleAlias() + { ReadAliases(); - Me->Modules->Attach(I_OnPreCommand, this); - Me->Modules->Attach(I_OnRehash, this); + ServerInstance->Modules->Attach(I_OnPreCommand, this); + ServerInstance->Modules->Attach(I_OnRehash, this); + ServerInstance->Modules->Attach(I_OnUserMessage, this); } @@ -83,7 +108,7 @@ class ModuleAlias : public Module virtual Version GetVersion() { - return Version("$Id$", VF_VENDOR,API_VERSION); + return Version("Provides aliases of commands.", VF_VENDOR,API_VERSION); } std::string GetVar(std::string varname, const std::string &original_line) @@ -111,32 +136,22 @@ class ModuleAlias : public Module return word; } - void SearchAndReplace(std::string& newline, const std::string &find, const std::string &replace) + virtual ModResult OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) { - 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(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) - { - User *u = NULL; - std::multimap::iterator i; + std::multimap::iterator i, upperbound; /* If theyre not registered yet, we dont want * to know. */ if (user->registered != REG_ALL) - return 0; + return MOD_RES_PASSTHRU; /* We dont have any commands looking like this? Stop processing. */ i = Aliases.find(command); if (i == Aliases.end()) - return 0; + return MOD_RES_PASSTHRU; + /* Avoid iterating on to different aliases if no patterns match. */ + upperbound = Aliases.upper_bound(command); irc::string c = command.c_str(); /* The parameters for the command in their original form, with the command stripped off */ @@ -144,77 +159,155 @@ class ModuleAlias : public Module while (*(compare.c_str()) == ' ') compare.erase(compare.begin()); - std::string safe(original_line); + while (i != upperbound) + { + if (i->second.UserCommand) + { + if (DoAlias(user, NULL, &(i->second), compare, original_line)) + { + return MOD_RES_DENY; + } + } - /* Escape out any $ symbols in the user provided text */ + i++; + } - SearchAndReplace(safe, "$", "\r"); + // If we made it here, no aliases actually matched. + return MOD_RES_PASSTHRU; + } - while (i != Aliases.end()) + virtual void OnUserMessage(User *user, void *dest, int target_type, const std::string &text, char status, const CUList &exempt_list) + { + if (target_type != TYPE_CHANNEL) { - /* Does it match the pattern? */ - if (!i->second.format.empty()) + return; + } + + // fcommands are only for local users. Spanningtree will send them back out as their original cmd. + if (!user || !IS_LOCAL(user)) + { + return; + } + + /* Stop here if the user is +B and allowbot is set to no. */ + if (!AllowBots && user->IsModeSet('B')) + { + return; + } + + Channel *c = (Channel *)dest; + std::string fcommand; + + // text is like "!moo cows bite me", we want "!moo" first + irc::spacesepstream ss(text); + ss.GetToken(fcommand); + + if (fcommand.empty()) + { + return; // wtfbbq + } + + // we don't want to touch non-fantasy stuff + if (*fcommand.c_str() != fprefix) + { + return; + } + + // nor do we give a shit about the prefix + fcommand.erase(fcommand.begin()); + std::transform(fcommand.begin(), fcommand.end(), fcommand.begin(), ::toupper); + + std::multimap::iterator i = Aliases.find(fcommand); + + if (i == Aliases.end()) + return; + + /* Avoid iterating on to other aliases if no patterns match */ + std::multimap::iterator upperbound = Aliases.upper_bound(fcommand); + + + /* The parameters for the command in their original form, with the command stripped off */ + std::string compare = text.substr(fcommand.length() + 1); + while (*(compare.c_str()) == ' ') + compare.erase(compare.begin()); + + while (i != upperbound) + { + if (i->second.ChannelCommand) { - if (i->second.case_sensitive) - { - if (InspIRCd::Match(compare, i->second.format, case_sensitive_map)) - continue; - } - else - { - if (InspIRCd::Match(compare, i->second.format)) - continue; - } + // We use substr(1) here to remove the fantasy prefix + if (DoAlias(user, c, &(i->second), compare, text.substr(1))) + return; } - if ((i->second.operonly) && (!IS_OPER(user))) - return 0; + i++; + } + } + + + int DoAlias(User *user, Channel *c, Alias *a, const std::string compare, const std::string safe) + { + User *u = NULL; - if (!i->second.requires.empty()) + /* Does it match the pattern? */ + if (!a->format.empty()) + { + if (a->CaseSensitive) { - u = ServerInstance->FindNick(i->second.requires); - if (!u) - { - user->WriteNumeric(401, ""+std::string(user->nick)+" "+i->second.requires+" :is currently unavailable. Please try again later."); - return 1; - } + if (!InspIRCd::Match(compare, a->format, rfc_case_sensitive_map)) + return 0; } - if ((u != NULL) && (!i->second.requires.empty()) && (i->second.uline)) + else { - if (!ServerInstance->ULine(u->server)) - { - ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+i->second.requires+" required by alias "+std::string(i->second.text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); - user->WriteNumeric(401, ""+std::string(user->nick)+" "+i->second.requires+" :is an imposter! Please inform an IRC operator as soon as possible."); - return 1; - } + if (!InspIRCd::Match(compare, a->format)) + return 0; } + } - /* Now, search and replace in a copy of the original_line, replacing $1 through $9 and $1- etc */ - - std::string::size_type crlf = i->second.replace_with.find('\n'); + if ((a->OperOnly) && (!IS_OPER(user))) + return 0; - if (crlf == std::string::npos) + if (!a->RequiredNick.empty()) + { + u = ServerInstance->FindNick(a->RequiredNick); + if (!u) { - DoCommand(i->second.replace_with, user, safe); + user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is currently unavailable. Please try again later."); return 1; } - else + } + if ((u != NULL) && (!a->RequiredNick.empty()) && (a->ULineOnly)) + { + if (!ServerInstance->ULine(u->server)) { - irc::sepstream commands(i->second.replace_with, '\n'); - std::string scommand; - while (commands.GetToken(scommand)) - { - DoCommand(scommand, user, safe); - } + ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); + user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible."); return 1; } + } - i++; + /* Now, search and replace in a copy of the original_line, replacing $1 through $9 and $1- etc */ + + std::string::size_type crlf = a->ReplaceFormat.find('\n'); + + if (crlf == std::string::npos) + { + DoCommand(a->ReplaceFormat, user, c, safe); + return 1; + } + else + { + irc::sepstream commands(a->ReplaceFormat, '\n'); + std::string scommand; + while (commands.GetToken(scommand)) + { + DoCommand(scommand, user, c, safe); + } + return 1; } - return 0; } - void DoCommand(std::string newline, User* user, const std::string &original_line) + void DoCommand(std::string newline, User* user, Channel *c, const std::string &original_line) { std::vector pars; @@ -245,13 +338,21 @@ class ModuleAlias : public Module } /* Special variables */ - SearchAndReplace(newline, "$nick", user->nick); - SearchAndReplace(newline, "$ident", user->ident); - SearchAndReplace(newline, "$host", user->host); - SearchAndReplace(newline, "$vhost", user->dhost); + SearchAndReplace(newline, std::string("$nick"), user->nick); + SearchAndReplace(newline, std::string("$ident"), user->ident); + SearchAndReplace(newline, std::string("$host"), user->host); + SearchAndReplace(newline, std::string("$vhost"), user->dhost); - /* Unescape any variable names in the user text before sending */ - SearchAndReplace(newline, "\r", "$"); + if (c) + { + /* Channel specific variables */ + SearchAndReplace(newline, std::string("$chan"), c->name); + } + else + { + /* We don't want these in a user alias */ + SearchAndReplace(newline, std::string("$chan"), std::string("")); + } irc::tokenstream ss(newline); pars.clear(); @@ -265,10 +366,17 @@ class ModuleAlias : public Module ServerInstance->Parser->CallHandler(command, pars, user); } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { ReadAliases(); } + + virtual void Prioritize() + { + // Prioritise after spanningtree so that channel aliases show the alias before the effects. + Module* linkmod = ServerInstance->Modules->Find("m_spanningtree.so"); + ServerInstance->Modules->SetPriority(this, I_OnUserMessage, PRIORITY_AFTER, &linkmod); + } }; MODULE_INIT(ModuleAlias)