X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rline.cpp;h=bd2f398545cc1f4faecaee29f6deaa636d28fc81;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=652b93909f478eae6f1259ab431f51073c1b4412;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 652b93909..bd2f39854 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -2,30 +2,27 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ #include "inspircd.h" -#include +#include "m_regex.h" #include "xline.h" -/* $ModDesc: RLINE: Regexp user banning. */ -/* $CompileFlags: exec("pcre-config --cflags") */ -/* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */ +static Module* rxengine = NULL; +static Module* mymodule = NULL; /* Needed to let RLine send request! */ -#ifdef WINDOWS -#pragma comment(lib, "pcre.lib") -#endif +/* $ModDesc: RLINE: Regexp user banning. */ -class CoreExport RLine : public XLine +class RLine : public XLine { - public: + public: /** Create a R-Line. * @param s_time The set time @@ -37,51 +34,36 @@ class CoreExport RLine : public XLine */ RLine(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char* regexs) : XLine(Instance, s_time, d, src, re, "R") { - const char *error; - int erroffset; - matchtext = regexs; - regex = pcre_compile(regexs, 0, &error, &erroffset, NULL); - - if (!regex) + if (!rxengine) { - ServerInstance->SNO->WriteToSnoMask('x',"Error in regular expression: %s at offset %d: %s\n", regexs, erroffset, error); - throw CoreException("Bad regex pattern."); + ServerInstance->SNO->WriteToSnoMask('x', "Cannot create regexes until engine is set to a loaded provider!"); + throw ModuleException("Regex engine not set or loaded!"); } + + /* This can throw on failure, but if it does we DONT catch it here, we catch it and display it + * where the object is created, we might not ALWAYS want it to output stuff to snomask x all the time + */ + regex = RegexFactoryRequest(mymodule, rxengine, regexs).Create(); } /** Destructor */ ~RLine() { - pcre_free(regex); + delete regex; } bool Matches(User *u) { - std::string compare = std::string(u->nick) + "!" + u->ident + "@" + u->host + " " + u->fullname; - - ServerInstance->Log(DEBUG, "Matching " + matchtext + " against string " + compare); - - if (pcre_exec(regex, NULL, compare.c_str(), compare.length(), 0, 0, NULL, 0) > -1) - { - // Bang. :D - return true; - } - - return false; + std::string compare = u->nick + "!" + u->ident + "@" + u->host + " " + u->fullname; + return regex->Matches(compare); } bool Matches(const std::string &compare) { - if (pcre_exec(regex, NULL, compare.c_str(), compare.length(), 0, 0, NULL, 0) > -1) - { - // Bang. :D - return true; - } - - return false; + return regex->Matches(compare); } void Apply(User* u) @@ -91,7 +73,7 @@ class CoreExport RLine : public XLine void DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed R-Line %s (set by %s %d seconds ago)", this->matchtext.c_str(), this->source, this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired R-Line %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time)); } const char* Displayable() @@ -101,16 +83,18 @@ class CoreExport RLine : public XLine std::string matchtext; - pcre *regex; + Regex *regex; }; /** An XLineFactory specialized to generate RLine* pointers */ -class CoreExport RLineFactory : public XLineFactory +class RLineFactory : public XLineFactory { public: - RLineFactory(InspIRCd* Instance) : XLineFactory(Instance, "R") { } + RLineFactory(InspIRCd* Instance) : XLineFactory(Instance, "R") + { + } /** Generate a RLine */ @@ -118,6 +102,10 @@ class CoreExport RLineFactory : public XLineFactory { return new RLine(ServerInstance, set_time, duration, source, reason, xline_specific_mask); } + + ~RLineFactory() + { + } }; /** Handle /RLINE @@ -125,16 +113,19 @@ class CoreExport RLineFactory : public XLineFactory */ class CommandRLine : public Command { + std::string rxengine; + public: - CommandRLine (InspIRCd* Instance) : Command(Instance,"RLINE", 'o', 1) + CommandRLine (InspIRCd* Instance) : Command(Instance,"RLINE", "o", 1, 3) { this->source = "m_rline.so"; + this->syntax = " [] :"; } - CmdResult Handle (const char** parameters, int pcnt, User *user) + CmdResult Handle (const std::vector& parameters, User *user) { - if (pcnt >= 3) + if (parameters.size() >= 3) { // Adding - XXX todo make this respect tag perhaps.. @@ -143,11 +134,11 @@ class CommandRLine : public Command try { - r = new RLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]); + r = new RLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); } - catch (...) + catch (ModuleException &e) { - ; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up. + ServerInstance->SNO->WriteToSnoMask('x',"Could not add RLINE: %s", e.GetReason()); } if (r) @@ -156,13 +147,12 @@ class CommandRLine : public Command { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s.", user->nick, parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str()); } else { time_t c_requires_crap = duration + ServerInstance->Time(); - ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-Line for %s, expires on %s", user->nick, parameters[0], - ServerInstance->TimeString(c_requires_crap).c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-Line for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str()); } ServerInstance->XLines->ApplyLines(); @@ -170,20 +160,19 @@ class CommandRLine : public Command else { delete r; - user->WriteServ("NOTICE %s :*** R-Line for %s already exists", user->nick, parameters[0]); + user->WriteServ("NOTICE %s :*** R-Line for %s already exists", user->nick.c_str(), parameters[0].c_str()); } } } else { - if (ServerInstance->XLines->DelLine(parameters[0], "R", user)) + if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "R", user)) { - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick,parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick.c_str(),parameters[0].c_str()); } else { - // XXX todo implement stats - user->WriteServ("NOTICE %s :*** R-Line %s not found in list, try /stats g.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** R-Line %s not found in list, try /stats R.",user->nick.c_str(),parameters[0].c_str()); } } @@ -196,26 +185,127 @@ class ModuleRLine : public Module private: CommandRLine *r; RLineFactory *f; + bool MatchOnNickChange; + std::string RegexEngine; + public: ModuleRLine(InspIRCd* Me) : Module(Me) { + mymodule = this; + OnRehash(NULL, ""); + + Me->Modules->UseInterface("RegularExpression"); + // Create a new command r = new CommandRLine(ServerInstance); ServerInstance->AddCommand(r); f = new RLineFactory(ServerInstance); ServerInstance->XLines->RegisterFactory(f); + + Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnLoadModule, I_OnStats }; + ServerInstance->Modules->Attach(eventlist, this, 5); + } virtual ~ModuleRLine() { + ServerInstance->Modules->DoneWithInterface("RegularExpression"); + ServerInstance->XLines->DelAll("R"); ServerInstance->XLines->UnregisterFactory(f); } virtual Version GetVersion() { - return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } + + virtual void OnUserConnect(User* user) + { + // Apply lines on user connect + XLine *rl = ServerInstance->XLines->MatchesLine("R", user); + + if (rl) + { + // Bang. :P + rl->Apply(user); + } + } + + virtual void OnRehash(User *user, const std::string ¶meter) + { + ConfigReader Conf(ServerInstance); + + MatchOnNickChange = Conf.ReadFlag("rline", "matchonnickchange", 0); + std::string newrxengine = Conf.ReadValue("rline", "engine", 0); + + if (!RegexEngine.empty()) + { + if (RegexEngine == newrxengine) + return; + + ServerInstance->SNO->WriteToSnoMask('x', "Dumping all R-Lines due to regex engine change (was '%s', now '%s')", RegexEngine.c_str(), newrxengine.c_str()); + ServerInstance->XLines->DelAll("R"); + } + rxengine = 0; + RegexEngine = newrxengine; + modulelist* ml = ServerInstance->Modules->FindInterface("RegularExpression"); + if (ml) + { + for (modulelist::iterator i = ml->begin(); i != ml->end(); ++i) + { + if (RegexNameRequest(this, *i).Send() == newrxengine) + { + ServerInstance->SNO->WriteToSnoMask('x', "R-Line now using engine '%s'", RegexEngine.c_str()); + rxengine = *i; + } + } + } + if (!rxengine) + { + ServerInstance->SNO->WriteToSnoMask('x', "WARNING: Regex engine '%s' is not loaded - R-Line functionality disabled until this is corrected.", RegexEngine.c_str()); + } + } + + virtual int OnStats(char symbol, User* user, string_list &results) + { + if (symbol != 'R') + return 0; + + ServerInstance->XLines->InvokeStats("R", 223, user, results); + return 1; + } + + virtual void OnLoadModule(Module* mod, const std::string& name) + { + if (ServerInstance->Modules->ModuleHasInterface(mod, "RegularExpression")) + { + std::string rxname = RegexNameRequest(this, mod).Send(); + if (rxname == RegexEngine) + { + ServerInstance->SNO->WriteToSnoMask('x', "R-Line now using engine '%s'", RegexEngine.c_str()); + rxengine = mod; + } + } + } + + virtual void OnUserPostNick(User *user, const std::string &oldnick) + { + if (!IS_LOCAL(user)) + return; + + if (!MatchOnNickChange) + return; + + XLine *rl = ServerInstance->XLines->MatchesLine("R", user); + + if (rl) + { + // Bang! :D + rl->Apply(user); + } + } + }; MODULE_INIT(ModuleRLine)