-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2005, 2009 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2004-2007, 2009 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "inspircd.h"
-#include "wildcard.h"
-#include <vector>
-/* $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 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;
};
class ModuleAlias : public Module
{
- private:
- /** We cant use a map, there may be multiple aliases with the same name */
- std::vector<Alias> Aliases;
- std::map<std::string, int> AliasMap;
- std::vector<std::string> pars;
+ 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<irc::string, Alias> Aliases;
- virtual void ReadAliases()
+ /* whether or not +B users are allowed to use fantasy commands */
+ bool AllowBots;
+ UserModeReference botmode;
+
+ void ReadAliases()
{
- ConfigReader MyConf(ServerInstance);
+ ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy");
+ AllowBots = fantasy->getBool("allowbots", false);
+ std::string fpre = fantasy->getString("prefix", "!");
+ fprefix = fpre.empty() ? '!' : fpre[0];
Aliases.clear();
- AliasMap.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.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;
+ std::string aliastext = tag->getString("text");
+ a.AliasedCommand = aliastext.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::Module(Me)
+ ModuleAlias()
+ : botmode(this, "bot")
{
- ReadAliases();
- pars.resize(127);
}
- void Implements(char* List)
- {
- List[I_OnPreCommand] = List[I_OnRehash] = 1;
- }
-
- virtual ~ModuleAlias()
+ void init() CXX11_OVERRIDE
{
+ ReadAliases();
+ Implementation eventlist[] = { I_OnPreCommand, I_OnRehash, I_OnUserMessage };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version("Provides aliases of commands.", VF_VENDOR);
}
std::string GetVar(std::string varname, const std::string &original_line)
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;
}
- void SearchAndReplace(std::string& newline, const std::string &find, const std::string &replace)
+ ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶meters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
{
- 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(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
- {
- userrec *u = NULL;
+ std::multimap<irc::string, Alias>::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, dont bother with the loop */
- if (AliasMap.find(command) == AliasMap.end())
- return 0;
+ /* We dont have any commands looking like this? Stop processing. */
+ i = Aliases.find(command.c_str());
+ if (i == Aliases.end())
+ 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 */
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++)
+ while (i != upperbound)
{
- if (Aliases[i].text == c)
+ if (i->second.UserCommand)
{
- /* Does it match the pattern? */
- if (!Aliases[i].format.empty())
+ if (DoAlias(user, NULL, &(i->second), compare, original_line))
{
- if (!match(Aliases[i].case_sensitive, compare.c_str(), Aliases[i].format.c_str()))
- continue;
+ return MOD_RES_DENY;
}
+ }
- if ((Aliases[i].operonly) && (!*user->oper))
- return 0;
+ i++;
+ }
- if (Aliases[i].requires != "")
- {
- 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.");
- return 1;
- }
- }
- if ((u != NULL) && (Aliases[i].requires != "") && (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.");
- return 1;
- }
- }
+ // If we made it here, no aliases actually matched.
+ return MOD_RES_PASSTHRU;
+ }
- /* Now, search and replace in a copy of the original_line, replacing $1 through $9 and $1- etc */
+ void OnUserMessage(User *user, void *dest, int target_type, const std::string &text, char status, const CUList &exempt_list, MessageType msgtype) CXX11_OVERRIDE
+ {
+ if ((target_type != TYPE_CHANNEL) || (msgtype != MSG_PRIVMSG))
+ {
+ return;
+ }
- std::string::size_type crlf = Aliases[i].replace_with.find('\n');
+ // fcommands are only for local users. Spanningtree will send them back out as their original cmd.
+ if (!user || !IS_LOCAL(user))
+ {
+ return;
+ }
- if (crlf == std::string::npos)
- {
- ServerInstance->Log(DEBUG,"Single line alias: '%s'", Aliases[i].replace_with.c_str());
- DoCommand(Aliases[i].replace_with, user, safe);
- return 1;
- }
- else
- {
- ServerInstance->Log(DEBUG,"Multi line alias: '%s'", Aliases[i].replace_with.c_str());
- irc::sepstream commands(Aliases[i].replace_with, '\n');
- std::string command = "*";
- while ((command = commands.GetToken()) != "")
- {
- ServerInstance->Log(DEBUG,"Execute: '%s'", command.c_str());
- DoCommand(command, user, safe);
- }
- return 1;
- }
- }
+ /* Stop here if the user is +B and allowbot is set to no. */
+ if (!AllowBots && user->IsModeSet(botmode))
+ {
+ return;
}
- return 0;
- }
- void DoCommand(std::string newline, userrec* user, const std::string &original_line)
- {
- for (int v = 1; v < 10; v++)
+ 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())
{
- std::string var = "$";
- var.append(ConvToStr(v));
- var.append("-");
- std::string::size_type x = newline.find(var);
+ return; // wtfbbq
+ }
- while (x != std::string::npos)
- {
- newline.erase(x, var.length());
- newline.insert(x, GetVar(var, original_line));
- x = newline.find(var);
- }
+ // 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::multimap<irc::string, Alias>::iterator i = Aliases.find(fcommand);
- var = "$";
- var.append(ConvToStr(v));
- x = newline.find(var);
+ if (i == Aliases.end())
+ return;
- while (x != std::string::npos)
+ /* Avoid iterating on to other aliases if no patterns match */
+ std::multimap<irc::string, Alias>::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)
{
- newline.erase(x, var.length());
- newline.insert(x, GetVar(var, original_line));
- x = newline.find(var);
+ // We use substr(1) here to remove the fantasy prefix
+ if (DoAlias(user, c, &(i->second), compare, text.substr(1)))
+ return;
}
+
+ i++;
}
+ }
- /* 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", "$");
+ int DoAlias(User *user, Channel *c, Alias *a, const std::string& compare, const std::string& safe)
+ {
+ User *u = NULL;
- irc::tokenstream ss(newline);
- const char* parv[127];
- int x = 0;
+ /* 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 ((a->OperOnly) && (!user->IsOper()))
+ return 0;
- while ((pars[x] = ss.GetToken()) != "")
+ if (!a->RequiredNick.empty())
{
- parv[x] = pars[x].c_str();
- ServerInstance->Log(DEBUG,"Parameter %d: %s", x, parv[x]);
- x++;
+ u = ServerInstance->FindNick(a->RequiredNick);
+ if (!u)
+ {
+ user->WriteNumeric(401, ""+user->nick+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
+ 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!");
+ user->WriteNumeric(401, ""+user->nick+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
+ return 1;
+ }
}
- ServerInstance->Log(DEBUG,"Call command handler on %s", parv[0]);
+ /* Now, search and replace in a copy of the original_line, replacing $1 through $9 and $1- etc */
- if (ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user) == CMD_INVALID)
+ std::string::size_type crlf = a->ReplaceFormat.find('\n');
+
+ if (crlf == std::string::npos)
{
- ServerInstance->Log(DEBUG,"Unknown command or not enough parameters");
+ DoCommand(a->ReplaceFormat, user, c, safe);
+ return 1;
}
else
{
- ServerInstance->Log(DEBUG,"Command handler called successfully.");
+ irc::sepstream commands(a->ReplaceFormat, '\n');
+ std::string scommand;
+ while (commands.GetToken(scommand))
+ {
+ DoCommand(scommand, user, c, safe);
+ }
+ return 1;
}
}
-
- virtual void OnRehash(userrec* user, const std::string ¶meter)
+
+ void DoCommand(const std::string& newline, User* user, Channel *chan, const std::string &original_line)
{
- ReadAliases();
- }
-};
+ std::string result;
+ result.reserve(newline.length());
+ for (unsigned int i = 0; i < newline.length(); i++)
+ {
+ char c = newline[i];
+ if (c == '$')
+ {
+ 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);
+ }
+ irc::tokenstream ss(result);
+ std::vector<std::string> pars;
+ std::string command, token;
-class ModuleAliasFactory : public ModuleFactory
-{
- public:
- ModuleAliasFactory()
- {
+ ss.GetToken(command);
+ while (ss.GetToken(token))
+ {
+ pars.push_back(token);
+ }
+ ServerInstance->Parser->CallHandler(command, pars, user);
}
- ~ModuleAliasFactory()
+ void OnRehash(User* user) CXX11_OVERRIDE
{
- }
+ ReadAliases();
+ }
- virtual Module * CreateModule(InspIRCd* Me)
+ void Prioritize()
{
- return new ModuleAlias(Me);
+ // 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);
}
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleAliasFactory;
-}
-
+MODULE_INIT(ModuleAlias)
projects / user / henk / code / inspircd.git / blobdiff