X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=4090f5600b4d1a9381cfd0b67c6a9106a1b7b8fd;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=234de9727e92ad55420d2c7865f18e28c25f46f6;hpb=0694d647be8e8b2ae07d7460e04392e56e0f34ee;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 234de9727..4090f5600 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -52,7 +52,6 @@ class FilterResult std::string reason; FilterAction action; long gline_time; - std::string flags; bool flag_no_opers; bool flag_part_message; @@ -61,20 +60,18 @@ class FilterResult bool flag_notice; bool flag_strip_color; - FilterResult(const std::string free, const std::string &rea, FilterAction act, long gt, const std::string &fla) : - freeform(free), reason(rea), action(act), gline_time(gt), flags(fla) + FilterResult(const std::string& free, const std::string& rea, FilterAction act, long gt, const std::string& fla) : + freeform(free), reason(rea), action(act), gline_time(gt) { this->FillFlags(fla); } - int FillFlags(const std::string &fl) + char FillFlags(const std::string &fl) { - flags = fl; flag_no_opers = flag_part_message = flag_quit_message = flag_privmsg = flag_notice = flag_strip_color = false; - size_t x = 0; - for (std::string::const_iterator n = flags.begin(); n != flags.end(); ++n, ++x) + for (std::string::const_iterator n = fl.begin(); n != fl.end(); ++n) { switch (*n) { @@ -101,13 +98,40 @@ class FilterResult flag_privmsg = flag_notice = flag_strip_color = true; break; default: - return x; + return *n; break; } } return 0; } + std::string GetFlags() + { + std::string flags; + if (flag_no_opers) + flags.push_back('o'); + if (flag_part_message) + flags.push_back('P'); + if (flag_quit_message) + flags.push_back('q'); + if (flag_privmsg) + flags.push_back('p'); + if (flag_notice) + flags.push_back('n'); + + /* Order is important here, 'c' must be the last char in the string as it is unsupported + * on < 2.0.10, and the logic in FillFlags() stops parsing when it ecounters an unknown + * character. + */ + if (flag_strip_color) + flags.push_back('c'); + + if (flags.empty()) + flags.push_back('-'); + + return flags; + } + FilterResult() { } @@ -141,19 +165,22 @@ class ImplFilter : public FilterResult class ModuleFilter : public Module { + bool initing; + RegexFactory* factory; + void FreeFilters(); + public: CommandFilter filtcommand; dynamic_reference RegexEngine; std::vector filters; - const char *error; - int erroffset; int flags; std::set exemptfromfilter; // List of channel names excluded from filtering. ModuleFilter(); void init(); + CullResult cull(); ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); FilterResult* FilterMatch(User* user, const std::string &text, int flags); bool DeleteFilter(const std::string &freeform); @@ -167,8 +194,9 @@ class ModuleFilter : public Module void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata); ModResult OnStats(char symbol, User* user, string_list &results); ModResult OnPreCommand(std::string &command, std::vector ¶meters, LocalUser *user, bool validated, const std::string &original_line); + void OnUnloadModule(Module* mod); bool AppliesToMe(User* user, FilterResult* filter, int flags); - void ReadFilters(ConfigReader &MyConf); + void ReadFilters(); static bool StringToFilterAction(const std::string& str, FilterAction& fa); static std::string FilterActionToString(FilterAction fa); }; @@ -196,10 +224,10 @@ CmdResult CommandFilter::Handle(const std::vector ¶meters, User /* Adding a filter */ if (parameters.size() >= 4) { - std::string freeform = parameters[0]; + const std::string& freeform = parameters[0]; FilterAction type; - std::string flags = parameters[2]; - std::string reason; + const std::string& flags = parameters[2]; + unsigned int reasonindex; long duration = 0; if (!ModuleFilter::StringToFilterAction(parameters[1], type)) @@ -213,7 +241,7 @@ CmdResult CommandFilter::Handle(const std::vector ¶meters, User if (parameters.size() >= 5) { duration = ServerInstance->Duration(parameters[3]); - reason = parameters[4]; + reasonindex = 4; } else { @@ -223,18 +251,18 @@ CmdResult CommandFilter::Handle(const std::vector ¶meters, User } else { - reason = parameters[3]; + reasonindex = 3; } Module *me = creator; - std::pair result = static_cast(me)->AddFilter(freeform, type, reason, duration, flags); + std::pair result = static_cast(me)->AddFilter(freeform, type, parameters[reasonindex], duration, flags); 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(), parameters[1].c_str(), (duration ? ", duration " : ""), (duration ? parameters[3].c_str() : ""), - flags.c_str(), reason.c_str()); + flags.c_str(), parameters[reasonindex].c_str()); - ServerInstance->SNO->WriteToSnoMask(IS_LOCAL(user) ? 'a' : 'A', "FILTER: "+user->nick+" added filter '"+freeform+"', type '"+parameters[1]+"', "+(duration ? "duration "+parameters[3]+", " : "")+"flags '"+flags+"', reason: "+reason); + ServerInstance->SNO->WriteToSnoMask(IS_LOCAL(user) ? 'a' : 'A', "FILTER: "+user->nick+" added filter '"+freeform+"', type '"+parameters[1]+"', "+(duration ? "duration "+parameters[3]+", " : "")+"flags '"+flags+"', reason: "+parameters[reasonindex]); return CMD_SUCCESS; } @@ -268,18 +296,33 @@ bool ModuleFilter::AppliesToMe(User* user, FilterResult* filter, int iflags) return true; } -ModuleFilter::ModuleFilter() : filtcommand(this), RegexEngine(this, "regex") +ModuleFilter::ModuleFilter() + : initing(true), filtcommand(this), RegexEngine(this, "regex") { } void ModuleFilter::init() { - ServerInstance->AddCommand(&filtcommand); - Implementation eventlist[] = { I_OnPreCommand, I_OnStats, I_OnSyncNetwork, I_OnDecodeMetaData, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 7); + ServerInstance->Modules->AddService(filtcommand); + Implementation eventlist[] = { I_OnPreCommand, I_OnStats, I_OnSyncNetwork, I_OnDecodeMetaData, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_OnUnloadModule }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); OnRehash(NULL); } +CullResult ModuleFilter::cull() +{ + FreeFilters(); + return Module::cull(); +} + +void ModuleFilter::FreeFilters() +{ + for (std::vector::const_iterator i = filters.begin(); i != filters.end(); ++i) + delete i->regex; + + filters.clear(); +} + ModResult ModuleFilter::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (!IS_LOCAL(user)) @@ -353,12 +396,10 @@ ModResult ModuleFilter::OnUserPreNotice(User* user,void* dest,int target_type, s ModResult ModuleFilter::OnPreCommand(std::string &command, std::vector ¶meters, LocalUser *user, bool validated, const std::string &original_line) { - flags = 0; if (validated && IS_LOCAL(user)) { - std::string checkline; - int replacepoint = 0; - bool parting = false; + flags = 0; + bool parting; if (command == "QUIT") { @@ -366,8 +407,6 @@ ModResult ModuleFilter::OnPreCommand(std::string &command, std::vectorFilterMatch(user, checkline, flags); - + FilterResult* f = this->FilterMatch(user, parameters[parting ? 1 : 0], flags); if (!f) /* PART or QUIT reason doesnt match a filter */ return MOD_RES_PASSTHRU; /* We cant block a part or quit, so instead we change the reason to 'Reason filtered' */ - Command* c = ServerInstance->Parser->GetHandler(command); - if (c) + parameters[parting ? 1 : 0] = "Reason filtered"; + + /* We're blocking, OR theyre quitting and its a KILL action + * (we cant kill someone whos already quitting, so filter them anyway) + */ + if ((f->action == FA_BLOCK) || (((!parting) && (f->action == FA_KILL))) || (f->action == FA_SILENT)) + { + return MOD_RES_PASSTHRU; + } + else { - std::vector params; - for (int item = 0; item < (int)parameters.size(); item++) - params.push_back(parameters[item]); - params[replacepoint] = "Reason filtered"; - - /* We're blocking, OR theyre quitting and its a KILL action - * (we cant kill someone whos already quitting, so filter them anyway) - */ - if ((f->action == FA_BLOCK) || (((!parting) && (f->action == FA_KILL))) || (f->action == FA_SILENT)) + /* Are they parting, if so, kill is applicable */ + if ((parting) && (f->action == FA_KILL)) { - c->Handle(params, user); - return MOD_RES_DENY; + user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick.c_str(), f->reason.c_str()); + ServerInstance->Users->QuitUser(user, "Filtered: " + f->reason); } - else + if (f->action == FA_GLINE) { - /* Are they parting, if so, kill is applicable */ - if ((parting) && (f->action == FA_KILL)) - { - user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick.c_str(), f->reason.c_str()); - ServerInstance->Users->QuitUser(user, "Filtered: " + f->reason); - } - if (f->action == FA_GLINE) + /* Note: We gline *@IP so that if their host doesnt resolve the gline still applies. */ + GLine* gl = new GLine(ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName.c_str(), f->reason.c_str(), "*", user->GetIPString()); + if (ServerInstance->XLines->AddLine(gl,NULL)) { - /* Note: We gline *@IP so that if their host doesnt resolve the gline still applies. */ - GLine* gl = new GLine(ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName.c_str(), f->reason.c_str(), "*", user->GetIPString()); - if (ServerInstance->XLines->AddLine(gl,NULL)) - { - ServerInstance->XLines->ApplyLines(); - } - else - delete gl; + ServerInstance->XLines->ApplyLines(); } - return MOD_RES_DENY; + else + delete gl; } + return MOD_RES_DENY; } - return MOD_RES_PASSTHRU; } return MOD_RES_PASSTHRU; } void ModuleFilter::OnRehash(User* user) { - ConfigReader MyConf; + ConfigTagList tags = ServerInstance->Config->ConfTags("exemptfromfilter"); exemptfromfilter.clear(); - for (int index = 0; index < MyConf.Enumerate("exemptfromfilter"); ++index) + for (ConfigIter i = tags.first; i != tags.second; ++i) { - std::string chan = MyConf.ReadValue("exemptfromfilter", "channel", index); + std::string chan = i->second->getString("channel"); if (!chan.empty()) exemptfromfilter.insert(chan); } - std::string newrxengine = "regex/" + MyConf.ReadValue("filteropts", "engine", 0); - if (newrxengine == "regex/") - newrxengine = "regex"; - if (RegexEngine.GetProvider() == newrxengine) - return; - //ServerInstance->SNO->WriteGlobalSno('a', "Dumping all filters due to regex engine change (was '%s', now '%s')", RegexEngine.GetProvider().c_str(), newrxengine.c_str()); - //ServerInstance->XLines->DelAll("R"); + std::string newrxengine = ServerInstance->Config->ConfValue("filteropts")->getString("engine"); + + factory = RegexEngine ? (RegexEngine.operator->()) : NULL; + + if (newrxengine.empty()) + RegexEngine.SetProvider("regex"); + else + RegexEngine.SetProvider("regex/" + newrxengine); - RegexEngine.SetProvider(newrxengine); if (!RegexEngine) { - ServerInstance->SNO->WriteGlobalSno('a', "WARNING: Regex engine '%s' is not loaded - Filter functionality disabled until this is corrected.", newrxengine.c_str()); + if (newrxengine.empty()) + ServerInstance->SNO->WriteGlobalSno('a', "WARNING: No regex engine loaded - Filter functionality disabled until this is corrected."); + else + ServerInstance->SNO->WriteGlobalSno('a', "WARNING: Regex engine '%s' is not loaded - Filter functionality disabled until this is corrected.", newrxengine.c_str()); + + initing = false; + FreeFilters(); + return; } - ReadFilters(MyConf); + + if ((!initing) && (RegexEngine.operator->() != factory)) + { + ServerInstance->SNO->WriteGlobalSno('a', "Dumping all filters due to regex engine change"); + FreeFilters(); + } + + initing = false; + ReadFilters(); } Version ModuleFilter::GetVersion() @@ -484,7 +523,7 @@ std::string ModuleFilter::EncodeFilter(FilterResult* filter) if (*n == ' ') *n = '\7'; - stream << x << " " << FilterActionToString(filter->action) << " " << (filter->flags.empty() ? "-" : filter->flags) << " " << filter->gline_time << " :" << filter->reason; + stream << x << " " << FilterActionToString(filter->action) << " " << filter->GetFlags() << " " << filter->gline_time << " :" << filter->reason; return stream.str(); } @@ -498,10 +537,12 @@ FilterResult ModuleFilter::DecodeFilter(const std::string &data) if (!StringToFilterAction(filteraction, res.action)) throw ModuleException("Invalid action: " + filteraction); - tokens.GetToken(res.flags); - if (res.flags == "-") - res.flags.clear(); - res.FillFlags(res.flags); + std::string filterflags; + tokens.GetToken(filterflags); + char c = res.FillFlags(filterflags); + if (c != 0) + throw ModuleException("Invalid flag: '" + std::string(1, c) + "'"); + tokens.GetToken(res.gline_time); tokens.GetToken(res.reason); @@ -528,7 +569,7 @@ void ModuleFilter::OnDecodeMetaData(Extensible* target, const std::string &extna try { FilterResult data = DecodeFilter(extdata); - this->AddFilter(data.freeform, data.action, data.reason, data.gline_time, data.flags); + this->AddFilter(data.freeform, data.action, data.reason, data.gline_time, data.GetFlags()); } catch (ModuleException& e) { @@ -568,14 +609,7 @@ FilterResult* ModuleFilter::FilterMatch(User* user, const std::string &text, int if (index->regex->Matches(filter->flag_strip_color ? stripped_text : text)) { //ServerInstance->Logs->Log("m_filter", DEBUG, "MATCH"); - ImplFilter fr = *index; - if (index != filters.begin()) - { - /* Move to head of list for efficiency */ - filters.erase(index); - filters.insert(filters.begin(), fr); - } - return &*filters.begin(); + return &*index; } //ServerInstance->Logs->Log("m_filter", DEBUG, "NO MATCH"); } @@ -650,17 +684,18 @@ std::string ModuleFilter::FilterActionToString(FilterAction fa) } } -void ModuleFilter::ReadFilters(ConfigReader &MyConf) +void ModuleFilter::ReadFilters() { - for (int index = 0; index < MyConf.Enumerate("keyword"); index++) + ConfigTagList tags = ServerInstance->Config->ConfTags("keyword"); + for (ConfigIter i = tags.first; i != tags.second; ++i) { - this->DeleteFilter(MyConf.ReadValue("keyword", "pattern", index)); + std::string pattern = i->second->getString("pattern"); + this->DeleteFilter(pattern); - std::string pattern = MyConf.ReadValue("keyword", "pattern", index); - std::string reason = MyConf.ReadValue("keyword", "reason", index); - std::string action = MyConf.ReadValue("keyword", "action", index); - std::string flgs = MyConf.ReadValue("keyword", "flags", index); - long gline_time = ServerInstance->Duration(MyConf.ReadValue("keyword", "duration", index)); + std::string reason = i->second->getString("reason"); + std::string action = i->second->getString("action"); + std::string flgs = i->second->getString("flags"); + long gline_time = ServerInstance->Duration(i->second->getString("duration")); if (flgs.empty()) flgs = "*"; @@ -686,7 +721,7 @@ ModResult ModuleFilter::OnStats(char symbol, User* user, string_list &results) { for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) { - results.push_back(ServerInstance->Config->ServerName+" 223 "+user->nick+" :"+RegexEngine.GetProvider()+":"+i->freeform+" "+i->flags+" "+FilterActionToString(i->action)+" "+ConvToStr(i->gline_time)+" :"+i->reason); + results.push_back(ServerInstance->Config->ServerName+" 223 "+user->nick+" :"+RegexEngine.GetProvider()+":"+i->freeform+" "+i->GetFlags()+" "+FilterActionToString(i->action)+" "+ConvToStr(i->gline_time)+" :"+i->reason); } for (std::set::iterator i = exemptfromfilter.begin(); i != exemptfromfilter.end(); ++i) { @@ -696,4 +731,18 @@ ModResult ModuleFilter::OnStats(char symbol, User* user, string_list &results) return MOD_RES_PASSTHRU; } +void ModuleFilter::OnUnloadModule(Module* mod) +{ + // If the regex engine became unavailable or has changed, remove all filters + if (!RegexEngine) + { + FreeFilters(); + } + else if (RegexEngine.operator->() != factory) + { + factory = RegexEngine.operator->(); + FreeFilters(); + } +} + MODULE_INIT(ModuleFilter)