X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rline.cpp;h=31b382a22dcc8e3cb73c08a942ceee9a160ab013;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=7397beebd1483b3ecc2d6edb51abfea047cad79c;hpb=583c24d6c69eb4fc803148d0a0d84df6a4b4214e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 7397beebd..31b382a22 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -2,30 +2,29 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 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. + * 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! */ +static bool ZlineOnMatch = false; +static std::vector background_zlines; -#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 @@ -35,156 +34,308 @@ 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, "K") + RLine(time_t s_time, long d, std::string src, std::string re, std::string regexs) + : XLine(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('a', "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; } - virtual bool Matches(User *u) + bool Matches(User *u) { - std::string compare = compare.assign(u->nick) + "!" + u->ident + "@" + u->host + " " + u->fullname; - - ServerInstance->Log(DEBUG, "Matching " + matchtext + " against string " + compare); + if (u->exempt) + return false; - 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); } - virtual bool Matches(const std::string&); // Ignored for us + bool Matches(const std::string &compare) + { + return regex->Matches(compare); + } - virtual void Apply(User* u) + 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.c_str(), reason.c_str(), u->GetIPString())); + } + DefaultApply(u, "R", false); } - virtual void DisplayExpiry() + 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.c_str(), (long int)(ServerInstance->Time() - this->set_time)); } - virtual const char* Displayable() + const char* Displayable() { return matchtext.c_str(); } 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() : XLineFactory("R") + { + } /** Generate a RLine */ - XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask) - { - return new RLine(ServerInstance, set_time, duration, source, reason, 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() + { + } }; -/* - if (pcnt >= 3) +/** Handle /RLINE + * Syntax is same as other lines: RLINE regex_goes_here 1d :reason + */ +class CommandRLine : public Command +{ + std::string rxengine; + + public: + CommandRLine(Module* Creator) : Command(Creator,"RLINE", 1, 3) { - IdentHostPair ih; - User* find = ServerInstance->FindNick(parameters[0]); - if (find) - { - ih.first = "*"; - ih.second = find->GetIPString(); - } - else - ih = ServerInstance->XLines->IdentSplit(parameters[0]); + flags_needed = 'o'; this->syntax = " [] :"; + } - if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user)) - return CMD_FAILURE; + CmdResult Handle (const std::vector& parameters, User *user) + { - if (!strchr(parameters[0],'@')) - { - user->WriteServ("NOTICE %s :*** G-Line must contain a username, e.g. *@%s",user->nick,parameters[0]); - return CMD_FAILURE; - } - else if (strchr(parameters[0],'!')) + if (parameters.size() >= 3) { - user->WriteServ("NOTICE %s :*** G-Line cannot contain a nickname!",user->nick); - return CMD_FAILURE; - } + // Adding - XXX todo make this respect tag perhaps.. - long duration = ServerInstance->Duration(parameters[1]); - GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str()); - if (ServerInstance->XLines->AddLine(gl, user)) - { - if (!duration) + long duration = ServerInstance->Duration(parameters[1]); + RLine *r = NULL; + + try { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]); + r = new RLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); } - else + catch (ModuleException &e) { - time_t c_requires_crap = duration + ServerInstance->Time(); - ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s",user->nick,parameters[0], - ServerInstance->TimeString(c_requires_crap).c_str()); + ServerInstance->SNO->WriteToSnoMask('a',"Could not add RLINE: %s", e.GetReason()); } - ServerInstance->XLines->ApplyLines(); + if (r) + { + if (ServerInstance->XLines->AddLine(r, user)) + { + if (!duration) + { + 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 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(); + } + else + { + delete r; + user->WriteServ("NOTICE %s :*** R-Line for %s already exists", user->nick.c_str(), parameters[0].c_str()); + } + } } else { - delete gl; - user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,parameters[0]); + 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()); + } + else + { + 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; } - else + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - if (ServerInstance->XLines->DelLine(parameters[0],"G",user)) - { - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,parameters[0]); - } - else - { - user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick,parameters[0]); - } + return ROUTE_BROADCAST; } -*/ +}; class ModuleRLine : public Module { + private: + CommandRLine r; + RLineFactory f; + bool MatchOnNickChange; + std::string RegexEngine; + public: - ModuleRLine(InspIRCd* Me) : Module(Me) + ModuleRLine() : r(this) { + mymodule = this; + OnRehash(NULL); + + ServerInstance->Modules->UseInterface("RegularExpression"); + + ServerInstance->AddCommand(&r); + ServerInstance->XLines->RegisterFactory(&f); + + Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnLoadModule, I_OnStats, I_OnBackgroundTimer }; + ServerInstance->Modules->Attach(eventlist, this, 6); + } virtual ~ModuleRLine() { + ServerInstance->Modules->DoneWithInterface("RegularExpression"); + ServerInstance->XLines->DelAll("R"); + ServerInstance->XLines->UnregisterFactory(&f); + } + + virtual Version GetVersion() + { + return Version("RLINE: Regexp user banning.", 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) + { + 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()) + { + 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('a', "R-Line now using engine '%s'", RegexEngine.c_str()); + rxengine = *i; + } + } + } + if (!rxengine) + { + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Regex engine '%s' is not loaded - R-Line functionality disabled until this is corrected.", RegexEngine.c_str()); + } + } + + 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")) + { + std::string rxname = RegexNameRequest(this, mod).Send(); + if (rxname == RegexEngine) + { + ServerInstance->SNO->WriteToSnoMask('a', "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); + } } + + 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)