X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=36073db3b8036c3ebb71951bf567a1838edaaafa;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=38cd32ecd32f32949f43d348e871689dacfbe97e;hpb=3ea5a27cd34d16c69dc9e2a480a3791de4db0124;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 38cd32ecd..36073db3b 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -2,148 +2,133 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -// Message and notice filtering using glob patterns -// a module based on the original work done by Craig Edwards in 2003 -// for the chatspike network. - -#include -#include +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" - -/* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */ - +#include "m_filter.h" +/* $ModDesc: An advanced spam filtering module */ +/* $ModDep: m_filter.h */ -/** Holds a filter pattern and reason - */ -class Filter : public classbase -{ - public: - std::string reason; - std::string action; -}; +typedef std::map filter_t; -typedef std::map filter_t; - -class ModuleFilter : public Module +class ModuleFilter : public FilterBase { filter_t filters; - + public: ModuleFilter(InspIRCd* Me) - : Module::Module(Me) + : 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. - - OnRehash(""); + OnRehash(NULL,""); } virtual ~ModuleFilter() { } - void Implements(char* List) + virtual FilterResult* FilterMatch(const std::string &text) { - 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) - { - std::string text2 = text+" "; for (filter_t::iterator index = filters.begin(); index != filters.end(); index++) { - if ((ServerInstance->MatchText(text2,index->first)) || (ServerInstance->MatchText(text,index->first))) + if (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) + FilterResult* fr = index->second; + if (index != filters.begin()) { - chanrec* t = (chanrec*)dest; - target = std::string(t->name); + std::string pat = index->first; + filters.erase(index); + filters.insert(filters.begin(), std::make_pair(pat,fr)); } + return fr; + } + } + return NULL; + } - if (f->action == "block") - { - 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); - } - ServerInstance->Log(DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" had their notice filtered, target was ")+target+": "+f->reason+" Action: "+f->action); + virtual bool DeleteFilter(const std::string &freeform) + { + if (filters.find(freeform) != filters.end()) + { + delete (filters.find(freeform))->second; + filters.erase(filters.find(freeform)); + return true; + } + return false; + } - if (f->action == "kill") - { - userrec::QuitUser(ServerInstance,user,f->reason); - } - return 1; - } + 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"); } - return 0; + + 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 OnRehash(const std::string ¶meter) + + virtual void SyncFilters(Module* proto, void* opaque) { - // this automatically re-reads the configuration file into the class - ConfigReader* MyConf = new ConfigReader(ServerInstance); 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(userrec* user, 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; } 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,1,0,2,VF_VENDOR,API_VERSION); + 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. @@ -167,7 +152,7 @@ class ModuleFilterFactory : public ModuleFactory }; -extern "C" void * init_module( void ) +extern "C" DllExport void * init_module( void ) { return new ModuleFilterFactory; }