X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=ec426fe9b998b319927d38648037993661c40770;hb=553a8da754c8cd308bad2008018849714e70f9b7;hp=06191a993538cb8049b48aad41edc00309c614d8;hpb=ec8ad2737e6bc5426714244747667ab4e97f2a33;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 06191a993..ec426fe9b 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -1,23 +1,32 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2005, 2009 Robin Burchell + * Copyright (C) 2004-2007, 2009 Craig Edwards + * Copyright (C) 2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" /* $ModDesc: Provides aliases of commands. */ /** An alias definition */ -class Alias : public classbase +class Alias { public: /** The text of the alias command */ @@ -51,44 +60,54 @@ 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; + 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++) + ConfigTagList tags = ServerInstance->Config->ConfTags("alias"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { + ConfigTag* tag = i->second; Alias a; - std::string txt; - txt = MyConf.ReadValue("alias", "text", 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", i); - a.UserCommand = MyConf.ReadFlag("alias", "usercommand", i); - a.OperOnly = MyConf.ReadFlag("alias", "operonly", i); - a.format = MyConf.ReadValue("alias", "format", i); - a.CaseSensitive = MyConf.ReadFlag("alias", "matchcase", i); - Aliases.insert(std::make_pair(txt, a)); + a.AliasedCommand = tag->getString("text").c_str(); + tag->readString("replace", a.ReplaceFormat, true); + a.RequiredNick = tag->getString("requires"); + a.ULineOnly = tag->getBool("uline"); + a.ChannelCommand = tag->getBool("channelcommand", false); + a.UserCommand = tag->getBool("usercommand", true); + a.OperOnly = tag->getBool("operonly"); + a.format = tag->getString("format"); + a.CaseSensitive = tag->getBool("matchcase"); + Aliases.insert(std::make_pair(a.AliasedCommand, 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); } virtual ~ModuleAlias() @@ -97,7 +116,7 @@ class ModuleAlias : public Module virtual Version GetVersion() { - return Version("$Id$", VF_VENDOR,API_VERSION); + return Version("Provides aliases of commands.", VF_VENDOR); } std::string GetVar(std::string varname, const std::string &original_line) @@ -125,31 +144,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, LocalUser *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) - { - 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); + i = Aliases.find(command.c_str()); 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.c_str()); irc::string c = command.c_str(); /* The parameters for the command in their original form, with the command stripped off */ @@ -157,44 +167,113 @@ 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) { - if (i->second.UserCommand) - DoAlias(user, &(i->second), compare, safe); + return; + } - i++; + // 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 scommand; + + // text is like "!moo cows bite me", we want "!moo" first + irc::spacesepstream ss(text); + ss.GetToken(scommand); + irc::string fcommand = scommand.c_str(); + + if (fcommand.empty()) + { + return; // wtfbbq + } + + // we don't want to touch non-fantasy stuff + if (*fcommand.c_str() != fprefix) + { + return; } - // If aliases have been processed, aliases took it. - return 1; + // nor do we give a shit about the prefix + fcommand.erase(fcommand.begin()); + + 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) + { + // We use substr(1) here to remove the fantasy prefix + if (DoAlias(user, c, &(i->second), compare, text.substr(1))) + return; + } + + i++; + } } - void DoAlias(User *user, Alias *a, const std::string compare, const std::string safe) + + int DoAlias(User *user, Channel *c, Alias *a, const std::string compare, const std::string safe) { User *u = NULL; + /* Does it match the pattern? */ if (!a->format.empty()) { if (a->CaseSensitive) { - if (InspIRCd::Match(compare, a->format, case_sensitive_map)) - return; + if (!InspIRCd::Match(compare, a->format, rfc_case_sensitive_map)) + return 0; } else { - if (InspIRCd::Match(compare, a->format)) - return; + if (!InspIRCd::Match(compare, a->format)) + return 0; } } if ((a->OperOnly) && (!IS_OPER(user))) - return; + return 0; if (!a->RequiredNick.empty()) { @@ -202,16 +281,16 @@ class ModuleAlias : public Module if (!u) { user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is currently unavailable. Please try again later."); - return; + return 1; } } if ((u != NULL) && (!a->RequiredNick.empty()) && (a->ULineOnly)) { if (!ServerInstance->ULine(u->server)) { - 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!"); + 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; + return 1; } } @@ -221,8 +300,8 @@ class ModuleAlias : public Module if (crlf == std::string::npos) { - DoCommand(a->ReplaceFormat, user, safe); - return; + DoCommand(a->ReplaceFormat, user, c, safe); + return 1; } else { @@ -230,53 +309,63 @@ class ModuleAlias : public Module std::string scommand; while (commands.GetToken(scommand)) { - DoCommand(scommand, user, safe); + DoCommand(scommand, user, c, safe); } - return; + return 1; } } - void DoCommand(std::string newline, User* user, const std::string &original_line) + void DoCommand(const std::string& newline, User* user, Channel *chan, const std::string &original_line) { - std::vector pars; - - for (int v = 1; v < 10; v++) + std::string result; + result.reserve(MAXBUF); + for (unsigned int i = 0; i < newline.length(); i++) { - 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) + char c = newline[i]; + if (c == '$') { - newline.erase(x, var.length()); - newline.insert(x, GetVar(var, original_line)); - x = newline.find(var); + if (isdigit(newline[i+1])) + { + int len = (newline[i+2] == '-') ? 3 : 2; + std::string var = newline.substr(i, len); + result.append(GetVar(var, original_line)); + i += len - 1; + } + else if (newline.substr(i, 5) == "$nick") + { + result.append(user->nick); + i += 4; + } + else if (newline.substr(i, 5) == "$host") + { + result.append(user->host); + i += 4; + } + else if (newline.substr(i, 5) == "$chan") + { + if (chan) + result.append(chan->name); + i += 4; + } + else if (newline.substr(i, 6) == "$ident") + { + result.append(user->ident); + i += 5; + } + else if (newline.substr(i, 6) == "$vhost") + { + result.append(user->dhost); + i += 5; + } + else + result.push_back(c); } + else + result.push_back(c); } - /* 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(); + irc::tokenstream ss(result); + std::vector pars; std::string command, token; ss.GetToken(command); @@ -287,10 +376,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)