X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_filter_pcre.cpp;h=43a767a1ccbe2e1e398c5f58c9cf12e2e96e79cb;hb=2b68243097f98ace4a53b21520718874b0ed7db5;hp=14b4d6d4a9c9fb94db9234f1fa09d6637daca413;hpb=745994473896e59faa59e4caf3fb621ef974419a;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 14b4d6d4a..43a767a1c 100644 --- a/src/modules/extra/m_filter_pcre.cpp +++ b/src/modules/extra/m_filter_pcre.cpp @@ -2,44 +2,42 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 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. * * --------------------------------------------------- */ -// Message and notice filtering using regex patterns -// a module based on the original work done by Craig Edwards in 2003 -// for the chatspike network. - -#include -#include +#include "inspircd.h" #include #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" #include "m_filter.h" /* $ModDesc: m_filter with regexps */ -/* $CompileFlags: `pcre-config --cflags` */ -/* $LinkerFlags: `pcre-config --libs` `perl extra/pcre_rpath.pl` -lpcre */ +/* $CompileFlags: exec("pcre-config --cflags") */ +/* $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; - std::string pattern; - PCREFilter(pcre* r, const std::string &rea, const std::string &act, long gline_time, const std::string &pat) - : FilterResult::FilterResult(rea, act, gline_time), regexp(r), pattern(pat) + PCREFilter(pcre* r, const std::string &rea, const std::string &act, long gline_time, const std::string &pat, const std::string &flags) + : FilterResult(pat, rea, act, gline_time, flags), regexp(r) + { + } + + PCREFilter() { } }; @@ -50,27 +48,37 @@ class ModuleFilterPCRE : public FilterBase pcre *re; const char *error; int erroffset; + PCREFilter fr; public: ModuleFilterPCRE(InspIRCd* Me) - : FilterBase::FilterBase(Me, "m_filter_pcre.so") + : FilterBase(Me, "m_filter_pcre.so") { - OnRehash(""); + OnRehash(NULL,""); } virtual ~ModuleFilterPCRE() { } - virtual FilterResult* FilterMatch(const std::string &text) + virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags) { - for (unsigned int index = 0; index < filters.size(); index++) + for (std::vector::iterator index = filters.begin(); index != filters.end(); index++) { - PCREFilter& filt = filters[index]; - - if (pcre_exec(filt.regexp,NULL,text.c_str(),text.length(),0,0,NULL,0) > -1) + /* Skip ones that dont apply to us */ + + if (!FilterBase::AppliesToMe(user, dynamic_cast(&(*index)), flags)) + continue; + + if (pcre_exec(index->regexp, NULL, text.c_str(), text.length(), 0, 0, NULL, 0) > -1) { - return &filt; + fr = *index; + if (index != filters.begin()) + { + filters.erase(index); + filters.insert(filters.begin(), fr); + } + return &fr; } } return NULL; @@ -80,8 +88,9 @@ class ModuleFilterPCRE : public FilterBase { for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) { - if (i->pattern == freeform) + if (i->freeform == freeform) { + pcre_free((*i).regexp); filters.erase(i); return true; } @@ -89,11 +98,19 @@ class ModuleFilterPCRE : public FilterBase return false; } - virtual std::pair AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration) + virtual void SyncFilters(Module* proto, void* opaque) + { + for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) + { + this->SendFilter(proto, opaque, &(*i)); + } + } + + virtual std::pair AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flags) { for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) { - if (i->pattern == freeform) + if (i->freeform == freeform) { return std::make_pair(false, "Filter already exists"); } @@ -109,26 +126,28 @@ class ModuleFilterPCRE : public FilterBase } else { - filters.push_back(PCREFilter(re, reason, type, duration, freeform)); + filters.push_back(PCREFilter(re, reason, type, duration, freeform, flags)); return std::make_pair(true, ""); } } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader MyConf(ServerInstance); - for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) - pcre_free((*i).regexp); - - filters.clear(); - for (int index = 0; index < MyConf.Enumerate("keyword"); index++) { + this->DeleteFilter(MyConf.ReadValue("keyword", "pattern", index)); + std::string pattern = MyConf.ReadValue("keyword", "pattern", index); std::string reason = MyConf.ReadValue("keyword", "reason", index); std::string action = MyConf.ReadValue("keyword", "action", index); - long gline_time = ServerInstance->Duration(MyConf.ReadValue("keyword", "duration", index).c_str()); + std::string flags = MyConf.ReadValue("keyword", "flags", index); + long gline_time = ServerInstance->Duration(MyConf.ReadValue("keyword", "duration", index)); + if (action.empty()) + action = "none"; + if (flags.empty()) + flags = "*"; re = pcre_compile(pattern.c_str(),0,&error,&erroffset,NULL); @@ -139,34 +158,25 @@ class ModuleFilterPCRE : public FilterBase } else { - filters.push_back(PCREFilter(re, reason, action, gline_time, pattern)); + filters.push_back(PCREFilter(re, reason, action, gline_time, pattern, flags)); ServerInstance->Log(DEFAULT,"Regular expression %s loaded.", pattern.c_str()); } } } -}; - -class ModuleFilterPCREFactory : public ModuleFactory -{ - public: - ModuleFilterPCREFactory() - { - } - - ~ModuleFilterPCREFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) + virtual int OnStats(char symbol, User* user, string_list &results) { - return new ModuleFilterPCRE(Me); + 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->flags+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason); + } + } + return 0; } - }; +MODULE_INIT(ModuleFilterPCRE); -extern "C" void * init_module( void ) -{ - return new ModuleFilterPCREFactory; -}