* | 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.
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "xline.h"
#include "m_regex.h"
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 ¶meter);
+ virtual void OnRehash(User* user);
virtual Version GetVersion();
std::string EncodeFilter(FilterResult* filter);
FilterResult DecodeFilter(const std::string &data);
virtual int OnPreCommand(std::string &command, std::vector<std::string> ¶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 = "<filter-definition> <type> <flags> [<gline-duration>] :<reason>";
+ this->syntax = "<filter-definition> <action> <flags> [<gline-duration>] :<reason>";
}
CmdResult Handle(const std::vector<std::string> ¶meters, User *user)
/* 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(IS_LOCAL(user) ? 'a' : '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;
}
}
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;
}
}
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;
}
}
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(IS_LOCAL(user) ? 'a' : 'A', std::string("FILTER: ")+user->nick+" added filter '"+freeform+"', type '"+type+"', "+(duration ? "duration "+parameters[3]+", " : "")+"flags '"+flags+"', reason: "+reason);
+
return CMD_SUCCESS;
}
else
int FilterBase::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
+ if (!IS_LOCAL(user))
+ return 0;
+
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;
+ if (!flags)
+ flags = FLAG_NOTICE;
+
FilterResult* f = this->FilterMatch(user, text, flags);
if (f)
{
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);
+ {
+ ServerInstance->SNO->WriteGlobalSno('a', std::string("FILTER: ")+user->nick+" had their message filtered, target was "+target+": "+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")
{
std::string checkline;
int replacepoint = 0;
bool parting = false;
-
+
if (command == "QUIT")
{
/* QUIT with no reason: nothing to do */
return 0;
FilterResult* f = NULL;
-
+
if (flags)
f = this->FilterMatch(user, checkline, flags);
return 0;
}
-void FilterBase::OnRehash(User* user, const std::string ¶meter)
+void FilterBase::OnRehash(User* user)
{
- ConfigReader* MyConf = new ConfigReader(ServerInstance);
+ ConfigReader MyConf(ServerInstance);
std::vector<std::string>().swap(exemptfromfilter);
- for (int index = 0; index < MyConf->Enumerate("exemptfromfilter"); ++index)
+ for (int index = 0; index < MyConf.Enumerate("exemptfromfilter"); ++index)
{
- std::string chan = MyConf->ReadValue("exemptfromfilter", "channel", index);
+ std::string chan = MyConf.ReadValue("exemptfromfilter", "channel", index);
if (!chan.empty()) {
exemptfromfilter.push_back(chan);
}
}
- std::string newrxengine = MyConf->ReadValue("filteropts", "engine", 0);
+ 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->SNO->WriteGlobalSno('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;
- printf("In Rehash\n");
RegexEngine = newrxengine;
modulelist* ml = ServerInstance->Modules->FindInterface("RegularExpression");
if (ml)
{
if (RegexNameRequest(this, *i).Send() == newrxengine)
{
- ServerInstance->SNO->WriteToSnoMask('A', "Filter now using engine '%s'", RegexEngine.c_str());
+ ServerInstance->SNO->WriteGlobalSno('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());
+ ServerInstance->SNO->WriteGlobalSno('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)
std::string rxname = RegexNameRequest(this, mod).Send();
if (rxname == RegexEngine)
{
- ServerInstance->SNO->WriteToSnoMask('A', "Filter now using engine '%s'", RegexEngine.c_str());
rxengine = mod;
+ /* 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.
+ */
+ ConfigReader Config(ServerInstance);
+ ServerInstance->SNO->WriteGlobalSno('a', "Found and activated regex module '%s' for m_filter.so.", RegexEngine.c_str());
+ ReadFilters(Config);
}
}
}
ModuleFilter(InspIRCd* Me)
: FilterBase(Me, "m_filter.so")
{
- OnRehash(NULL,"");
+ OnRehash(NULL);
}
virtual ~ModuleFilter()
for (std::vector<ImplFilter>::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;
+ //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())
{
}
return &fr;
}
+ //ServerInstance->Logs->Log("m_filter", DEBUG, "NO MATCH");
}
return NULL;
}
{
if (i->freeform == freeform)
{
+ delete i->regex;
filters.erase(i);
return true;
}
return std::make_pair(true, "");
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
ConfigReader MyConf(ServerInstance);
+ FilterBase::OnRehash(user);
+ ReadFilters(MyConf);
+ }
- FilterBase::OnRehash(user, parameter);
-
+ void ReadFilters(ConfigReader &MyConf)
+ {
for (int index = 0; index < MyConf.Enumerate("keyword"); index++)
{
this->DeleteFilter(MyConf.ReadValue("keyword", "pattern", index));
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());
}
}
}
std::string sn = ServerInstance->Config->ServerName;
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);
+ results.push_back(sn+" 223 "+user->nick+" :"+RegexEngine+":"+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)
{
};
MODULE_INIT(ModuleFilter)
-
projects / user / henk / code / inspircd.git / blobdiff