X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_filter_pcre.cpp;h=a7829871f18569416a587c36cb733dce6de2d1ae;hb=f160e592ad3eadb551b6b066a245336bc2cfc81e;hp=c654fd1cf087d37bf73a3ae0c66710f6c8bdf37d;hpb=d651aeb61a34e047586806a3db434ac6390aad73;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 c654fd1cf..a7829871f 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 | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev. * E-mail: * * @@ -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,208 +24,133 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" +#include "m_filter.h" /* $ModDesc: m_filter with regexps */ -/* $CompileFlags: -I/usr/local/include */ -/* $LinkerFlags: -L/usr/local/lib -lpcre */ +/* $CompileFlags: `pcre-config --cflags` */ +/* $LinkerFlags: `pcre-config --libs` `perl extra/pcre_rpath.pl` -lpcre */ +/* $ModDep: m_filter.h */ + +class PCREFilter : public FilterResult +{ + public: + pcre* regexp; -class ModuleFilterPCRE : public Module + 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 { - Server *Srv; - ConfigReader *Conf, *MyConf; - std::vector filters; + std::vector filters; pcre *re; const char *error; int erroffset; - + public: - ModuleFilterPCRE(Server* Me) - : Module::Module(Me) + ModuleFilterPCRE(InspIRCd* 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. - Srv = Me; - Conf = new ConfigReader; - std::string filterfile = Conf->ReadValue("filter","file",0); - MyConf = new ConfigReader(filterfile); - if ((filterfile == "") || (!MyConf->Verify())) - { - printf("Error, could not find definition in your config file!\n"); - log(DEFAULT,"Error, could not find definition in your config file!"); - return; - } - Srv->Log(DEFAULT,std::string("m_filter_pcre: read configuration from ")+filterfile); - - filters.clear(); - for (int index = 0; index < MyConf->Enumerate("keyword"); 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 - { - filters.push_back(re); - log(DEFAULT,"Regular expression %s loaded.", pattern.c_str()); - } - } - + OnRehash(""); } - + virtual ~ModuleFilterPCRE() { - delete MyConf; - delete Conf; } - - // format of a config entry is - - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text) + + virtual FilterResult* FilterMatch(const std::string &text) { for (unsigned int index = 0; index < filters.size(); index++) { - if (pcre_exec(filters[index],NULL,text.c_str(),text.length(),0,0,NULL,0) > -1) + PCREFilter& filt = filters[index]; + + if (pcre_exec(filt.regexp,NULL,text.c_str(),text.length(),0,0,NULL,0) > -1) { - std::string 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 = std::string(t->nick); - } - else if (target_type == TYPE_CHANNEL) - { - chanrec* t = (chanrec*)dest; - target = std::string(t->name); - } - if (do_action == "block") - { - Srv->SendOpers(std::string("FilterPCRE: ")+std::string(user->nick)+ - std::string(" had their message filtered, target was ")+ - target+": "+reason); - // this form of SendTo (with the source as NuLL) sends a server notice - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+ - " :Your message has been filtered and opers notified: "+reason); - } - - Srv->Log(DEFAULT,std::string("Filter: ")+std::string(user->nick)+ - std::string(" had their message filtered, target was ")+ - target+": "+reason+" Action: "+do_action); - - if (do_action == "kill") - { - Srv->QuitUser(user,reason); - } - return 1; + return &filt; } } - return 0; + return NULL; } - - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) + + virtual bool DeleteFilter(const std::string &freeform) { - 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) { - std::string 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 = std::string(t->nick); - } - else if (target_type == TYPE_CHANNEL) - { - chanrec* t = (chanrec*)dest; - target = std::string(t->name); - } - if (do_action == "block") - { - Srv->SendOpers(std::string("Filter: ")+std::string(user->nick)+ - std::string(" had their notice filtered, target was ")+ - target+": "+reason); - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+ - " :Your notice has been filtered and opers notified: "+reason); - } - Srv->Log(DEFAULT,std::string("Filter: ")+std::string(user->nick)+ - std::string(" had their notice filtered, target was ")+ - target+": "+reason+" Action: "+do_action); - - if (do_action == "kill") - { - Srv->QuitUser(user,reason); - } - return 1; + pcre_free((*i).regexp); + filters.erase(i); + return true; } } - return 0; + return false; } - - virtual void OnRehash(std::string parameter) + + virtual void SyncFilters(Module* proto, void* opaque) { - // 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())) + for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) { - // bail if the user forgot to create a config file - printf("Error, could not find definition in your config file!"); - log(DEFAULT,"Error, could not find definition in your config file!"); - return; + this->SendFilter(proto, opaque, &(*i)); } - Srv->Log(DEFAULT,std::string("m_filter_pcre: read configuration from ")+filterfile); - - filters.clear(); - for (int index = 0; index < MyConf->Enumerate("keyword"); 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 - { - filters.push_back(re); - log(DEFAULT,"Regular expression %s loaded.", pattern.c_str()); - } - } - } - - virtual Version GetVersion() + + virtual std::pair AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration) { - // This is version 2 because version 1.x is the unreleased unrealircd module - return Version(3,0,0,0,VF_VENDOR); + 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 + { + filters.push_back(PCREFilter(re, reason, type, duration, freeform)); + return std::make_pair(true, ""); + } } - -}; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. + virtual void OnRehash(const std::string ¶meter) + { + ConfigReader MyConf(ServerInstance); + + 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()); + + 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()); + } + else + { + filters.push_back(PCREFilter(re, reason, action, gline_time, pattern)); + ServerInstance->Log(DEFAULT,"Regular expression %s loaded.", pattern.c_str()); + } + } + } +}; + class ModuleFilterPCREFactory : public ModuleFactory { @@ -240,7 +163,7 @@ class ModuleFilterPCREFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleFilterPCRE(Me); } @@ -252,4 +175,3 @@ extern "C" void * init_module( void ) { return new ModuleFilterPCREFactory; } -