X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=bb99ffa601db730f9c806548a914349add679b28;hb=fcafba14c5408360ec725ed1649ede75b7ae52c1;hp=80f09a2def8724d2f13825afeb98a598c54c0c04;hpb=7ef7a13f3fc0a75f9ca4d55903024d63a4821634;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 80f09a2de..bb99ffa60 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,9 +12,6 @@ */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" #include "xline.h" #include "m_regex.h" @@ -126,16 +123,17 @@ protected: virtual int OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line); bool AppliesToMe(User* user, FilterResult* filter, int flags); void OnLoadModule(Module* mod, const std::string& name); + virtual void ReadFilters(ConfigReader &MyConf) = 0; }; class CommandFilter : public Command { FilterBase* Base; public: - CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource) : Command(Me, "FILTER", "o", 1), Base(f) + CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource) : Command(Me, "FILTER", "o", 1, 5), Base(f) { this->source = ssource; - this->syntax = " [] :"; + this->syntax = " [] :"; } CmdResult Handle(const std::vector ¶meters, User *user) @@ -145,12 +143,13 @@ class CommandFilter : public Command /* Deleting a filter */ if (Base->DeleteFilter(parameters[0])) { - user->WriteServ("NOTICE %s :*** Deleted filter '%s'", user->nick.c_str(), parameters[0].c_str()); + user->WriteServ("NOTICE %s :*** Removed filter '%s'", user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('A', std::string("FILTER: ")+user->nick+" removed filter '"+parameters[0]+"'"); return CMD_SUCCESS; } else { - user->WriteServ("NOTICE %s :*** Filter '%s' not found on list.", user->nick.c_str(), parameters[0].c_str()); + user->WriteServ("NOTICE %s :*** Filter '%s' not found in list, try /stats s.", user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } } @@ -168,7 +167,7 @@ class CommandFilter : public Command if ((type != "gline") && (type != "none") && (type != "block") && (type != "kill") && (type != "silent")) { - user->WriteServ("NOTICE %s :*** Invalid filter type '%s'. Supported types are 'gline', 'none', 'block', 'silent' and 'kill'.", user->nick.c_str(), freeform.c_str()); + user->WriteServ("NOTICE %s :*** Invalid filter type '%s'. Supported types are 'gline', 'none', 'block', 'silent' and 'kill'.", user->nick.c_str(), type.c_str()); return CMD_FAILURE; } @@ -181,7 +180,7 @@ class CommandFilter : public Command } else { - this->TooFewParams(user, " When setting a gline type filter, a gline duration must be specified as the third parameter."); + this->TooFewParams(user, ": When setting a gline type filter, a gline duration must be specified as the third parameter."); return CMD_FAILURE; } } @@ -193,8 +192,11 @@ class CommandFilter : public Command if (result.first) { user->WriteServ("NOTICE %s :*** Added filter '%s', type '%s'%s%s, flags '%s', reason: '%s'", user->nick.c_str(), freeform.c_str(), - type.c_str(), (duration ? " duration: " : ""), (duration ? parameters[3].c_str() : ""), + type.c_str(), (duration ? ", duration " : ""), (duration ? parameters[3].c_str() : ""), flags.c_str(), reason.c_str()); + + ServerInstance->SNO->WriteToSnoMask('A', std::string("FILTER: ")+user->nick+" added filter '"+freeform+"', type '"+type+"', "+(duration ? "duration "+parameters[3]+", " : "")+"flags '"+flags+"', reason: "+reason); + return CMD_SUCCESS; } else @@ -279,13 +281,19 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri if (i != exemptfromfilter.end()) return 0; } if (f->action == "block") - { + { ServerInstance->SNO->WriteToSnoMask('A', std::string("FILTER: ")+user->nick+" had their message filtered, target was "+target+": "+f->reason); - user->WriteServ("NOTICE "+std::string(user->nick)+" :Your message has been filtered and opers notified: "+f->reason); + if (target_type == TYPE_CHANNEL) + user->WriteNumeric(404, "%s %s :Message to channel blocked and opers notified (%s)",user->nick.c_str(), target.c_str(), f->reason.c_str()); + else + user->WriteServ("NOTICE "+std::string(user->nick)+" :Your message to "+target+" was blocked and opers notified: "+f->reason); } if (f->action == "silent") { - user->WriteServ("NOTICE "+std::string(user->nick)+" :Your message has been filtered: "+f->reason); + if (target_type == TYPE_CHANNEL) + user->WriteNumeric(404, "%s %s :Message to channel blocked (%s)",user->nick.c_str(), target.c_str(), f->reason.c_str()); + else + user->WriteServ("NOTICE "+std::string(user->nick)+" :Your message to "+target+" was blocked: "+f->reason); } if (f->action == "kill") { @@ -316,7 +324,7 @@ int FilterBase::OnPreCommand(std::string &command, std::vector &par std::string checkline; int replacepoint = 0; bool parting = false; - + if (command == "QUIT") { /* QUIT with no reason: nothing to do */ @@ -346,7 +354,7 @@ int FilterBase::OnPreCommand(std::string &command, std::vector &par return 0; FilterResult* f = NULL; - + if (flags) f = this->FilterMatch(user, checkline, flags); @@ -420,7 +428,6 @@ void FilterBase::OnRehash(User* user, const std::string ¶meter) } rxengine = NULL; - printf("In Rehash\n"); RegexEngine = newrxengine; modulelist* ml = ServerInstance->Modules->FindInterface("RegularExpression"); if (ml) @@ -453,7 +460,9 @@ void FilterBase::OnLoadModule(Module* mod, const std::string& name) /* Force a rehash to make sure that any filters that couldnt be applied from the conf * on startup or on load are applied right now. */ - OnRehash(NULL, ""); + ConfigReader Config(ServerInstance); + ServerInstance->SNO->WriteToSnoMask('A', "Found and activated regex module '%s' for m_filter.so.", RegexEngine.c_str()); + ReadFilters(Config); } } } @@ -561,12 +570,13 @@ class ModuleFilter : public FilterBase for (std::vector::iterator index = filters.begin(); index != filters.end(); index++) { /* Skip ones that dont apply to us */ - if (!FilterBase::AppliesToMe(user, dynamic_cast(&(*index)), flgs)) continue; + //ServerInstance->Logs->Log("m_filter", DEBUG, "Match '%s' against '%s'", text.c_str(), index->freeform.c_str()); if (index->regex->Matches(text)) { + //ServerInstance->Logs->Log("m_filter", DEBUG, "MATCH"); fr = *index; if (index != filters.begin()) { @@ -576,6 +586,7 @@ class ModuleFilter : public FilterBase } return &fr; } + //ServerInstance->Logs->Log("m_filter", DEBUG, "NO MATCH"); } return NULL; } @@ -586,6 +597,7 @@ class ModuleFilter : public FilterBase { if (i->freeform == freeform) { + delete i->regex; filters.erase(i); return true; } @@ -626,9 +638,12 @@ class ModuleFilter : public FilterBase virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader MyConf(ServerInstance); - FilterBase::OnRehash(user, parameter); + ReadFilters(MyConf); + } + void ReadFilters(ConfigReader &MyConf) + { for (int index = 0; index < MyConf.Enumerate("keyword"); index++) { this->DeleteFilter(MyConf.ReadValue("keyword", "pattern", index)); @@ -646,11 +661,11 @@ class ModuleFilter : public FilterBase try { filters.push_back(ImplFilter(this, reason, action, gline_time, pattern, flgs)); - ServerInstance->Logs->Log("m_filter",DEFAULT,"Regular expression %s loaded.", pattern.c_str()); + ServerInstance->Logs->Log("m_filter", DEFAULT, "Regular expression %s loaded.", pattern.c_str()); } catch (ModuleException &e) { - ServerInstance->Logs->Log("m_filter",DEFAULT,"Error in regular expression '%s': %s", pattern.c_str(), e.GetReason()); + ServerInstance->Logs->Log("m_filter", DEFAULT, "Error in regular expression '%s': %s", pattern.c_str(), e.GetReason()); } } } @@ -662,7 +677,7 @@ class ModuleFilter : public FilterBase std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) { - results.push_back(sn+" 223 "+user->nick+" :REGEXP:"+i->freeform+" "+i->flags+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason); + results.push_back(sn+" 223 "+user->nick+" :"+RegexEngine+":"+i->freeform+" "+i->flags+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason); } for (std::vector::iterator i = exemptfromfilter.begin(); i != exemptfromfilter.end(); ++i) { @@ -674,4 +689,3 @@ class ModuleFilter : public FilterBase }; MODULE_INIT(ModuleFilter) -