X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_filter_pcre.cpp;h=a7829871f18569416a587c36cb733dce6de2d1ae;hb=f160e592ad3eadb551b6b066a245336bc2cfc81e;hp=a885046bb12dba279a405602400ad9d18de69ae9;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;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 a885046bb..a7829871f 100644 --- a/src/modules/extra/m_filter_pcre.cpp +++ b/src/modules/extra/m_filter_pcre.cpp @@ -14,8 +14,6 @@ * --------------------------------------------------- */ -using namespace std; - // Message and notice filtering using regex patterns // a module based on the original work done by Craig Edwards in 2003 // for the chatspike network. @@ -26,182 +24,133 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" #include "inspircd.h" +#include "m_filter.h" -extern InspIRCd* ServerInstance; +/* $ModDesc: m_filter with regexps */ +/* $CompileFlags: `pcre-config --cflags` */ +/* $LinkerFlags: `pcre-config --libs` `perl extra/pcre_rpath.pl` -lpcre */ +/* $ModDep: m_filter.h */ -class FilterPCREException : public ModuleException +class PCREFilter : public FilterResult { public: - virtual const char* GetReason() - { - return "Could not find definition in your config file!"; - } -}; + pcre* regexp; -/* $ModDesc: m_filter with regexps */ -/* $CompileFlags: -I/usr/local/include */ -/* $LinkerFlags: -L/usr/local/lib -lpcre */ + 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 Module +class ModuleFilterPCRE : public FilterBase { - Server *Srv; - ConfigReader *Conf, *MyConf; - std::vector filters; + std::vector filters; pcre *re; const char *error; int erroffset; - + public: ModuleFilterPCRE(InspIRCd* Me) - : Module::Module(Me) + : FilterBase::FilterBase(Me, "m_filter_pcre.so") { - // read the configuration file on startup. - // 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. - - Conf = new ConfigReader; - std::string filterfile = Conf->ReadValue("filter","file",0); - MyConf = new ConfigReader(filterfile); - if ((filterfile == "") || (!MyConf->Verify())) - { - FilterPCREException e; - throw(e); - } - log(DEFAULT,"m_filter_pcre: read configuration from "+filterfile); + OnRehash(""); + } + + virtual ~ModuleFilterPCRE() + { + } - filters.clear(); - for (int index = 0; index < MyConf->Enumerate("keyword"); index++) + virtual FilterResult* FilterMatch(const std::string &text) + { + for (unsigned int index = 0; index < filters.size(); index++) { - std::string pattern = MyConf->ReadValue("keyword","pattern",index); - re = pcre_compile(pattern.c_str(),0,&error,&erroffset,NULL); - if (!re) - { - log(DEFAULT,"Error in regular expression: %s at offset %d: %s\n", pattern.c_str(), erroffset, error); - log(DEFAULT,"Regular expression %s not loaded.", pattern.c_str()); - } - else + PCREFilter& filt = filters[index]; + + if (pcre_exec(filt.regexp,NULL,text.c_str(),text.length(),0,0,NULL,0) > -1) { - filters.push_back(re); - log(DEFAULT,"Regular expression %s loaded.", pattern.c_str()); + return &filt; } } - - } - - virtual ~ModuleFilterPCRE() - { - DELETE(MyConf); - DELETE(Conf); + return NULL; } - void Implements(char* List) + virtual bool DeleteFilter(const std::string &freeform) { - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1; + 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; } - // format of a config entry is - - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) + virtual void SyncFilters(Module* proto, void* opaque) { - return OnUserPreNotice(user,dest,target_type,text,status); + for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) + { + this->SendFilter(proto, opaque, &(*i)); + } } - - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status) + + virtual std::pair AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration) { - for (unsigned int index = 0; index < filters.size(); index++) + for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) { - if (pcre_exec(filters[index],NULL,text.c_str(),text.length(),0,0,NULL,0) > -1) + if (i->freeform == freeform) { - const char* target; - std::string reason = MyConf->ReadValue("keyword","reason",index); - std::string do_action = MyConf->ReadValue("keyword","action",index); - - if (do_action == "") - do_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 = ""; - } - - if (do_action == "block") - { - ServerInstance->WriteOpers("Filter: %s had their notice filtered, target was %s: %s", user->nick, target, reason.c_str()); - user->WriteServ("NOTICE "+std::string(user->nick)+" :Your notice has been filtered and opers notified: "+reason); - } - - log(DEFAULT, "Filter: %s had their notice filtered, target was %s: %s Action: %s", user->nick, target, reason.c_str(), do_action.c_str()); - - if (do_action == "kill") - { - userrec::QuitUser(ServerInstance,user,reason); - } - return 1; + return std::make_pair(false, "Filter already exists"); } } - return 0; - } - - virtual void OnRehash(const std::string ¶meter) - { - // reload our config file on rehash - we must destroy and re-allocate the classes - // to call the constructor again and re-read our data. - DELETE(Conf); - DELETE(MyConf); - Conf = new ConfigReader; - std::string filterfile = Conf->ReadValue("filter","file",0); - // this automatically re-reads the configuration file into the class - MyConf = new ConfigReader(filterfile); - if ((filterfile == "") || (!MyConf->Verify())) + + re = pcre_compile(freeform.c_str(),0,&error,&erroffset,NULL); + + if (!re) { - FilterPCREException e; - // bail if the user forgot to create a config file - throw(e); + 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); } - log(DEFAULT,"m_filter_pcre: read configuration from "+filterfile); + else + { + filters.push_back(PCREFilter(re, reason, type, duration, freeform)); + return std::make_pair(true, ""); + } + } + + virtual void OnRehash(const std::string ¶meter) + { + ConfigReader MyConf(ServerInstance); - filters.clear(); - for (int index = 0; index < MyConf->Enumerate("keyword"); index++) + for (int index = 0; index < MyConf.Enumerate("keyword"); index++) { - std::string pattern = MyConf->ReadValue("keyword","pattern",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) { - log(DEFAULT,"Error in regular expression: %s at offset %d: %s\n", pattern.c_str(), erroffset, error); - log(DEFAULT,"Regular expression %s not loaded.", pattern.c_str()); + 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()); } else { - filters.push_back(re); - log(DEFAULT,"Regular expression %s loaded.", pattern.c_str()); + filters.push_back(PCREFilter(re, reason, action, gline_time, pattern)); + ServerInstance->Log(DEFAULT,"Regular expression %s loaded.", pattern.c_str()); } } - - } - - virtual Version GetVersion() - { - // This is version 2 because version 1.x is the unreleased unrealircd module - return Version(3,0,0,0,VF_VENDOR); } - }; - -// stuff down here is the module-factory stuff. For basic modules you can ignore this. + class ModuleFilterPCREFactory : public ModuleFactory {