X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_filter_pcre.cpp;h=4710d7a33b5836d67ff69274f94c8c0363be0cf9;hb=b950e46bfeef5643ff68c8c78530c1eff25d024e;hp=bafb4007067a69adf17a15b9828e847976d5e167;hpb=5183b9b8207a26b6196b7da0a1d092bb1f6e8429;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp index bafb40070..4710d7a33 100644 --- a/src/modules/extra/m_filter_pcre.cpp +++ b/src/modules/extra/m_filter_pcre.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -23,13 +23,17 @@ /* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */ /* $ModDep: m_filter.h */ +#ifdef WINDOWS +#pragma comment(lib, "pcre.lib") +#endif + class PCREFilter : public FilterResult { public: pcre* regexp; - PCREFilter(pcre* r, const std::string &rea, const std::string &act, long gline_time, const std::string &pat, const std::string &flags) - : FilterResult::FilterResult(pat, rea, act, gline_time, flags), regexp(r) + PCREFilter(pcre* r, const std::string &rea, const std::string &act, long glinetime, const std::string &pat, const std::string &flgs) + : FilterResult(pat, rea, act, glinetime, flgs), regexp(r) { } @@ -48,19 +52,25 @@ class ModuleFilterPCRE : public FilterBase public: ModuleFilterPCRE(InspIRCd* Me) - : FilterBase::FilterBase(Me, "m_filter_pcre.so") + : FilterBase(Me, "m_filter_pcre.so") { OnRehash(NULL,""); + } virtual ~ModuleFilterPCRE() { } - virtual FilterResult* FilterMatch(const std::string &text) + virtual FilterResult* FilterMatch(User* user, const std::string &text, int flgs) { for (std::vector::iterator index = filters.begin(); index != filters.end(); index++) { + /* Skip ones that dont apply to us */ + + if (!FilterBase::AppliesToMe(user, dynamic_cast(&(*index)), flgs)) + continue; + if (pcre_exec(index->regexp, NULL, text.c_str(), text.length(), 0, 0, NULL, 0) > -1) { fr = *index; @@ -97,7 +107,7 @@ class ModuleFilterPCRE : public FilterBase } } - virtual std::pair AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flags) + virtual std::pair AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flgs) { for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) { @@ -111,19 +121,19 @@ class ModuleFilterPCRE : public FilterBase if (!re) { - ServerInstance->Log(DEFAULT,"Error in regular expression: %s at offset %d: %s\n", freeform.c_str(), erroffset, error); - ServerInstance->Log(DEFAULT,"Regular expression %s not loaded.", freeform.c_str()); + ServerInstance->Logs->Log("m_filter_pcre", DEFAULT,"Error in regular expression: %s at offset %d: %s\n", freeform.c_str(), erroffset, error); + ServerInstance->Logs->Log("m_filter_pcre", DEFAULT,"Regular expression %s not loaded.", freeform.c_str()); return std::make_pair(false, "Error in regular expression at offset " + ConvToStr(erroffset) + ": "+error); } else { - filters.push_back(PCREFilter(re, reason, type, duration, freeform, flags)); + filters.push_back(PCREFilter(re, reason, type, duration, freeform, flgs)); return std::make_pair(true, ""); } } - virtual void OnRehash(userrec* user, const std::string ¶meter) - { + virtual void OnRehash(User* user, const std::string ¶meter) + { ConfigReader MyConf(ServerInstance); for (int index = 0; index < MyConf.Enumerate("keyword"); index++) @@ -133,59 +143,46 @@ class ModuleFilterPCRE : public FilterBase std::string pattern = MyConf.ReadValue("keyword", "pattern", index); std::string reason = MyConf.ReadValue("keyword", "reason", index); std::string action = MyConf.ReadValue("keyword", "action", index); - std::string flags = MyConf.ReadValue("keyword", "flags", index); - long gline_time = ServerInstance->Duration(MyConf.ReadValue("keyword", "duration", index).c_str()); + std::string flgs = MyConf.ReadValue("keyword", "flags", index); + long gline_time = ServerInstance->Duration(MyConf.ReadValue("keyword", "duration", index)); + if (action.empty()) + action = "none"; + if (flgs.empty()) + flgs = "*"; re = pcre_compile(pattern.c_str(),0,&error,&erroffset,NULL); if (!re) { - ServerInstance->Log(DEFAULT,"Error in regular expression: %s at offset %d: %s\n", pattern.c_str(), erroffset, error); - ServerInstance->Log(DEFAULT,"Regular expression %s not loaded.", pattern.c_str()); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"Error in regular expression: %s at offset %d: %s\n", pattern.c_str(), erroffset, error); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"Regular expression %s not loaded.", pattern.c_str()); } else { - filters.push_back(PCREFilter(re, reason, action, gline_time, pattern, flags)); - ServerInstance->Log(DEFAULT,"Regular expression %s loaded.", pattern.c_str()); + filters.push_back(PCREFilter(re, reason, action, gline_time, pattern, flgs)); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"Regular expression %s loaded.", pattern.c_str()); } } + FilterBase::OnRehash(user, parameter); } - virtual int OnStats(char symbol, userrec* user, string_list &results) + virtual int OnStats(char symbol, User* user, string_list &results) { if (symbol == 's') { std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) { - results.push_back(sn+" 223 "+user->nick+" :REGEXP:"+i->freeform+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason); + results.push_back(sn+" 223 "+user->nick+" :REGEXP:"+i->freeform+" "+i->flags+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason); + } + for (std::vector::iterator i = exemptfromfilter.begin(); i != exemptfromfilter.end(); ++i) + { + results.push_back(sn+" 223 "+user->nick+" :EXEMPT "+(*i)); } } return 0; } }; - - -class ModuleFilterPCREFactory : public ModuleFactory -{ - public: - ModuleFilterPCREFactory() - { - } - - ~ModuleFilterPCREFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleFilterPCRE(Me); - } - -}; +MODULE_INIT(ModuleFilterPCRE) -extern "C" void * init_module( void ) -{ - return new ModuleFilterPCREFactory; -}