X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=c7960c836d0ca6a5a77d7143440b21b3c7d59c5c;hb=b4a174ee9c32d62ea6bf010e837e8c5b1c3d36a3;hp=5f98def8f6eea222ad00672c0b9e992d0c15d4b6;hpb=384ef31bc01e4a1a2e59d082c9066002410ba54a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 5f98def8f..c7960c836 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -1,10 +1,17 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2020 Michael + * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2018 linuxdaemon + * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2012-2013, 2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009 John Brooks + * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2007-2008 Dennis Friis - * Copyright (C) 2005-2008 Robin Burchell - * Copyright (C) 2005-2006 Craig Edwards - * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2006, 2010 Craig Edwards + * Copyright (C) 2005, 2008 Robin Burchell * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -24,6 +31,16 @@ #include "xline.h" #include "modules/stats.h" +enum +{ + // InspIRCd-specific. + ERR_BADCHANNEL = 926 +}; + +// Compatibility: Use glob matching? +// InspIRCd versions 3.7.0 and below use only exact matching +static bool glob = false; + /** Holds a CBAN item */ class CBan : public XLine @@ -32,7 +49,7 @@ private: std::string matchtext; public: - CBan(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& ch) + CBan(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& ch) : XLine(s_time, d, src, re, "CBAN") , matchtext(ch) { @@ -46,7 +63,10 @@ public: bool Matches(const std::string& s) CXX11_OVERRIDE { - return irc::equals(matchtext, s); + if (glob) + return InspIRCd::Match(s, matchtext); + else + return irc::equals(matchtext, s); } const std::string& Displayable() CXX11_OVERRIDE @@ -63,8 +83,8 @@ class CBanFactory : public XLineFactory CBanFactory() : XLineFactory("CBAN") { } /** Generate a CBAN - */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + */ + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { return new CBan(set_time, duration, source, reason, xline_specific_mask); } @@ -82,7 +102,8 @@ class CommandCBan : public Command public: CommandCBan(Module* Creator) : Command(Creator, "CBAN", 1, 3) { - flags_needed = 'o'; this->syntax = " [ :]"; + flags_needed = 'o'; + this->syntax = " [ [:]]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE @@ -92,20 +113,27 @@ class CommandCBan : public Command if (parameters.size() == 1) { - if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "CBAN", user)) + std::string reason; + + if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "CBAN", reason, user)) { - ServerInstance->SNO->WriteGlobalSno('x', "%s removed CBan on %s.",user->nick.c_str(),parameters[0].c_str()); + ServerInstance->SNO->WriteGlobalSno('x', "%s removed CBan on %s: %s", user->nick.c_str(), parameters[0].c_str(), reason.c_str()); } else { - user->WriteNotice("*** CBan " + parameters[0] + " not found in list, try /stats C."); + user->WriteNotice("*** CBan " + parameters[0] + " not found on the list."); return CMD_FAILURE; } } else { // Adding - XXX todo make this respect tag perhaps.. - unsigned long duration = InspIRCd::Duration(parameters[1]); + unsigned long duration; + if (!InspIRCd::Duration(parameters[1], duration)) + { + user->WriteNotice("*** Invalid duration for CBan."); + return CMD_FAILURE; + } const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied"; CBan* r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str()); @@ -117,9 +145,9 @@ class CommandCBan : public Command } else { - time_t c_requires_crap = duration + ServerInstance->Time(); - std::string timestr = InspIRCd::TimeString(c_requires_crap); - ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), timestr.c_str(), reason); + ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires in %s (on %s): %s", + user->nick.c_str(), parameters[0].c_str(), InspIRCd::DurationString(duration).c_str(), + InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), reason); } } else @@ -164,12 +192,20 @@ class ModuleCBan : public Module, public Stats::EventListener ServerInstance->XLines->UnregisterFactory(&f); } + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + ConfigTag* tag = ServerInstance->Config->ConfValue("cban"); + + // XXX: Consider changing default behavior on the next major version + glob = tag->getBool("glob", false); + } + ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE { if (stats.GetSymbol() != 'C') return MOD_RES_PASSTHRU; - ServerInstance->XLines->InvokeStats("CBAN", 210, stats); + ServerInstance->XLines->InvokeStats("CBAN", stats); return MOD_RES_DENY; } @@ -180,9 +216,9 @@ class ModuleCBan : public Module, public Stats::EventListener if (rl) { // Channel is banned. - user->WriteNumeric(384, cname, InspIRCd::Format("Cannot join channel, CBANed (%s)", rl->reason.c_str())); + user->WriteNumeric(ERR_BADCHANNEL, cname, InspIRCd::Format("Channel %s is CBANed: %s", cname.c_str(), rl->reason.c_str())); ServerInstance->SNO->WriteGlobalSno('a', "%s tried to join %s which is CBANed (%s)", - user->nick.c_str(), cname.c_str(), rl->reason.c_str()); + user->nick.c_str(), cname.c_str(), rl->reason.c_str()); return MOD_RES_DENY; } @@ -191,7 +227,7 @@ class ModuleCBan : public Module, public Stats::EventListener Version GetVersion() CXX11_OVERRIDE { - return Version("Gives /cban, aka C:lines. Think Q:lines, for channels.", VF_COMMON | VF_VENDOR); + return Version("Adds the /CBAN command which allows server operators to prevent channels matching a glob from being created.", VF_COMMON | VF_VENDOR, glob ? "glob" : ""); } };