static Module* rxengine = NULL;
static Module* mymodule = NULL; /* Needed to let RLine send request! */
+static bool ZlineOnMatch = false;
+static std::vector<ZLine *> background_zlines;
/* $ModDesc: RLINE: Regexp user banning. */
* @param regex Pattern to match with
* @
*/
- RLine(InspIRCd* Instance, time_t s_time, long d, std::string src, std::string re, std::string regexs)
- : XLine(Instance, s_time, d, src, re, "R")
+ RLine(time_t s_time, long d, std::string src, std::string re, std::string regexs)
+ : XLine(s_time, d, src, re, "R")
{
matchtext = regexs;
void Apply(User* u)
{
- DefaultApply(u, "R", true);
+ if (ZlineOnMatch) {
+ background_zlines.push_back(new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, ServerInstance->Config->ServerName.c_str(), reason.c_str(), u->GetIPString()));
+ }
+ DefaultApply(u, "R", false);
}
void DisplayExpiry()
class RLineFactory : public XLineFactory
{
public:
- RLineFactory(InspIRCd* Instance) : XLineFactory(Instance, "R")
+ RLineFactory() : XLineFactory("R")
{
}
*/
XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
{
- return new RLine(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
+ return new RLine(set_time, duration, source, reason, xline_specific_mask);
}
~RLineFactory()
try
{
- r = new RLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
+ r = new RLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
}
catch (ModuleException &e)
{
std::string RegexEngine;
public:
- ModuleRLine(InspIRCd* Me) : Module(Me), r(this), f(Me)
+ ModuleRLine() : r(this)
{
mymodule = this;
OnRehash(NULL);
- Me->Modules->UseInterface("RegularExpression");
+ ServerInstance->Modules->UseInterface("RegularExpression");
ServerInstance->AddCommand(&r);
ServerInstance->XLines->RegisterFactory(&f);
- Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnLoadModule, I_OnStats };
- ServerInstance->Modules->Attach(eventlist, this, 5);
+ Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnLoadModule, I_OnStats, I_OnBackgroundTimer };
+ ServerInstance->Modules->Attach(eventlist, this, 6);
}
virtual Version GetVersion()
{
- return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR, API_VERSION);
}
virtual void OnUserConnect(User* user)
virtual void OnRehash(User *user)
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
+
+ if (!Conf.ReadFlag("rline", "zlineonmatch", 0) && ZlineOnMatch)
+ background_zlines.clear();
MatchOnNickChange = Conf.ReadFlag("rline", "matchonnickchange", 0);
+ ZlineOnMatch = Conf.ReadFlag("rline", "zlineonmatch", 0);
std::string newrxengine = Conf.ReadValue("rline", "engine", 0);
if (!RegexEngine.empty())
}
}
+ virtual void OnBackgroundTimer(time_t curtime)
+ {
+ if (!ZlineOnMatch) return;
+ for (std::vector<ZLine *>::iterator i = background_zlines.begin(); i != background_zlines.end(); i++)
+ {
+ ZLine *zl = *i;
+ if (ServerInstance->XLines->AddLine(zl,NULL))
+ {
+ ServerInstance->SNO->WriteToSnoMask('x',"Z-line added due to R-line match on *@%s%s%s: %s",
+ zl->ipaddr.c_str(), zl->duration ? " to expire on " : "", zl->duration ? ServerInstance->TimeString(zl->expiry).c_str() : "", zl->reason.c_str());
+ ServerInstance->XLines->ApplyLines();
+ }
+ }
+ background_zlines.clear();
+ }
+
};
MODULE_INIT(ModuleRLine)