X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=46f5922f017cd1250cdfa96eb20c11f3ab2a9074;hb=7c0c957577a195b4819e4d7f2c9672d7c7522b0d;hp=1fa2129991d917784856886829faacba5fa0fcca;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 1fa212999..46f5922f0 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -25,17 +25,41 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */ + + +/** Holds a filter pattern and reason + */ +class Filter : public classbase +{ + public: + std::string reason; + std::string action; +}; + +typedef std::map filter_t; + +/** Thrown by m_filter + */ +class FilterException : public ModuleException +{ + public: + virtual const char* GetReason() + { + return "Could not find definition in your config file!"; + } +}; + class ModuleFilter : public Module { - Server *Srv; - ConfigReader *Conf, *MyConf; + + filter_t filters; public: - ModuleFilter(Server* Me) + ModuleFilter(InspIRCd* Me) : Module::Module(Me) { // read the configuration file on startup. @@ -43,23 +67,12 @@ class ModuleFilter : public Module // 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: read configuration from ")+filterfile); + + OnRehash(""); } virtual ~ModuleFilter() { - delete MyConf; - delete Conf; } void Implements(char* List) @@ -69,70 +82,21 @@ class ModuleFilter : public Module // format of a config entry is - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text) + virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) { - std::string text2 = text+" "; - for (int index = 0; index < MyConf->Enumerate("keyword"); index++) - { - std::string pattern = MyConf->ReadValue("keyword","pattern",index); - if ((Srv->MatchText(text2,pattern)) || (Srv->MatchText(text,pattern))) - { - 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 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 0; + return OnUserPreNotice(user,dest,target_type,text,status); } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) + virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status) { std::string text2 = text+" "; - for (int index = 0; index < MyConf->Enumerate("keyword"); index++) + for (filter_t::iterator index = filters.begin(); index != filters.end(); index++) { - std::string pattern = MyConf->ReadValue("keyword","pattern",index); - if ((Srv->MatchText(text2,pattern)) || (Srv->MatchText(text,pattern))) + if ((ServerInstance->MatchText(text2,index->first)) || (ServerInstance->MatchText(text,index->first))) { + Filter* f = (Filter*)index->second; 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; @@ -143,21 +107,17 @@ class ModuleFilter : public Module chanrec* t = (chanrec*)dest; target = std::string(t->name); } - if (do_action == "block") + + if (f->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); + ServerInstance->WriteOpers(std::string("FILTER: ")+user->nick+" had their notice filtered, target was "+target+": "+f->reason); + user->WriteServ("NOTICE "+std::string(user->nick)+" :Your notice has been filtered and opers notified: "+f->reason); } - Srv->Log(DEFAULT,std::string("FILTER: ")+std::string(user->nick)+ - std::string(" had their notice filtered, target was ")+ - target+": "+reason+" Action: "+do_action); + ServerInstance->Log(DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" had their notice filtered, target was ")+target+": "+f->reason+" Action: "+f->action); - if (do_action == "kill") + if (f->action == "kill") { - Srv->QuitUser(user,reason); + userrec::QuitUser(ServerInstance,user,f->reason); } return 1; } @@ -165,30 +125,46 @@ class ModuleFilter : public Module return 0; } - virtual void OnRehash(std::string parameter) + 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; + ConfigReader* Conf = new ConfigReader(ServerInstance); std::string filterfile = Conf->ReadValue("filter","file",0); // this automatically re-reads the configuration file into the class - MyConf = new ConfigReader(filterfile); + ConfigReader* MyConf = new ConfigReader(ServerInstance, filterfile); if ((filterfile == "") || (!MyConf->Verify())) { // 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; + FilterException e; + throw(e); + } + for (filter_t::iterator n = filters.begin(); n != filters.end(); n++) + { + DELETE(n->second); + } + filters.clear(); + 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 do_action = MyConf->ReadValue("keyword","action",index); + if (do_action == "") + do_action = "none"; + Filter* x = new Filter; + x->reason = reason; + x->action = do_action; + filters[pattern] = x; } - Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile); + ServerInstance->Log(DEFAULT,"m_filter: read configuration from "+filterfile); + DELETE(Conf); + DELETE(MyConf); } virtual Version GetVersion() { // This is version 2 because version 1.x is the unreleased unrealircd module - return Version(2,0,0,1,VF_VENDOR); + return Version(2,0,0,2,VF_VENDOR); } }; @@ -206,7 +182,7 @@ class ModuleFilterFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleFilter(Me); }