X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rline.cpp;h=8bad04f292352142781111969e85b3b2abff5b16;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=8fb60385ef763ce65a4c6771314d8a1636ef6a41;hpb=1daa5273d70105f112d93a7528032826c9a66983;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 8fb60385e..8bad04f29 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,14 @@ #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! */ +static bool ZlineOnMatch = false; +static std::vector background_zlines; /* $ModDesc: RLINE: Regexp user banning. */ -class CoreExport RLine : public XLine +class RLine : public XLine { public: @@ -32,13 +34,14 @@ 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(time_t s_time, long d, std::string src, std::string re, std::string regexs) + : XLine(s_time, d, src, re, "R") { matchtext = regexs; if (!rxengine) { - ServerInstance->SNO->WriteToSnoMask('x', "Cannot create regexes until engine is set to a loaded provider!"); + ServerInstance->SNO->WriteToSnoMask('a', "Cannot create regexes until engine is set to a loaded provider!"); throw ModuleException("Regex engine not set or loaded!"); } @@ -57,6 +60,9 @@ class CoreExport RLine : public XLine bool Matches(User *u) { + if (u->exempt) + return false; + std::string compare = u->nick + "!" + u->ident + "@" + u->host + " " + u->fullname; return regex->Matches(compare); } @@ -68,12 +74,16 @@ class CoreExport RLine : public XLine void Apply(User* u) { - DefaultApply(u, "R", true); + if (ZlineOnMatch) { + background_zlines.push_back(new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, ServerInstance->Config->ServerName, reason.c_str(), u->GetIPString())); + } + DefaultApply(u, "R", false); } 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() @@ -89,16 +99,22 @@ 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() : XLineFactory("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(set_time, duration, source, reason, xline_specific_mask); + } + + ~RLineFactory() { - return new RLine(ServerInstance, set_time, duration, source, reason, xline_specific_mask); } }; @@ -110,9 +126,9 @@ class CommandRLine : public Command std::string rxengine; public: - CommandRLine (InspIRCd* Instance) : Command(Instance,"RLINE", "o", 1) + CommandRLine(Module* Creator) : Command(Creator,"RLINE", 1, 3) { - this->source = "m_rline.so"; + flags_needed = 'o'; this->syntax = " [] :"; } CmdResult Handle (const std::vector& parameters, User *user) @@ -127,11 +143,11 @@ class CommandRLine : public Command try { - r = new RLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); + r = new RLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); } catch (ModuleException &e) { - ServerInstance->SNO->WriteToSnoMask('x',"Could not add RLINE: %s", e.GetReason()); + ServerInstance->SNO->WriteToSnoMask('a',"Could not add RLINE: %s", e.GetReason()); } if (r) @@ -140,13 +156,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 to expire 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(); @@ -162,7 +177,7 @@ class CommandRLine : public Command { if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "R", user)) { - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick.c_str(),parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('x',"%s removed R-line on %s",user->nick.c_str(),parameters[0].c_str()); } else { @@ -172,33 +187,34 @@ class CommandRLine : public Command 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() : r(this) { mymodule = this; - OnRehash(NULL, ""); + OnRehash(NULL); - Me->Modules->UseInterface("RegularExpression"); + ServerInstance->Modules->UseInterface("RegularExpression"); - // Create a new command - r = new CommandRLine(ServerInstance); - ServerInstance->AddCommand(r); + ServerInstance->AddCommand(&r); + ServerInstance->XLines->RegisterFactory(&f); - 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); + Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnLoadModule, I_OnStats, I_OnBackgroundTimer }; + ServerInstance->Modules->Attach(eventlist, this, 6); } @@ -206,12 +222,12 @@ class ModuleRLine : public Module { ServerInstance->Modules->DoneWithInterface("RegularExpression"); ServerInstance->XLines->DelAll("R"); - ServerInstance->XLines->UnregisterFactory(f); + ServerInstance->XLines->UnregisterFactory(&f); } virtual Version GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR, API_VERSION); } virtual void OnUserConnect(User* user) @@ -226,11 +242,15 @@ class ModuleRLine : public Module } } - virtual void OnRehash(User *user, const std::string ¶meter) + virtual void OnRehash(User *user) { - ConfigReader Conf(ServerInstance); + ConfigReader Conf; + + if (!Conf.ReadFlag("rline", "zlineonmatch", 0) && ZlineOnMatch) + background_zlines.clear(); MatchOnNickChange = Conf.ReadFlag("rline", "matchonnickchange", 0); + ZlineOnMatch = Conf.ReadFlag("rline", "zlineonmatch", 0); std::string newrxengine = Conf.ReadValue("rline", "engine", 0); if (!RegexEngine.empty()) @@ -250,24 +270,24 @@ class ModuleRLine : public Module { if (RegexNameRequest(this, *i).Send() == newrxengine) { - ServerInstance->SNO->WriteToSnoMask('x', "R-Line now using engine '%s'", RegexEngine.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "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()); + ServerInstance->SNO->WriteToSnoMask('a', "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) + virtual ModResult OnStats(char symbol, User* user, string_list &results) { if (symbol != 'R') - return 0; + return MOD_RES_PASSTHRU; ServerInstance->XLines->InvokeStats("R", 223, user, results); - return 1; + return MOD_RES_DENY; } virtual void OnLoadModule(Module* mod, const std::string& name) @@ -277,7 +297,7 @@ class ModuleRLine : public Module std::string rxname = RegexNameRequest(this, mod).Send(); if (rxname == RegexEngine) { - ServerInstance->SNO->WriteToSnoMask('x', "R-Line now using engine '%s'", RegexEngine.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "R-Line now using engine '%s'", RegexEngine.c_str()); rxengine = mod; } } @@ -300,6 +320,22 @@ class ModuleRLine : public Module } } + virtual void OnBackgroundTimer(time_t curtime) + { + if (!ZlineOnMatch) return; + for (std::vector::iterator i = background_zlines.begin(); i != background_zlines.end(); i++) + { + ZLine *zl = *i; + if (ServerInstance->XLines->AddLine(zl,NULL)) + { + ServerInstance->SNO->WriteToSnoMask('x',"Z-line added due to R-line match on *@%s%s%s: %s", + zl->ipaddr.c_str(), zl->duration ? " to expire on " : "", zl->duration ? ServerInstance->TimeString(zl->expiry).c_str() : "", zl->reason.c_str()); + ServerInstance->XLines->ApplyLines(); + } + } + background_zlines.clear(); + } + }; MODULE_INIT(ModuleRLine)