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;
if (!rxengine)
{
- ServerInstance->SNO->WriteToSnoMask('x', "Cannot create regexes until engine is set to a loaded provider!");
+ ServerInstance->SNO->WriteToSnoMask('a', "Cannot create regexes until engine is set to a loaded provider!");
throw ModuleException("Regex engine not set or loaded!");
}
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, reason.c_str(), u->GetIPString()));
+ }
+ DefaultApply(u, "R", false);
}
void DisplayExpiry()
{
- ServerInstance->SNO->WriteToSnoMask('x',"Removing expired R-Line %s (set by %s %ld seconds ago)",
+ ServerInstance->SNO->WriteToSnoMask('x',"Removing expired R-line %s (set by %s %ld seconds ago)",
this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
}
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()
std::string rxengine;
public:
- CommandRLine (InspIRCd* Instance) : Command(Instance,"RLINE", "o", 1, 3)
+ CommandRLine(Module* Creator) : Command(Creator,"RLINE", 1, 3)
{
- this->source = "m_rline.so";
- this->syntax = "<regex> [<rline-duration>] :<reason>";
+ flags_needed = 'o'; this->syntax = "<regex> [<rline-duration>] :<reason>";
}
CmdResult Handle (const std::vector<std::string>& parameters, User *user)
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)
{
- ServerInstance->SNO->WriteToSnoMask('x',"Could not add RLINE: %s", e.GetReason());
+ ServerInstance->SNO->WriteToSnoMask('a',"Could not add RLINE: %s", e.GetReason());
}
if (r)
{
if (!duration)
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-line for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
}
else
{
time_t c_requires_crap = duration + ServerInstance->Time();
- ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-Line for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
+ ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-line for %s to expire on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
}
ServerInstance->XLines->ApplyLines();
{
if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "R", user))
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick.c_str(),parameters[0].c_str());
+ ServerInstance->SNO->WriteToSnoMask('x',"%s removed R-line on %s",user->nick.c_str(),parameters[0].c_str());
}
else
{
return CMD_SUCCESS;
}
+
+ RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+ {
+ return ROUTE_BROADCAST;
+ }
};
class ModuleRLine : public Module
std::string RegexEngine;
public:
- ModuleRLine(InspIRCd* Me) : Module(Me), r(Me), 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())
{
if (RegexNameRequest(this, *i).Send() == newrxengine)
{
- ServerInstance->SNO->WriteToSnoMask('x', "R-Line now using engine '%s'", RegexEngine.c_str());
+ ServerInstance->SNO->WriteToSnoMask('a', "R-Line now using engine '%s'", RegexEngine.c_str());
rxengine = *i;
}
}
}
if (!rxengine)
{
- ServerInstance->SNO->WriteToSnoMask('x', "WARNING: Regex engine '%s' is not loaded - R-Line functionality disabled until this is corrected.", RegexEngine.c_str());
+ ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Regex engine '%s' is not loaded - R-Line functionality disabled until this is corrected.", RegexEngine.c_str());
}
}
- virtual int OnStats(char symbol, User* user, string_list &results)
+ virtual ModResult OnStats(char symbol, User* user, string_list &results)
{
if (symbol != 'R')
- return 0;
+ return MOD_RES_PASSTHRU;
ServerInstance->XLines->InvokeStats("R", 223, user, results);
- return 1;
+ return MOD_RES_DENY;
}
virtual void OnLoadModule(Module* mod, const std::string& name)
std::string rxname = RegexNameRequest(this, mod).Send();
if (rxname == RegexEngine)
{
- ServerInstance->SNO->WriteToSnoMask('x', "R-Line now using engine '%s'", RegexEngine.c_str());
+ ServerInstance->SNO->WriteToSnoMask('a', "R-Line now using engine '%s'", RegexEngine.c_str());
rxengine = mod;
}
}
}
}
+ 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)
projects / user / henk / code / inspircd.git / blobdiff