diff options
author | attilamolnar <attilamolnar@hush.com> | 2013-04-21 18:03:07 +0200 |
---|---|---|
committer | attilamolnar <attilamolnar@hush.com> | 2013-04-21 18:03:07 +0200 |
commit | 216877cc5b595b5b6bbc5f953e226618201cc0f6 (patch) | |
tree | 5341c63ad1e1baf702ae23cca2dcfb4e2488cd01 /src/modules/m_filter.cpp | |
parent | 822f3f13f18b7e79d5740416f9417dabb9296859 (diff) |
m_filter, m_rline Remove rlines and filters when the regex engine changes or becomes unavailable
Diffstat (limited to 'src/modules/m_filter.cpp')
-rw-r--r-- | src/modules/m_filter.cpp | 57 |
1 files changed, 44 insertions, 13 deletions
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 25941e5d8..5e1b4d38d 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -165,6 +165,8 @@ class ImplFilter : public FilterResult class ModuleFilter : public Module { + bool initing; + RegexFactory* factory; void FreeFilters(); public: @@ -172,8 +174,6 @@ class ModuleFilter : public Module dynamic_reference<RegexFactory> RegexEngine; std::vector<ImplFilter> filters; - const char *error; - int erroffset; int flags; std::set<std::string> exemptfromfilter; // List of channel names excluded from filtering. @@ -194,6 +194,7 @@ 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<std::string> ¶meters, LocalUser *user, bool validated, const std::string &original_line); + void OnUnloadModule(Module* mod); bool AppliesToMe(User* user, FilterResult* filter, int flags); void ReadFilters(); static bool StringToFilterAction(const std::string& str, FilterAction& fa); @@ -295,14 +296,15 @@ 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->Modules->AddService(filtcommand); - Implementation eventlist[] = { I_OnPreCommand, I_OnStats, I_OnSyncNetwork, I_OnDecodeMetaData, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash }; + 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); } @@ -474,20 +476,35 @@ void ModuleFilter::OnRehash(User* user) if (!chan.empty()) exemptfromfilter.insert(chan); } - std::string newrxengine = "regex/" + ServerInstance->Config->ConfValue("filteropts")->getString("engine"); - 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; + } + + if ((!initing) && (RegexEngine.operator->() != factory)) + { + ServerInstance->SNO->WriteGlobalSno('a', "Dumping all filters due to regex engine change"); + FreeFilters(); } + + initing = false; ReadFilters(); } @@ -714,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) |