* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "xline.h"
#include "m_regex.h"
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('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;
}
}
}
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('A', std::string("FILTER: ")+user->nick+" added filter '"+freeform+"', type '"+type+"', "+(duration ? "duration "+parameters[3]+", " : "")+"flags '"+flags+"', reason: "+reason);
+
return CMD_SUCCESS;
}
else
}
rxengine = NULL;
- printf("In Rehash\n");
RegexEngine = newrxengine;
modulelist* ml = ServerInstance->Modules->FindInterface("RegularExpression");
if (ml)
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->WriteToSnoMask('A', "Found and activated regex module '%s' for m_filter.so.", RegexEngine.c_str());
+ ReadFilters(Config);
}
}
}
ImplFilter()
{
- delete regex;
}
};
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;
}
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));
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)
{
projects / user / henk / code / inspircd.git / blobdiff