X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_rline.cpp;h=007ac024607d6634fd8720788956904526a96210;hb=1c1c5fc3f01c42a09d34594989679bbc8fb21c0d;hp=7ea9d36b40739c7a86b4ee834c6874a4fbc5ba39;hpb=ce6764c87f83c3a74aae0fcd75547a368601b14a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 7ea9d36b4..007ac0246 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.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. @@ -15,12 +15,12 @@ #include "m_regex.h" #include "xline.h" -static Module* rxengine = 0; -static Module* mymodule = 0; /* Needed to let RLine send request! */ +static Module* rxengine = NULL; +static Module* mymodule = NULL; /* Needed to let RLine send request! */ /* $ModDesc: RLINE: Regexp user banning. */ -class CoreExport RLine : public XLine +class RLine : public XLine { public: @@ -32,7 +32,8 @@ class CoreExport RLine : public XLine * @param regex Pattern to match with * @ */ - 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") + RLine(InspIRCd* Instance, time_t s_time, long d, std::string src, std::string re, std::string regexs) + : XLine(Instance, s_time, d, src, re, "R") { matchtext = regexs; @@ -42,15 +43,10 @@ class CoreExport RLine : public XLine throw ModuleException("Regex engine not set or loaded!"); } - try - { - regex = RegexFactoryRequest(mymodule, rxengine, regexs).Create(); - } - catch (ModuleException& ex) - { - ServerInstance->SNO->WriteToSnoMask('x', "Bad regex: %s", ex.GetReason()); - throw; - } + /* 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 @@ -62,28 +58,16 @@ class CoreExport RLine : public XLine bool Matches(User *u) { - std::string compare = std::string(u->nick) + "!" + u->ident + "@" + u->host + " " + u->fullname; - - ServerInstance->Logs->Log("m_rline",DEBUG, "Matching " + matchtext + " against string " + compare); - - if (regex->Matches(compare)) - { - // Bang. :D - return true; - } + if (u->exempt) + return false; - return false; + std::string compare = u->nick + "!" + u->ident + "@" + u->host + " " + u->fullname; + return regex->Matches(compare); } bool Matches(const std::string &compare) { - if (regex->Matches(compare)) - { - // Bang. :D - return true; - } - - return false; + return regex->Matches(compare); } void Apply(User* u) @@ -93,7 +77,8 @@ class CoreExport RLine : public XLine void DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed R-Line %s (set by %s %ld 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.c_str(), (long int)(ServerInstance->Time() - this->set_time)); } const char* Displayable() @@ -109,17 +94,23 @@ class CoreExport RLine : public XLine /** 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 */ - XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask) + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) { return new RLine(ServerInstance, set_time, duration, source, reason, xline_specific_mask); } + + ~RLineFactory() + { + } }; /** Handle /RLINE @@ -130,9 +121,9 @@ class CommandRLine : public Command std::string rxengine; public: - CommandRLine (InspIRCd* Instance) : Command(Instance,"RLINE", "o", 1) + CommandRLine (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"RLINE", "o", 1, 3) { - this->source = "m_rline.so"; + this->syntax = " [] :"; } CmdResult Handle (const std::vector& parameters, User *user) @@ -149,9 +140,9 @@ class CommandRLine : public Command { 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) @@ -160,13 +151,12 @@ class CommandRLine : public Command { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s.", user->nick.c_str(), parameters[0].c_str()); + 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.c_str(), parameters[0].c_str(), - 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(); @@ -186,40 +176,40 @@ class CommandRLine : public Command } else { - // XXX todo implement stats - user->WriteServ("NOTICE %s :*** R-Line %s not found in list, try /stats g.",user->nick.c_str(),parameters[0].c_str()); + user->WriteServ("NOTICE %s :*** R-Line %s not found in list, try /stats R.",user->nick.c_str(),parameters[0].c_str()); } } return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; + } }; class ModuleRLine : public Module { private: - CommandRLine *r; - RLineFactory *f; + CommandRLine r; + RLineFactory f; bool MatchOnNickChange; std::string RegexEngine; public: - ModuleRLine(InspIRCd* Me) : Module(Me) + ModuleRLine(InspIRCd* Me) : Module(Me), r(Me, this), f(Me) { mymodule = this; - OnRehash(NULL, ""); + 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); + ServerInstance->AddCommand(&r); + ServerInstance->XLines->RegisterFactory(&f); - Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnLoadModule }; - ServerInstance->Modules->Attach(eventlist, this, 3); + Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnLoadModule, I_OnStats }; + ServerInstance->Modules->Attach(eventlist, this, 5); } @@ -227,7 +217,7 @@ class ModuleRLine : public Module { ServerInstance->Modules->DoneWithInterface("RegularExpression"); ServerInstance->XLines->DelAll("R"); - ServerInstance->XLines->UnregisterFactory(f); + ServerInstance->XLines->UnregisterFactory(&f); } virtual Version GetVersion() @@ -247,20 +237,18 @@ class ModuleRLine : public Module } } - virtual void OnRehash(User *user, const std::string ¶meter) + virtual void OnRehash(User *user) { ConfigReader Conf(ServerInstance); MatchOnNickChange = Conf.ReadFlag("rline", "matchonnickchange", 0); - - std::string newrxengine; - - newrxengine = Conf.ReadValue("rline", "engine", 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"); } @@ -271,8 +259,7 @@ class ModuleRLine : public Module { for (modulelist::iterator i = ml->begin(); i != ml->end(); ++i) { - std::string rxname = RegexNameRequest(this, *i).Send(); - if (rxname == newrxengine) + if (RegexNameRequest(this, *i).Send() == newrxengine) { ServerInstance->SNO->WriteToSnoMask('x', "R-Line now using engine '%s'", RegexEngine.c_str()); rxengine = *i; @@ -285,6 +272,15 @@ class ModuleRLine : public Module } } + virtual ModResult OnStats(char symbol, User* user, string_list &results) + { + if (symbol != 'R') + return MOD_RES_PASSTHRU; + + ServerInstance->XLines->InvokeStats("R", 223, user, results); + return MOD_RES_DENY; + } + virtual void OnLoadModule(Module* mod, const std::string& name) { if (ServerInstance->Modules->ModuleHasInterface(mod, "RegularExpression"))