X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=7fc0f3bb038f360e3e0f69782abeee5f516c4c2d;hb=HEAD;hp=0c627482aeb47260deb3e66c6852b08a8f8ed9f4;hpb=6cfc9625c0068d1a2d67fb9d08a1670a6f2358e4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 0c627482a..7fc0f3bb0 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -1,27 +1,39 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2018-2019 linuxdaemon + * Copyright (C) 2013, 2015-2019, 2021 Sadie Powell + * Copyright (C) 2012-2015, 2018 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Matt Smith + * Copyright (C) 2008-2009 Robin Burchell + * Copyright (C) 2007-2008 Dennis Friis + * Copyright (C) 2004, 2006-2009 Craig Edwards * - * 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. */ +#include "inspircd.h" /** An alias definition */ -class Alias : public classbase +class Alias { public: /** The text of the alias command */ - irc::string AliasedCommand; + std::string AliasedCommand; /** Text to replace with */ std::string ReplaceFormat; @@ -35,9 +47,6 @@ class Alias : public classbase /** Requires oper? */ bool OperOnly; - /* is case sensitive params */ - bool CaseSensitive; - /* whether or not it may be executed via fantasy (default OFF) */ bool ChannelCommand; @@ -46,70 +55,74 @@ class Alias : public classbase /** Format that must be matched for use */ std::string format; + + /** Strip color codes before match? */ + bool StripColor; }; class ModuleAlias : public Module { - private: - - char fprefix; + std::string 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; + */ + typedef insp::flat_multimap AliasMap; + + AliasMap Aliases; /* whether or not +B users are allowed to use fantasy commands */ bool AllowBots; + UserModeReference botmode; - virtual void ReadAliases() - { - ConfigReader MyConf(ServerInstance); - - AllowBots = MyConf.ReadFlag("fantasy", "allowbots", "no", 0); - - std::string fpre = MyConf.ReadValue("fantasy","prefix",0); - fprefix = fpre.empty() ? '!' : fpre[0]; + // Whether we are actively executing an alias. + bool active; - Aliases.clear(); - for (int i = 0; i < MyConf.Enumerate("alias"); i++) + public: + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + AliasMap newAliases; + 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", "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.CaseSensitive = MyConf.ReadFlag("alias", "matchcase", i); - Aliases.insert(std::make_pair(txt, a)); + a.AliasedCommand = tag->getString("text"); + if (a.AliasedCommand.empty()) + throw ModuleException(" is empty! at " + tag->getTagLocation()); + + tag->readString("replace", a.ReplaceFormat, true); + if (a.ReplaceFormat.empty()) + throw ModuleException(" is empty! at " + tag->getTagLocation()); + + 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.StripColor = tag->getBool("stripcolor"); + + std::transform(a.AliasedCommand.begin(), a.AliasedCommand.end(), a.AliasedCommand.begin(), ::toupper); + newAliases.insert(std::make_pair(a.AliasedCommand, a)); } - } - - public: - - ModuleAlias(InspIRCd* Me) - : Module(Me) - { - ReadAliases(); - Me->Modules->Attach(I_OnPreCommand, this); - Me->Modules->Attach(I_OnRehash, this); - Me->Modules->Attach(I_OnUserPreMessage, this); + ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy"); + AllowBots = fantasy->getBool("allowbots", false); + fprefix = fantasy->getString("prefix", "!", 1, ServerInstance->Config->Limits.MaxLine); + Aliases.swap(newAliases); } - virtual ~ModuleAlias() + ModuleAlias() + : botmode(this, "bot") + , active(false) { } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$", VF_VENDOR,API_VERSION); + return Version("Allows the server administrator to define custom channel commands (e.g. !kick) and server commands (e.g. /OPERSERV).", VF_VENDOR); } std::string GetVar(std::string varname, const std::string &original_line) @@ -137,166 +150,154 @@ class ModuleAlias : public Module return word; } - virtual int OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) + std::string CreateRFCMessage(const std::string& command, CommandBase::Params& parameters) { - std::multimap::iterator i, upperbound; + std::string message(command); + for (CommandBase::Params::const_iterator iter = parameters.begin(); iter != parameters.end();) + { + const std::string& parameter = *iter++; + message.push_back(' '); + if (iter == parameters.end() && (parameter.empty() || parameter.find(' ') != std::string::npos)) + message.push_back(':'); + message.append(parameter); + } + return message; + } - /* If theyre not registered yet, we dont want + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + { + /* If they're 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; - /* Avoid iterating on to different aliases if no patterns match. */ - upperbound = Aliases.upper_bound(command); + std::pair iters = Aliases.equal_range(command); + if (iters.first == iters.second) + return MOD_RES_PASSTHRU; - 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()); + std::string original_line = CreateRFCMessage(command, parameters); + std::string compare(original_line, command.length()); while (*(compare.c_str()) == ' ') compare.erase(compare.begin()); - while (i != upperbound) + for (AliasMap::iterator i = iters.first; i != iters.second; ++i) { if (i->second.UserCommand) { if (DoAlias(user, NULL, &(i->second), compare, original_line)) { - return 1; + return MOD_RES_DENY; } } - - i++; } // If we made it here, no aliases actually matched. - return 0; + return MOD_RES_PASSTHRU; + } + + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + { + // Don't echo anything which is caused by an alias. + if (active) + details.echo = false; + + return MOD_RES_PASSTHRU; } - virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list) + void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE { - if (target_type != TYPE_CHANNEL) + if ((target.type != MessageTarget::TYPE_CHANNEL) || (details.type != MSG_PRIVMSG)) { - ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not a channel msg"); - return 0; + return; } // fcommands are only for local users. Spanningtree will send them back out as their original cmd. if (!IS_LOCAL(user)) { - ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not local"); - return 0; + return; } /* Stop here if the user is +B and allowbot is set to no. */ - if (!AllowBots && user->IsModeSet('B')) + if (!AllowBots && user->IsModeSet(botmode)) { - ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: user is +B and allowbot is set to no"); - return 0; + return; } - Channel *c = (Channel *)dest; - std::string fcommand; + Channel *c = target.Get(); + std::string scommand; // text is like "!moo cows bite me", we want "!moo" first - irc::spacesepstream ss(text); - ss.GetToken(fcommand); + irc::spacesepstream ss(details.text); + ss.GetToken(scommand); - if (fcommand.empty()) + if (scommand.size() <= fprefix.size()) { - ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: empty (?)"); - return 0; // wtfbbq + return; // wtfbbq } - ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: looking at fcommand %s", fcommand.c_str()); - // we don't want to touch non-fantasy stuff - if (*fcommand.c_str() != fprefix) + if (scommand.compare(0, fprefix.size(), fprefix) != 0) { - ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not a fcommand"); - return 0; + return; } // nor do we give a shit about the prefix - fcommand.erase(fcommand.begin()); - std::transform(fcommand.begin(), fcommand.end(), fcommand.begin(), ::toupper); - ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: now got %s", fcommand.c_str()); - - - std::multimap::iterator i = Aliases.find(fcommand); - - if (i == Aliases.end()) - return 0; - - /* Avoid iterating on to other aliases if no patterns match */ - std::multimap::iterator upperbound = Aliases.upper_bound(fcommand); + scommand.erase(0, fprefix.size()); + std::pair iters = Aliases.equal_range(scommand); + if (iters.first == iters.second) + return; /* The parameters for the command in their original form, with the command stripped off */ - std::string compare = text.substr(fcommand.length() + 1); + std::string compare(details.text, scommand.length() + fprefix.size()); while (*(compare.c_str()) == ' ') compare.erase(compare.begin()); - std::string safe(compare); - - ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: compare is %s and safe is %s", compare.c_str(), safe.c_str()); - - while (i != upperbound) + for (AliasMap::iterator i = iters.first; i != iters.second; ++i) { if (i->second.ChannelCommand) { - if (DoAlias(user, c, &(i->second), compare, safe)) - return 0; + // We use substr here to remove the fantasy prefix + if (DoAlias(user, c, &(i->second), compare, details.text.substr(fprefix.size()))) + return; } - - i++; } - - return 0; } - int DoAlias(User *user, Channel *c, 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; + std::string stripped(compare); + if (a->StripColor) + InspIRCd::StripColor(stripped); /* Does it match the pattern? */ if (!a->format.empty()) { - if (a->CaseSensitive) - { - if (!InspIRCd::Match(compare, a->format, rfc_case_sensitive_map)) - return 0; - } - else - { - if (!InspIRCd::Match(compare, a->format)) - return 0; - } + if (!InspIRCd::Match(stripped, a->format)) + return 0; } - if ((a->OperOnly) && (!IS_OPER(user))) + if ((a->OperOnly) && (!user->IsOper())) return 0; if (!a->RequiredNick.empty()) { - u = ServerInstance->FindNick(a->RequiredNick); + int numeric = a->ULineOnly ? ERR_NOSUCHSERVICE : ERR_NOSUCHNICK; + User* u = ServerInstance->FindNickOnly(a->RequiredNick); if (!u) { - user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is currently unavailable. Please try again later."); + user->WriteNumeric(numeric, a->RequiredNick, "is currently unavailable. Please try again later."); return 1; } - } - if ((u != NULL) && (!a->RequiredNick.empty()) && (a->ULineOnly)) - { - if (!ServerInstance->ULine(u->server)) + + if ((a->ULineOnly) && (!u->server->IsULine())) { - 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."); + ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+a->AliasedCommand+" is not on a U-lined server, possibly underhanded antics detected!"); + user->WriteNumeric(numeric, a->RequiredNick, "is not a network service! Please inform a server operator as soon as possible."); return 1; } } @@ -307,7 +308,7 @@ class ModuleAlias : public Module if (crlf == std::string::npos) { - DoCommand(a->ReplaceFormat, user, c, safe); + DoCommand(a->ReplaceFormat, user, c, safe, a); return 1; } else @@ -316,75 +317,87 @@ class ModuleAlias : public Module std::string scommand; while (commands.GetToken(scommand)) { - DoCommand(scommand, user, c, safe); + DoCommand(scommand, user, c, safe, a); } return 1; } } - void DoCommand(std::string newline, User* user, Channel *c, const std::string &original_line) + void DoCommand(const std::string& newline, User* user, Channel *chan, const std::string &original_line, Alias* a) { - std::vector pars; - - for (int v = 1; v < 10; v++) + std::string result; + result.reserve(newline.length()); + 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 == '$') && (i + 1 < newline.length())) { - newline.erase(x, var.length()); - newline.insert(x, GetVar(var, original_line)); - x = newline.find(var); + if (isdigit(newline[i+1])) + { + size_t len = ((i + 2 < newline.length()) && (newline[i+2] == '-')) ? 3 : 2; + std::string var = newline.substr(i, len); + result.append(GetVar(var, original_line)); + i += len - 1; + } + else if (!newline.compare(i, 5, "$nick", 5)) + { + result.append(user->nick); + i += 4; + } + else if (!newline.compare(i, 5, "$host", 5)) + { + result.append(user->GetRealHost()); + i += 4; + } + else if (!newline.compare(i, 5, "$chan", 5)) + { + if (chan) + result.append(chan->name); + i += 4; + } + else if (!newline.compare(i, 6, "$ident", 6)) + { + result.append(user->ident); + i += 5; + } + else if (!newline.compare(i, 6, "$vhost", 6)) + { + result.append(user->GetDisplayedHost()); + i += 5; + } + else if (!newline.compare(i, 12, "$requirement", 12)) + { + result.append(a->RequiredNick); + i += 11; + } + else + result.push_back(c); } + else + result.push_back(c); } - /* Special variables */ - 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); - - 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"), ""); - } - - irc::tokenstream ss(newline); - pars.clear(); + irc::tokenstream ss(result); + CommandBase::Params pars; std::string command, token; - ss.GetToken(command); - while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS)) + ss.GetMiddle(command); + while (ss.GetTrailing(token)) { pars.push_back(token); } - ServerInstance->Parser->CallHandler(command, pars, user); + + active = true; + ServerInstance->Parser.CallHandler(command, pars, user); + active = false; } - virtual void OnRehash(User* user, const std::string ¶meter) + void Prioritize() CXX11_OVERRIDE { - ReadAliases(); - } + // 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_OnUserPostMessage, PRIORITY_AFTER, linkmod); + } }; MODULE_INIT(ModuleAlias)