X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=c7960c836d0ca6a5a77d7143440b21b3c7d59c5c;hb=HEAD;hp=d5e62c98b09289c710a313c3c5cb743b4c8812a0;hpb=069a2ef21425007d092342c8c11ec28da2f410d7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index d5e62c98b..c7960c836 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -1,61 +1,77 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * 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) 2006, 2010 Craig Edwards + * Copyright (C) 2005, 2008 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" #include "xline.h" +#include "modules/stats.h" + +enum +{ + // InspIRCd-specific. + ERR_BADCHANNEL = 926 +}; -/* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */ +// 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 { -public: - irc::string matchtext; - - CBan(InspIRCd* Instance, time_t s_time, long d, std::string src, std::string re, std::string ch) - : XLine(Instance, s_time, d, src, re, "CBAN") - { - this->matchtext = ch.c_str(); - } +private: + std::string matchtext; - ~CBan() +public: + 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) { } // XXX I shouldn't have to define this - bool Matches(User *u) - { - return false; - } - - bool Matches(const std::string &s) + bool Matches(User* u) CXX11_OVERRIDE { - if (matchtext == s) - return true; return false; } - void DisplayExpiry() + bool Matches(const std::string& s) CXX11_OVERRIDE { - ServerInstance->SNO->WriteToSnoMask('x',"Removing expired CBan %s (set by %s %ld seconds ago)", - this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time)); - ServerInstance->PI->SendSNONotice("x", "Removing expired CBan " + assign(this->matchtext) + " (set by " + this->source + " " + ConvToStr(ServerInstance->Time() - this->set_time) + " seconds ago)"); + if (glob) + return InspIRCd::Match(s, matchtext); + else + return irc::equals(matchtext, s); } - const char* Displayable() + const std::string& Displayable() CXX11_OVERRIDE { - return matchtext.c_str(); + return matchtext; } }; @@ -64,16 +80,16 @@ public: class CBanFactory : public XLineFactory { public: - CBanFactory(InspIRCd* Instance) : XLineFactory(Instance, "CBAN") { } + CBanFactory() : XLineFactory("CBAN") { } - /** Generate a shun - */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + /** Generate a CBAN + */ + 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(ServerInstance, set_time, duration, source, reason, xline_specific_mask); + return new CBan(set_time, duration, source, reason, xline_specific_mask); } - bool AutoApplyToUserList(XLine *x) + bool AutoApplyToUserList(XLine* x) CXX11_OVERRIDE { return false; // No, we apply to channels. } @@ -86,132 +102,133 @@ class CommandCBan : public Command public: CommandCBan(Module* Creator) : Command(Creator, "CBAN", 1, 3) { - flags_needed = 'o'; this->syntax = " [ :]"; - TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END); + flags_needed = 'o'; + this->syntax = " [ [:]]"; } - CmdResult Handle(const std::vector ¶meters, User *user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { /* syntax: CBAN #channel time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ 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->WriteToSnoMask('x',"%s removed CBan on %s.",user->nick.c_str(),parameters[0].c_str()); - ServerInstance->PI->SendSNONotice("x", user->nick + " removed CBan on " + parameters[0]); + ServerInstance->SNO->WriteGlobalSno('x', "%s removed CBan on %s: %s", user->nick.c_str(), parameters[0].c_str(), reason.c_str()); } else { - user->WriteServ("NOTICE %s :*** CBan %s not found in list, try /stats C.",user->nick.c_str(),parameters[0].c_str()); + user->WriteNotice("*** CBan " + parameters[0] + " not found on the list."); + return CMD_FAILURE; } - - return CMD_SUCCESS; } - else if (parameters.size() >= 2) + else { // Adding - XXX todo make this respect tag perhaps.. - long duration = ServerInstance->Duration(parameters[1]); - CBan *r = NULL; - const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied"; - - try + unsigned long duration; + if (!InspIRCd::Duration(parameters[1], duration)) { - r = new CBan(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str()); - } - catch (...) - { - ; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up. + 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()); - if (r) + if (ServerInstance->XLines->AddLine(r, user)) { - if (ServerInstance->XLines->AddLine(r, user)) + if (!duration) { - if (!duration) - { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason); - ServerInstance->PI->SendSNONotice("x", user->nick + " added permenant CBan for " + parameters[0] + ": " + std::string(reason)); - } - else - { - time_t c_requires_crap = duration + ServerInstance->Time(); - ServerInstance->SNO->WriteToSnoMask('x', "%s added timed CBan for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), reason); - ServerInstance->PI->SendSNONotice("x", user->nick + " added timed CBan for " + parameters[0] + ", expires on " + ServerInstance->TimeString(c_requires_crap) + ": " + std::string(reason)); - } - - ServerInstance->XLines->ApplyLines(); + ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason); } else { - delete r; - user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick.c_str(), parameters[0].c_str()); + 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 + { + delete r; + user->WriteNotice("*** CBan for " + parameters[0] + " already exists"); + return CMD_FAILURE; + } } - - return CMD_FAILURE; + return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { + if (IS_LOCAL(user)) + return ROUTE_LOCALONLY; // spanningtree will send ADDLINE + return ROUTE_BROADCAST; } }; -class ModuleCBan : public Module +class ModuleCBan : public Module, public Stats::EventListener { CommandCBan mycommand; CBanFactory f; public: - ModuleCBan(InspIRCd* Me) : Module(Me), mycommand(this), f(Me) + ModuleCBan() + : Stats::EventListener(this) + , mycommand(this) { - ServerInstance->XLines->RegisterFactory(&f); + } - ServerInstance->AddCommand(&mycommand); - Implementation eventlist[] = { I_OnUserPreJoin, I_OnStats }; - ServerInstance->Modules->Attach(eventlist, this, 2); + void init() CXX11_OVERRIDE + { + ServerInstance->XLines->RegisterFactory(&f); } - virtual ~ModuleCBan() + ~ModuleCBan() { ServerInstance->XLines->DelAll("CBAN"); ServerInstance->XLines->UnregisterFactory(&f); } - virtual ModResult OnStats(char symbol, User* user, string_list &out) + 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 (symbol != 'C') + if (stats.GetSymbol() != 'C') return MOD_RES_PASSTHRU; - ServerInstance->XLines->InvokeStats("CBAN", 210, user, out); + ServerInstance->XLines->InvokeStats("CBAN", stats); return MOD_RES_DENY; } - virtual ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname); if (rl) { // Channel is banned. - user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname, rl->reason.c_str()); - ServerInstance->SNO->WriteToSnoMask('a', "%s tried to join %s which is CBANed (%s)", - user->nick.c_str(), cname, rl->reason.c_str()); - ServerInstance->PI->SendSNONotice("A", user->nick + " tried to join " + std::string(cname) + " which is CBANed (" + rl->reason + ")"); + 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()); return MOD_RES_DENY; } return MOD_RES_PASSTHRU; } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + 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" : ""); } }; MODULE_INIT(ModuleCBan) -