summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/extra/m_filter_pcre.cpp188
-rw-r--r--src/modules/m_filter.cpp641
2 files changed, 591 insertions, 238 deletions
diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
deleted file mode 100644
index 4710d7a33..000000000
--- a/src/modules/extra/m_filter_pcre.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
- *
- * InspIRCd: (C) 2002-2008 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.
- *
- * ---------------------------------------------------
- */
-
-#include "inspircd.h"
-#include <pcre.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "m_filter.h"
-
-/* $ModDesc: m_filter with regexps */
-/* $CompileFlags: exec("pcre-config --cflags") */
-/* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */
-/* $ModDep: m_filter.h */
-
-#ifdef WINDOWS
-#pragma comment(lib, "pcre.lib")
-#endif
-
-class PCREFilter : public FilterResult
-{
- public:
- pcre* regexp;
-
- PCREFilter(pcre* r, const std::string &rea, const std::string &act, long glinetime, const std::string &pat, const std::string &flgs)
- : FilterResult(pat, rea, act, glinetime, flgs), regexp(r)
- {
- }
-
- PCREFilter()
- {
- }
-};
-
-class ModuleFilterPCRE : public FilterBase
-{
- std::vector<PCREFilter> filters;
- pcre *re;
- const char *error;
- int erroffset;
- PCREFilter fr;
-
- public:
- ModuleFilterPCRE(InspIRCd* Me)
- : FilterBase(Me, "m_filter_pcre.so")
- {
- OnRehash(NULL,"");
-
- }
-
- virtual ~ModuleFilterPCRE()
- {
- }
-
- virtual FilterResult* FilterMatch(User* user, const std::string &text, int flgs)
- {
- for (std::vector<PCREFilter>::iterator index = filters.begin(); index != filters.end(); index++)
- {
- /* Skip ones that dont apply to us */
-
- if (!FilterBase::AppliesToMe(user, dynamic_cast<FilterResult*>(&(*index)), flgs))
- continue;
-
- if (pcre_exec(index->regexp, NULL, text.c_str(), text.length(), 0, 0, NULL, 0) > -1)
- {
- fr = *index;
- if (index != filters.begin())
- {
- filters.erase(index);
- filters.insert(filters.begin(), fr);
- }
- return &fr;
- }
- }
- return NULL;
- }
-
- virtual bool DeleteFilter(const std::string &freeform)
- {
- for (std::vector<PCREFilter>::iterator i = filters.begin(); i != filters.end(); i++)
- {
- if (i->freeform == freeform)
- {
- pcre_free((*i).regexp);
- filters.erase(i);
- return true;
- }
- }
- return false;
- }
-
- virtual void SyncFilters(Module* proto, void* opaque)
- {
- for (std::vector<PCREFilter>::iterator i = filters.begin(); i != filters.end(); i++)
- {
- this->SendFilter(proto, opaque, &(*i));
- }
- }
-
- virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flgs)
- {
- for (std::vector<PCREFilter>::iterator i = filters.begin(); i != filters.end(); i++)
- {
- if (i->freeform == freeform)
- {
- return std::make_pair(false, "Filter already exists");
- }
- }
-
- re = pcre_compile(freeform.c_str(),0,&error,&erroffset,NULL);
-
- if (!re)
- {
- ServerInstance->Logs->Log("m_filter_pcre", DEFAULT,"Error in regular expression: %s at offset %d: %s\n", freeform.c_str(), erroffset, error);
- ServerInstance->Logs->Log("m_filter_pcre", DEFAULT,"Regular expression %s not loaded.", freeform.c_str());
- return std::make_pair(false, "Error in regular expression at offset " + ConvToStr(erroffset) + ": "+error);
- }
- else
- {
- filters.push_back(PCREFilter(re, reason, type, duration, freeform, flgs));
- return std::make_pair(true, "");
- }
- }
-
- virtual void OnRehash(User* user, const std::string &parameter)
- {
- ConfigReader MyConf(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 action = MyConf.ReadValue("keyword", "action", index);
- std::string flgs = MyConf.ReadValue("keyword", "flags", index);
- long gline_time = ServerInstance->Duration(MyConf.ReadValue("keyword", "duration", index));
- if (action.empty())
- action = "none";
- if (flgs.empty())
- flgs = "*";
-
- re = pcre_compile(pattern.c_str(),0,&error,&erroffset,NULL);
-
- if (!re)
- {
- ServerInstance->Logs->Log("CONFIG",DEFAULT,"Error in regular expression: %s at offset %d: %s\n", pattern.c_str(), erroffset, error);
- ServerInstance->Logs->Log("CONFIG",DEFAULT,"Regular expression %s not loaded.", pattern.c_str());
- }
- else
- {
- filters.push_back(PCREFilter(re, reason, action, gline_time, pattern, flgs));
- ServerInstance->Logs->Log("CONFIG",DEFAULT,"Regular expression %s loaded.", pattern.c_str());
- }
- }
- FilterBase::OnRehash(user, parameter);
- }
-
- virtual int OnStats(char symbol, User* user, string_list &results)
- {
- if (symbol == 's')
- {
- std::string sn = ServerInstance->Config->ServerName;
- for (std::vector<PCREFilter>::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);
- }
- for (std::vector<std::string>::iterator i = exemptfromfilter.begin(); i != exemptfromfilter.end(); ++i)
- {
- results.push_back(sn+" 223 "+user->nick+" :EXEMPT "+(*i));
- }
- }
- return 0;
- }
-};
-
-MODULE_INIT(ModuleFilterPCRE)
-
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 480d9975a..ab7005c6b 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -6,23 +6,541 @@
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#include "inspircd.h"
-#include "m_filter.h"
+#include "users.h"
+#include "channels.h"
+#include "modules.h"
+#include "xline.h"
+#include "m_regex.h"
-/* $ModDesc: An advanced spam filtering module */
-/* $ModDep: m_filter.h */
+/* $ModDesc: Text (spam) filtering */
-typedef std::map<std::string,FilterResult*> filter_t;
+static std::string RegexEngine = "";
+static Module* rxengine = NULL;
-class ModuleFilter : public FilterBase
+enum FilterFlags
+{
+ FLAG_PART = 2,
+ FLAG_QUIT = 4,
+ FLAG_PRIVMSG = 8,
+ FLAG_NOTICE = 16
+};
+
+class FilterResult : public classbase
{
+ public:
+ std::string freeform;
+ std::string reason;
+ std::string action;
+ long gline_time;
+ std::string flags;
+
+ bool flag_no_opers;
+ bool flag_part_message;
+ bool flag_quit_message;
+ bool flag_privmsg;
+ bool flag_notice;
+
+ FilterResult(const std::string free, const std::string &rea, const std::string &act, long gt, const std::string &fla) :
+ freeform(free), reason(rea), action(act), gline_time(gt), flags(fla)
+ {
+ this->FillFlags(fla);
+ }
+
+ int FillFlags(const std::string &fl)
+ {
+ flags = fl;
+ flag_no_opers = flag_part_message = flag_quit_message = flag_privmsg = flag_notice = false;
+ size_t x = 0;
- filter_t filters;
+ for (std::string::const_iterator n = flags.begin(); n != flags.end(); ++n, ++x)
+ {
+ switch (*n)
+ {
+ case 'o':
+ flag_no_opers = true;
+ break;
+ case 'P':
+ flag_part_message = true;
+ break;
+ case 'q':
+ flag_quit_message = true;
+ break;
+ case 'p':
+ flag_privmsg = true;
+ break;
+ case 'n':
+ flag_notice = true;
+ break;
+ case '*':
+ flag_no_opers = flag_part_message = flag_quit_message =
+ flag_privmsg = flag_notice = true;
+ break;
+ default:
+ return x;
+ break;
+ }
+ }
+ return 0;
+ }
+
+ FilterResult()
+ {
+ }
+
+ virtual ~FilterResult()
+ {
+ }
+};
+
+class CommandFilter;
+
+class FilterBase : public Module
+{
+ CommandFilter* filtcommand;
+ int flags;
+protected:
+ std::vector<std::string> exemptfromfilter; // List of channel names excluded from filtering.
+ public:
+ FilterBase(InspIRCd* Me, const std::string &source);
+ virtual ~FilterBase();
+ virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
+ virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags) = 0;
+ virtual bool DeleteFilter(const std::string &freeform) = 0;
+ virtual void SyncFilters(Module* proto, void* opaque) = 0;
+ virtual void SendFilter(Module* proto, void* opaque, FilterResult* iter);
+ virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flags) = 0;
+ virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
+ virtual void OnRehash(User* user, const std::string &parameter);
+ virtual Version GetVersion();
+ std::string EncodeFilter(FilterResult* filter);
+ FilterResult DecodeFilter(const std::string &data);
+ virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable = false);
+ virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata);
+ virtual int OnStats(char symbol, User* user, string_list &results) = 0;
+ virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, 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);
+};
+
+class CommandFilter : public Command
+{
+ FilterBase* Base;
+ public:
+ CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource) : Command(Me, "FILTER", "o", 1), Base(f)
+ {
+ this->source = ssource;
+ this->syntax = "<filter-definition> <type> <flags> [<gline-duration>] :<reason>";
+ }
+
+ CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+ {
+ if (parameters.size() == 1)
+ {
+ /* Deleting a filter */
+ if (Base->DeleteFilter(parameters[0]))
+ {
+ user->WriteServ("NOTICE %s :*** Deleted filter '%s'", user->nick.c_str(), parameters[0].c_str());
+ return CMD_SUCCESS;
+ }
+ else
+ {
+ user->WriteServ("NOTICE %s :*** Filter '%s' not found on list.", user->nick.c_str(), parameters[0].c_str());
+ return CMD_FAILURE;
+ }
+ }
+ else
+ {
+ /* Adding a filter */
+ if (parameters.size() >= 4)
+ {
+ std::string freeform = parameters[0];
+ std::string type = parameters[1];
+ std::string flags = parameters[2];
+ std::string reason;
+ long duration = 0;
+
+
+ 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());
+ return CMD_FAILURE;
+ }
+
+ if (type == "gline")
+ {
+ if (parameters.size() >= 5)
+ {
+ duration = ServerInstance->Duration(parameters[3]);
+ reason = parameters[4];
+ }
+ else
+ {
+ this->TooFewParams(user, " When setting a gline type filter, a gline duration must be specified as the third parameter.");
+ return CMD_FAILURE;
+ }
+ }
+ else
+ {
+ reason = parameters[3];
+ }
+ std::pair<bool, std::string> result = Base->AddFilter(freeform, type, reason, 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(),
+ type.c_str(), (duration ? " duration: " : ""), (duration ? parameters[3].c_str() : ""),
+ flags.c_str(), reason.c_str());
+ return CMD_SUCCESS;
+ }
+ else
+ {
+ user->WriteServ("NOTICE %s :*** Filter '%s' could not be added: %s", user->nick.c_str(), freeform.c_str(), result.second.c_str());
+ return CMD_FAILURE;
+ }
+ }
+ else
+ {
+ this->TooFewParams(user, ".");
+ return CMD_FAILURE;
+ }
+
+ }
+ }
+
+ void TooFewParams(User* user, const std::string &extra_text)
+ {
+ user->WriteServ("NOTICE %s :*** Not enough parameters%s", user->nick.c_str(), extra_text.c_str());
+ }
+};
+
+bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int iflags)
+{
+ if ((filter->flag_no_opers) && IS_OPER(user))
+ return false;
+ if ((iflags & FLAG_PRIVMSG) && (!filter->flag_privmsg))
+ return false;
+ if ((iflags & FLAG_NOTICE) && (!filter->flag_notice))
+ return false;
+ if ((iflags & FLAG_QUIT) && (!filter->flag_quit_message))
+ return false;
+ if ((iflags & FLAG_PART) && (!filter->flag_part_message))
+ return false;
+ return true;
+}
+
+FilterBase::FilterBase(InspIRCd* Me, const std::string &source) : Module(Me)
+{
+ Me->Modules->UseInterface("RegularExpression");
+ filtcommand = new CommandFilter(this, Me, source);
+ ServerInstance->AddCommand(filtcommand);
+ Implementation eventlist[] = { I_OnPreCommand, I_OnStats, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_OnLoadModule };
+ ServerInstance->Modules->Attach(eventlist, this, 8);
+}
+
+FilterBase::~FilterBase()
+{
+ ServerInstance->Modules->DoneWithInterface("RegularExpression");
+}
+
+int FilterBase::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+{
+ flags = FLAG_PRIVMSG;
+ return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
+}
+
+int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+{
+ if (!flags)
+ flags = FLAG_NOTICE;
+
+ /* Leave ulines alone */
+ if ((ServerInstance->ULine(user->server)) || (!IS_LOCAL(user)))
+ return 0;
+
+ FilterResult* f = this->FilterMatch(user, text, flags);
+ if (f)
+ {
+ std::string target = "";
+ if (target_type == TYPE_USER)
+ {
+ User* t = (User*)dest;
+ target = std::string(t->nick);
+ }
+ else if (target_type == TYPE_CHANNEL)
+ {
+ Channel* t = (Channel*)dest;
+ target = std::string(t->name);
+ std::vector<std::string>::iterator i = find(exemptfromfilter.begin(), exemptfromfilter.end(), target);
+ 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 (f->action == "silent")
+ {
+ user->WriteServ("NOTICE "+std::string(user->nick)+" :Your message has been filtered: "+f->reason);
+ }
+ if (f->action == "kill")
+ {
+ ServerInstance->Users->QuitUser(user, "Filtered: " + f->reason);
+ }
+ if (f->action == "gline")
+ {
+ GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), "*", user->GetIPString());
+ if (ServerInstance->XLines->AddLine(gl,NULL))
+ {
+ ServerInstance->XLines->ApplyLines();
+ }
+ else
+ delete gl;
+ }
+
+ ServerInstance->Logs->Log("FILTER",DEFAULT,"FILTER: "+ user->nick + " had their message filtered, target was " + target + ": " + f->reason + " Action: " + f->action);
+ return 1;
+ }
+ return 0;
+}
+
+int FilterBase::OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+{
+ flags = 0;
+ if (validated && IS_LOCAL(user))
+ {
+ std::string checkline;
+ int replacepoint = 0;
+ bool parting = false;
+
+ if (command == "QUIT")
+ {
+ /* QUIT with no reason: nothing to do */
+ if (parameters.size() < 1)
+ return 0;
+
+ checkline = parameters[0];
+ replacepoint = 0;
+ parting = false;
+ flags = FLAG_QUIT;
+ }
+ else if (command == "PART")
+ {
+ /* PART with no reason: nothing to do */
+ if (parameters.size() < 2)
+ return 0;
+
+ std::vector<std::string>::iterator i = find(exemptfromfilter.begin(), exemptfromfilter.end(), parameters[0]);
+ if (i != exemptfromfilter.end()) return 0;
+ checkline = parameters[1];
+ replacepoint = 1;
+ parting = true;
+ flags = FLAG_PART;
+ }
+ else
+ /* We're only messing with PART and QUIT */
+ return 0;
+
+ FilterResult* f = NULL;
+
+ if (flags)
+ f = this->FilterMatch(user, checkline, flags);
+
+ if (!f)
+ /* PART or QUIT reason doesnt match a filter */
+ return 0;
+
+ /* We cant block a part or quit, so instead we change the reason to 'Reason filtered' */
+ Command* c = ServerInstance->Parser->GetHandler(command);
+ if (c)
+ {
+ std::vector<std::string> 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 == "block") || (((!parting) && (f->action == "kill"))) || (f->action == "silent"))
+ {
+ c->Handle(params, user);
+ return 1;
+ }
+ else
+ {
+ /* Are they parting, if so, kill is applicable */
+ if ((parting) && (f->action == "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 == "gline")
+ {
+ /* Note: We gline *@IP so that if their host doesnt resolve the gline still applies. */
+ GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), "*", user->GetIPString());
+ if (ServerInstance->XLines->AddLine(gl,NULL))
+ {
+ ServerInstance->XLines->ApplyLines();
+ }
+ else
+ delete gl;
+ }
+ return 1;
+ }
+ }
+ return 0;
+ }
+ return 0;
+}
+
+void FilterBase::OnRehash(User* user, const std::string &parameter)
+{
+ ConfigReader* MyConf = new ConfigReader(ServerInstance);
+ std::vector<std::string>().swap(exemptfromfilter);
+ for (int index = 0; index < MyConf->Enumerate("exemptfromfilter"); ++index)
+ {
+ std::string chan = MyConf->ReadValue("exemptfromfilter", "channel", index);
+ if (!chan.empty()) {
+ exemptfromfilter.push_back(chan);
+ }
+ }
+ std::string newrxengine = MyConf->ReadValue("filteropts", "engine", 0);
+ if (!RegexEngine.empty())
+ {
+ if (RegexEngine == newrxengine)
+ return;
+
+ ServerInstance->SNO->WriteToSnoMask('A', "Dumping all filters due to regex engine change (was '%s', now '%s')", RegexEngine.c_str(), newrxengine.c_str());
+ //ServerInstance->XLines->DelAll("R");
+ }
+ rxengine = NULL;
+
+ RegexEngine = newrxengine;
+ modulelist* ml = ServerInstance->Modules->FindInterface("RegularExpression");
+ if (ml)
+ {
+ for (modulelist::iterator i = ml->begin(); i != ml->end(); ++i)
+ {
+ if (RegexNameRequest(this, *i).Send() == newrxengine)
+ {
+ ServerInstance->SNO->WriteToSnoMask('A', "Filter now using engine '%s'", RegexEngine.c_str());
+ rxengine = *i;
+ }
+ }
+ }
+ if (!rxengine)
+ {
+ ServerInstance->SNO->WriteToSnoMask('A', "WARNING: Regex engine '%s' is not loaded - Filter functionality disabled until this is corrected.", RegexEngine.c_str());
+ }
+
+ delete MyConf;
+}
+
+void FilterBase::OnLoadModule(Module* mod, const std::string& name)
+{
+ if (ServerInstance->Modules->ModuleHasInterface(mod, "RegularExpression"))
+ {
+ std::string rxname = RegexNameRequest(this, mod).Send();
+ if (rxname == RegexEngine)
+ {
+ ServerInstance->SNO->WriteToSnoMask('A', "Filter now using engine '%s'", RegexEngine.c_str());
+ rxengine = mod;
+ }
+ }
+}
+
+
+Version FilterBase::GetVersion()
+{
+ return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+}
+
+
+std::string FilterBase::EncodeFilter(FilterResult* filter)
+{
+ std::ostringstream stream;
+ std::string x = filter->freeform;
+
+ /* Hax to allow spaces in the freeform without changing the design of the irc protocol */
+ for (std::string::iterator n = x.begin(); n != x.end(); n++)
+ if (*n == ' ')
+ *n = '\7';
+
+ stream << x << " " << filter->action << " " << (filter->flags.empty() ? "-" : filter->flags) << " " << filter->gline_time << " :" << filter->reason;
+ return stream.str();
+}
+
+FilterResult FilterBase::DecodeFilter(const std::string &data)
+{
+ FilterResult res;
+ irc::tokenstream tokens(data);
+ tokens.GetToken(res.freeform);
+ tokens.GetToken(res.action);
+ tokens.GetToken(res.flags);
+ if (res.flags == "-")
+ res.flags = "";
+ res.FillFlags(res.flags);
+ tokens.GetToken(res.gline_time);
+ tokens.GetToken(res.reason);
+
+ /* Hax to allow spaces in the freeform without changing the design of the irc protocol */
+ for (std::string::iterator n = res.freeform.begin(); n != res.freeform.end(); n++)
+ if (*n == '\7')
+ *n = ' ';
+
+ return res;
+}
+
+void FilterBase::OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable)
+{
+ this->SyncFilters(proto, opaque);
+}
+
+void FilterBase::SendFilter(Module* proto, void* opaque, FilterResult* iter)
+{
+ proto->ProtoSendMetaData(opaque, TYPE_OTHER, NULL, "filter", EncodeFilter(iter));
+}
+
+void FilterBase::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
+{
+ if ((target_type == TYPE_OTHER) && (extname == "filter"))
+ {
+ FilterResult data = DecodeFilter(extdata);
+ this->AddFilter(data.freeform, data.action, data.reason, data.gline_time, data.flags);
+ }
+}
+
+class ImplFilter : public FilterResult
+{
+ public:
+ Regex* regex;
+
+ ImplFilter(Module* mymodule, const std::string &rea, const std::string &act, long glinetime, const std::string &pat, const std::string &flgs)
+ : FilterResult(pat, rea, act, glinetime, flgs)
+ {
+ if (!rxengine)
+ throw ModuleException("Regex module implementing '"+RegexEngine+"' is not loaded!");
+
+ regex = RegexFactoryRequest(mymodule, rxengine, pat).Create();
+ }
+
+ ImplFilter()
+ {
+ delete regex;
+ }
+};
+
+class ModuleFilter : public FilterBase
+{
+ std::vector<ImplFilter> filters;
+ const char *error;
+ int erroffset;
+ ImplFilter fr;
public:
ModuleFilter(InspIRCd* Me)
@@ -36,25 +554,25 @@ class ModuleFilter : public FilterBase
{
}
- virtual FilterResult* FilterMatch(User* user, const std::string &text, int iflags)
+ virtual FilterResult* FilterMatch(User* user, const std::string &text, int flgs)
{
- for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
+ for (std::vector<ImplFilter>::iterator index = filters.begin(); index != filters.end(); index++)
{
-
/* Skip ones that dont apply to us */
- if (!FilterBase::AppliesToMe(user, index->second, iflags))
+
+ if (!FilterBase::AppliesToMe(user, dynamic_cast<FilterResult*>(&(*index)), flgs))
continue;
- if (InspIRCd::Match(text,index->first))
+ if (index->regex->Matches(text))
{
- FilterResult* fr = index->second;
+ fr = *index;
if (index != filters.begin())
{
- std::string pat = index->first;
+ /* Move to head of list for efficiency */
filters.erase(index);
- filters.insert(filters.begin(), std::make_pair(pat,fr));
+ filters.insert(filters.begin(), fr);
}
- return fr;
+ return &fr;
}
}
return NULL;
@@ -62,58 +580,77 @@ class ModuleFilter : public FilterBase
virtual bool DeleteFilter(const std::string &freeform)
{
- if (filters.find(freeform) != filters.end())
+ for (std::vector<ImplFilter>::iterator i = filters.begin(); i != filters.end(); i++)
{
- delete (filters.find(freeform))->second;
- filters.erase(filters.find(freeform));
- return true;
+ if (i->freeform == freeform)
+ {
+ filters.erase(i);
+ return true;
+ }
}
return false;
}
- virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &sflags)
+ virtual void SyncFilters(Module* proto, void* opaque)
{
- if (filters.find(freeform) != filters.end())
+ for (std::vector<ImplFilter>::iterator i = filters.begin(); i != filters.end(); i++)
{
- return std::make_pair(false, "Filter already exists");
+ this->SendFilter(proto, opaque, &(*i));
}
-
- FilterResult* x = new FilterResult(freeform, reason, type, duration, sflags);
- filters[freeform] = x;
-
- return std::make_pair(true, "");
}
- virtual void SyncFilters(Module* proto, void* opaque)
+ virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flgs)
{
- for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
+ for (std::vector<ImplFilter>::iterator i = filters.begin(); i != filters.end(); i++)
+ {
+ if (i->freeform == freeform)
+ {
+ return std::make_pair(false, "Filter already exists");
+ }
+ }
+
+ try
+ {
+ filters.push_back(ImplFilter(this, reason, type, duration, freeform, flgs));
+ }
+ catch (ModuleException &e)
{
- this->SendFilter(proto, opaque, n->second);
+ ServerInstance->Logs->Log("m_filter", DEFAULT, "Error in regular expression '%s': %s", freeform.c_str(), e.GetReason());
+ return std::make_pair(false, e.GetReason());
}
+ return std::make_pair(true, "");
}
virtual void OnRehash(User* user, const std::string &parameter)
{
- ConfigReader* MyConf = new ConfigReader(ServerInstance);
+ ConfigReader MyConf(ServerInstance);
+
+ FilterBase::OnRehash(user, parameter);
- for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
+ for (int index = 0; index < MyConf.Enumerate("keyword"); index++)
{
- this->DeleteFilter(MyConf->ReadValue("keyword","pattern",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 action = MyConf.ReadValue("keyword", "action", index);
+ std::string flgs = MyConf.ReadValue("keyword", "flags", index);
+ long gline_time = ServerInstance->Duration(MyConf.ReadValue("keyword", "duration", index));
+ if (action.empty())
+ action = "none";
+ if (flgs.empty())
+ flgs = "*";
- 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);
- std::string sflags = MyConf->ReadValue("keyword","flags",index);
- long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index));
- if (do_action.empty())
- do_action = "none";
- if (sflags.empty())
- sflags = "*";
- FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, sflags);
- filters[pattern] = x;
+ 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());
+ }
+ catch (ModuleException &e)
+ {
+ ServerInstance->Logs->Log("m_filter",DEFAULT,"Error in regular expression '%s': %s", pattern.c_str(), e.GetReason());
+ }
}
- delete MyConf;
- FilterBase::OnRehash(user, parameter);
}
virtual int OnStats(char symbol, User* user, string_list &results)
@@ -121,14 +658,18 @@ class ModuleFilter : public FilterBase
if (symbol == 's')
{
std::string sn = ServerInstance->Config->ServerName;
- for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
+ for (std::vector<ImplFilter>::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);
+ }
+ for (std::vector<std::string>::iterator i = exemptfromfilter.begin(); i != exemptfromfilter.end(); ++i)
{
- results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->flags+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
+ results.push_back(sn+" 223 "+user->nick+" :EXEMPT "+(*i));
}
}
return 0;
}
};
-
MODULE_INIT(ModuleFilter)
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 04:47:18 +0000