* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#include "inspircd.h"
-#include <pcre.h>
+#include "m_regex.h"
#include "xline.h"
-/* $ModDesc: RLINE: Regexp user banning. */
-/* $CompileFlags: exec("pcre-config --cflags") */
-/* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */
+static bool ZlineOnMatch = false;
+static std::vector<ZLine *> background_zlines;
-#ifdef WINDOWS
-#pragma comment(lib, "pcre.lib")
-#endif
+/* $ModDesc: RLINE: Regexp user banning. */
-class CoreExport RLine : public XLine
+class RLine : public XLine
{
- public:
+ public:
/** Create a R-Line.
* @param s_time The set time
* @param regex Pattern to match with
* @
*/
- RLine(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char* regexs) : XLine(Instance, s_time, d, src, re, "K")
+ RLine(time_t s_time, long d, std::string src, std::string re, std::string regexs, dynamic_reference<RegexFactory>& rxfactory)
+ : XLine(s_time, d, src, re, "R")
{
- const char *error;
- int erroffset;
-
matchtext = regexs;
- regex = pcre_compile(regexs, 0, &error, &erroffset, NULL);
-
- if (!regex)
- {
- ServerInstance->SNO->WriteToSnoMask('x',"Error in regular expression: %s at offset %d: %s\n", regexs, erroffset, error);
- throw CoreException("Bad regex pattern.");
- }
+ /* This can throw on failure, but if it does we DONT catch it here, we catch it and display it
+ * where the object is created, we might not ALWAYS want it to output stuff to snomask x all the time
+ */
+ regex = rxfactory->Create(regexs);
}
/** Destructor
*/
~RLine()
{
- pcre_free(regex);
+ delete regex;
}
bool Matches(User *u)
{
- std::string compare = std::string(u->nick) + "!" + u->ident + "@" + u->host + " " + u->fullname;
-
- ServerInstance->Log(DEBUG, "Matching " + matchtext + " against string " + compare);
-
- if (pcre_exec(regex, NULL, compare.c_str(), compare.length(), 0, 0, NULL, 0) > -1)
- {
- // Bang. :D
- return true;
- }
+ if (u->exempt)
+ return false;
- return false;
+ std::string compare = u->nick + "!" + u->ident + "@" + u->host + " " + u->fullname;
+ return regex->Matches(compare);
}
bool Matches(const std::string &compare)
{
- if (pcre_exec(regex, NULL, compare.c_str(), compare.length(), 0, 0, NULL, 0) > -1)
- {
- // Bang. :D
- return true;
- }
-
- return false;
+ return regex->Matches(compare);
}
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()
{
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed R-Line %s (set by %s %d seconds ago)", this->matchtext.c_str(), this->source, this->duration);
+ 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));
}
const char* Displayable()
std::string matchtext;
- pcre *regex;
+ Regex *regex;
};
/** An XLineFactory specialized to generate RLine* pointers
*/
-class CoreExport RLineFactory : public XLineFactory
+class RLineFactory : public XLineFactory
{
public:
- RLineFactory(InspIRCd* Instance) : XLineFactory(Instance, "R") { }
-
+ dynamic_reference<RegexFactory>& rxfactory;
+ RLineFactory(dynamic_reference<RegexFactory>& rx) : XLineFactory("R"), rxfactory(rx)
+ {
+ }
+
/** Generate a RLine
*/
- XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask)
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+ {
+ if (!rxfactory)
+ {
+ ServerInstance->SNO->WriteToSnoMask('a', "Cannot create regexes until engine is set to a loaded provider!");
+ throw ModuleException("Regex engine not set or loaded!");
+ }
+
+ return new RLine(set_time, duration, source, reason, xline_specific_mask, rxfactory);
+ }
+
+ ~RLineFactory()
{
- return new RLine(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
}
};
*/
class CommandRLine : public Command
{
+ std::string rxengine;
+ RLineFactory& factory;
+
public:
- CommandRLine (InspIRCd* Instance) : Command(Instance,"RLINE", 'o', 1)
+ CommandRLine(Module* Creator, RLineFactory& rlf) : Command(Creator,"RLINE", 1, 3), factory(rlf)
{
- this->source = "m_rline.so";
+ flags_needed = 'o'; this->syntax = "<regex> [<rline-duration>] :<reason>";
}
- CmdResult Handle (const char** parameters, int pcnt, User *user)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
- if (pcnt >= 3)
+ if (parameters.size() >= 3)
{
// Adding - XXX todo make this respect <insane> tag perhaps..
long duration = ServerInstance->Duration(parameters[1]);
- RLine *r = NULL;
+ XLine *r = NULL;
try
{
- r = new RLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]);
+ r = factory.Generate(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
}
- catch (...)
+ catch (ModuleException &e)
{
- ; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up.
+ 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.", user->nick, parameters[0]);
+ 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", user->nick, parameters[0],
- ServerInstance->TimeString(c_requires_crap).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();
else
{
delete r;
- user->WriteServ("NOTICE %s :*** R-Line for %s already exists", user->nick, parameters[0]);
+ user->WriteServ("NOTICE %s :*** R-Line for %s already exists", user->nick.c_str(), parameters[0].c_str());
}
}
}
else
{
- if (ServerInstance->XLines->DelLine(parameters[0], "R", user))
+ if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "R", user))
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s removed R-line on %s",user->nick.c_str(),parameters[0].c_str());
}
else
{
- // XXX todo implement stats
- user->WriteServ("NOTICE %s :*** R-Line %s not found in list, try /stats g.",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** R-Line %s not found in list, try /stats R.",user->nick.c_str(),parameters[0].c_str());
}
}
return CMD_SUCCESS;
}
+
+ RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+ {
+ return ROUTE_BROADCAST;
+ }
};
class ModuleRLine : public Module
{
private:
- CommandRLine *r;
+ dynamic_reference<RegexFactory> rxfactory;
+ RLineFactory f;
+ CommandRLine r;
+ bool MatchOnNickChange;
+
public:
- ModuleRLine(InspIRCd* Me) : Module(Me)
+ ModuleRLine() : rxfactory(this, "regex"), f(rxfactory), r(this, f)
+ {
+ }
+
+ void init()
{
- // Create a new command
- r = new CommandRLine(ServerInstance);
- ServerInstance->AddCommand(r);
+ OnRehash(NULL);
+
+ ServerInstance->AddCommand(&r);
+ ServerInstance->XLines->RegisterFactory(&f);
+
+ Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnStats, I_OnBackgroundTimer };
+ ServerInstance->Modules->Attach(eventlist, this, 5);
}
virtual ~ModuleRLine()
{
+ ServerInstance->XLines->DelAll("R");
+ ServerInstance->XLines->UnregisterFactory(&f);
}
virtual Version GetVersion()
{
- return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR, rxfactory ? rxfactory->name : "");
}
+
+ virtual void OnUserConnect(LocalUser* user)
+ {
+ // Apply lines on user connect
+ XLine *rl = ServerInstance->XLines->MatchesLine("R", user);
+
+ if (rl)
+ {
+ // Bang. :P
+ rl->Apply(user);
+ }
+ }
+
+ virtual void OnRehash(User *user)
+ {
+ 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 (newrxengine.empty())
+ rxfactory.SetProvider("regex");
+ else
+ rxfactory.SetProvider("regex/" + newrxengine);
+ if (!rxfactory)
+ {
+ ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Regex engine '%s' is not loaded - R-Line functionality disabled until this is corrected.", newrxengine.c_str());
+ }
+ }
+
+ virtual ModResult OnStats(char symbol, User* user, string_list &results)
+ {
+ if (symbol != 'R')
+ return MOD_RES_PASSTHRU;
+
+ ServerInstance->XLines->InvokeStats("R", 223, user, results);
+ return MOD_RES_DENY;
+ }
+
+ virtual void OnUserPostNick(User *user, const std::string &oldnick)
+ {
+ if (!IS_LOCAL(user))
+ return;
+
+ if (!MatchOnNickChange)
+ return;
+
+ XLine *rl = ServerInstance->XLines->MatchesLine("R", user);
+
+ if (rl)
+ {
+ // Bang! :D
+ rl->Apply(user);
+ }
+ }
+
+ 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