X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=fb6783d8b0b4ddbd5575da9a3f061838672b50fa;hb=0da6b3a13def40e8fd002b9fc60f955467f6372d;hp=f605cc5f436fad2186e65bf2ff2601e249b751de;hpb=4185ba9bb149daf991bfb9f4e3b5a5d75362d94a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index f605cc5f4..fb6783d8b 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. @@ -51,16 +51,27 @@ 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); + 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++) { @@ -71,8 +82,8 @@ class ModuleAlias : public Module 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", false, i); - a.UserCommand = MyConf.ReadFlag("alias", "usercommand", true, 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); @@ -126,20 +137,9 @@ class ModuleAlias : public Module 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) - { - 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. @@ -151,6 +151,8 @@ class ModuleAlias : public Module 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); irc::string c = command.c_str(); /* The parameters for the command in their original form, with the command stripped off */ @@ -158,22 +160,21 @@ class ModuleAlias : public Module 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"); - - while (i != Aliases.end()) + while (i != upperbound) { if (i->second.UserCommand) - DoAlias(user, NULL, &(i->second), compare, safe); + { + if (DoAlias(user, NULL, &(i->second), compare, original_line)) + { + return 1; + } + } i++; } - // If aliases have been processed, aliases took it. - return 1; + // If we made it here, no aliases actually matched. + return 0; } virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list) @@ -191,6 +192,13 @@ class ModuleAlias : public Module return 0; } + /* Stop here if the user is +B and allowbot is set to no. */ + if (!AllowBots && user->IsModeSet('B')) + { + ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: user is +B and allowbot is set to no"); + return 0; + } + Channel *c = (Channel *)dest; std::string fcommand; @@ -207,13 +215,13 @@ class ModuleAlias : public Module 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() != '!') + if (*fcommand.c_str() != fprefix) { ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not a fcommand"); return 0; } - // nor do we give a shit about the ! + // 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()); @@ -224,51 +232,52 @@ class ModuleAlias : public Module if (i == Aliases.end()) return 0; + /* 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()); - std::string safe(compare); - - /* Escape out any $ symbols in the user provided text (ugly, but better than crashy) */ - SearchAndReplace(safe, "$", "\r"); - - ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: compare is %s and safe is %s", compare.c_str(), safe.c_str()); - - while (i != Aliases.end()) + while (i != upperbound) { if (i->second.ChannelCommand) - DoAlias(user, c, &(i->second), compare, safe); + { + // We use substr(1) here to remove the fantasy prefix + if (DoAlias(user, c, &(i->second), compare, text.substr(1))) + return 0; + } i++; } - + return 0; } - void 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; + /* 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()) { @@ -276,16 +285,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; } } @@ -296,7 +305,7 @@ class ModuleAlias : public Module if (crlf == std::string::npos) { DoCommand(a->ReplaceFormat, user, c, safe); - return; + return 1; } else { @@ -306,7 +315,7 @@ class ModuleAlias : public Module { DoCommand(scommand, user, c, safe); } - return; + return 1; } } @@ -341,19 +350,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); if (c) { /* Channel specific variables */ - SearchAndReplace(newline, "$chan", c->name); + SearchAndReplace(newline, std::string("$chan"), c->name); + } + else + { + /* We don't want these in a user alias */ + SearchAndReplace(newline, std::string("$chan"), std::string("")); } - - /* Unescape any variable names in the user text before sending */ - SearchAndReplace(newline, "\r", "$"); irc::tokenstream ss(newline); pars.clear(); @@ -367,7 +378,7 @@ 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(); }