X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_filter_pcre.cpp;h=a7829871f18569416a587c36cb733dce6de2d1ae;hb=f160e592ad3eadb551b6b066a245336bc2cfc81e;hp=03cecffb75ea6e9bcfe76630e29d3e6b49385360;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;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 03cecffb7..a7829871f 100644 --- a/src/modules/extra/m_filter_pcre.cpp +++ b/src/modules/extra/m_filter_pcre.cpp @@ -25,148 +25,118 @@ #include "channels.h" #include "modules.h" #include "inspircd.h" - -/** Thrown by m_filter_pcre - */ -class FilterPCREException : public ModuleException -{ - public: - virtual const char* GetReason() - { - return "Could not find definition in your config file!"; - } -}; +#include "m_filter.h" /* $ModDesc: m_filter with regexps */ /* $CompileFlags: `pcre-config --cflags` */ /* $LinkerFlags: `pcre-config --libs` `perl extra/pcre_rpath.pl` -lpcre */ +/* $ModDep: m_filter.h */ -class ModuleFilterPCRE : public Module +class PCREFilter : public FilterResult { - class Filter - { - public: - pcre* regexp; - std::string reason; - std::string action; - - Filter(pcre* r, const std::string &rea, const std::string &act) - : regexp(r), reason(rea), action(act) - { - } - }; - - InspIRCd* Srv; - std::vector filters; + public: + pcre* regexp; + + PCREFilter(pcre* r, const std::string &rea, const std::string &act, long gline_time, const std::string &pat) + : FilterResult::FilterResult(pat, rea, act, gline_time), regexp(r) + { + } +}; + +class ModuleFilterPCRE : public FilterBase +{ + std::vector filters; pcre *re; const char *error; int erroffset; - + public: ModuleFilterPCRE(InspIRCd* Me) - : Module::Module(Me), Srv(Me) + : FilterBase::FilterBase(Me, "m_filter_pcre.so") { OnRehash(""); } - - virtual ~ModuleFilterPCRE() - { - } - void Implements(char* List) + virtual ~ModuleFilterPCRE() { - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1; } - // format of a config entry is - - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) - { - return OnUserPreNotice(user,dest,target_type,text,status); - } - - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status) + virtual FilterResult* FilterMatch(const std::string &text) { for (unsigned int index = 0; index < filters.size(); index++) { - Filter& filt = filters[index]; + PCREFilter& filt = filters[index]; if (pcre_exec(filt.regexp,NULL,text.c_str(),text.length(),0,0,NULL,0) > -1) { - const char* target; - - if(filt.action.empty()) - filt.action = "none"; - - if (target_type == TYPE_USER) - { - userrec* t = (userrec*)dest; - target = t->nick; - } - else if (target_type == TYPE_CHANNEL) - { - chanrec* t = (chanrec*)dest; - target = t->name; - } - else - { - target = ""; - } - - ServerInstance->Log(DEFAULT, "Filter: %s had their notice filtered, target was %s: %s Action: %s", user->nick, target, filt.reason.c_str(), filt.action.c_str()); - - if (filt.action == "block") - { - Srv->WriteOpers("Filter: %s had their notice filtered, target was %s: %s", user->nick, target, filt.reason.c_str()); - user->WriteServ("NOTICE "+std::string(user->nick)+" :Your notice has been filtered and opers notified: "+filt.reason); - } - else if (filt.action == "kill") - { - userrec::QuitUser(Srv, user, filt.reason); - } - - return 1; + return &filt; } } - return 0; + return NULL; } - - virtual void OnRehash(const std::string ¶meter) + + virtual bool DeleteFilter(const std::string &freeform) + { + for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) + { + if (i->freeform == freeform) + { + pcre_free((*i).regexp); + filters.erase(i); + return true; + } + } + return false; + } + + 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) { - /* Read the configuration file on startup and rehash. - * It is perfectly valid to set to the value of the - * main config file, then append your tags to the bottom - * of the main config... but rather messy. That's why the capability - * of using a seperate config file is provided. - */ - - ConfigReader Conf(Srv); - - std::string filterfile = Conf.ReadValue("filter", "file", 0); - - ConfigReader MyConf(Srv, filterfile); - - if (filterfile.empty() || !MyConf.Verify()) + for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) + { + if (i->freeform == freeform) + { + return std::make_pair(false, "Filter already exists"); + } + } + + re = pcre_compile(freeform.c_str(),0,&error,&erroffset,NULL); + + 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()); + return std::make_pair(false, "Error in regular expression at offset " + ConvToStr(erroffset) + ": "+error); + } + else { - FilterPCREException e; - throw(e); + filters.push_back(PCREFilter(re, reason, type, duration, freeform)); + return std::make_pair(true, ""); } - - ServerInstance->Log(DEFAULT,"m_filter_pcre: read configuration from "+filterfile); - - for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) - pcre_free((*i).regexp); - - filters.clear(); - + } + + virtual void OnRehash(const std::string ¶meter) + { + ConfigReader MyConf(ServerInstance); + for (int index = 0; index < MyConf.Enumerate("keyword"); 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); - + 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()); + 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); @@ -174,21 +144,13 @@ class ModuleFilterPCRE : public Module } else { - filters.push_back(Filter(re, reason, action)); + filters.push_back(PCREFilter(re, reason, action, gline_time, pattern)); ServerInstance->Log(DEFAULT,"Regular expression %s loaded.", pattern.c_str()); } } } - - virtual Version GetVersion() - { - /* Version 1.x is the unreleased unrealircd module */ - return Version(3,2,1,0,VF_VENDOR,API_VERSION); - } - }; - -// stuff down here is the module-factory stuff. For basic modules you can ignore this. + class ModuleFilterPCREFactory : public ModuleFactory {