X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=1074b27bb913873056b1b0ad9a1d1309e123411c;hb=2e52ff280dca14d1598b84fab7a8c2e93fa30910;hp=1fd3bde927dfcb496a9429bf34bf9bfdb36003b0;hpb=ac39617c087139f2d89aeb9e36565139b4410672;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 1fd3bde92..1074b27bb 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -25,43 +25,23 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" +#include "m_filter.h" -/* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */ +/* $ModDesc: An advanced spam filtering module */ +/* $ModDep: m_filter.h */ -class Filter : public classbase -{ - public: - std::string reason; - std::string action; -}; - -typedef std::map filter_t; - -class FilterException : public ModuleException -{ - public: - virtual const char* GetReason() - { - return "Could not find definition in your config file!"; - } -}; +typedef std::map filter_t; -class ModuleFilter : public Module +class ModuleFilter : public FilterBase { - Server *Srv; - filter_t filters; + filter_t filters; + public: - ModuleFilter(Server* Me) - : Module::Module(Me) + ModuleFilter(InspIRCd* Me) + : FilterBase::FilterBase(Me, "m_filter.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; OnRehash(""); } @@ -69,103 +49,91 @@ class ModuleFilter : public Module { } - void Implements(char* List) - { - 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) { std::string text2 = text+" "; for (filter_t::iterator index = filters.begin(); index != filters.end(); index++) { - if ((Srv->MatchText(text2,index->first)) || (Srv->MatchText(text,index->first))) + if ((ServerInstance->MatchText(text2,index->first)) || (ServerInstance->MatchText(text,index->first))) { - Filter* f = (Filter*)index->second; - std::string target = ""; - - 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 (f->action == "block") - { - Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+ - std::string(" had their notice filtered, target was ")+ - target+": "+f->reason); - Srv->SendTo(NULL,user,"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+": "+f->reason+" Action: "+f->action); - - if (f->action == "kill") - { - Srv->QuitUser(user,f->reason); - } - return 1; + return index->second; } } - return 0; + return NULL; } - - virtual void OnRehash(const std::string ¶meter) + + virtual bool DeleteFilter(const std::string &freeform) { - // reload our config file on rehash - we must destroy and re-allocate the classes - // to call the constructor again and re-read our data. - ConfigReader* Conf = new ConfigReader; - std::string filterfile = Conf->ReadValue("filter","file",0); - // this automatically re-reads the configuration file into the class - ConfigReader* MyConf = new ConfigReader(filterfile); - if ((filterfile == "") || (!MyConf->Verify())) + if (filters.find(freeform) != filters.end()) { - // bail if the user forgot to create a config file - FilterException e; - throw(e); + delete (filters.find(freeform))->second; + filters.erase(filters.find(freeform)); + return true; } + return false; + } + + virtual std::pair AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration) + { + if (filters.find(freeform) != filters.end()) + { + return std::make_pair(false, "Filter already exists"); + } + + FilterResult* x = new FilterResult; + x->reason = reason; + x->action = type; + x->gline_time = duration; + x->freeform = freeform; + filters[freeform] = x; + + return std::make_pair(true, ""); + } + + virtual void SyncFilters(Module* proto, void* opaque) + { for (filter_t::iterator n = filters.begin(); n != filters.end(); n++) { - DELETE(n->second); + this->SendFilter(proto, opaque, n->second); } - filters.clear(); + } + + virtual void OnRehash(const std::string ¶meter) + { + ConfigReader* MyConf = new ConfigReader(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 do_action = MyConf->ReadValue("keyword","action",index); + long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index).c_str()); if (do_action == "") do_action = "none"; - Filter* x = new Filter; + FilterResult* x = new FilterResult; x->reason = reason; x->action = do_action; + x->gline_time = gline_time; + x->freeform = pattern; filters[pattern] = x; } - Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile); - DELETE(Conf); DELETE(MyConf); } - - virtual Version GetVersion() + + virtual int OnStats(char symbol, userrec* user, string_list &results) { - // This is version 2 because version 1.x is the unreleased unrealircd module - return Version(2,0,0,2,VF_VENDOR); + if (symbol == 's') + { + std::string sn = ServerInstance->Config->ServerName; + for (filter_t::iterator n = filters.begin(); n != filters.end(); n++) + { + results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason); + } + } + return 0; } - }; // stuff down here is the module-factory stuff. For basic modules you can ignore this. @@ -181,7 +149,7 @@ class ModuleFilterFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleFilter(Me); }