X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=a53ed43b828b9a51639c9147928a7e756b64a973;hb=7488b2de62811d7f831e84fb0aeac2345a7f9ee9;hp=da090e4f870af5b3e3c2ff5b81b083a6b4867865;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index da090e4f8..a53ed43b8 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -1,9 +1,20 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2018 linuxdaemon + * Copyright (C) 2017-2018 B00mX0r + * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012, 2018-2019 Robby + * Copyright (C) 2012 Jens Voss + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Matt Smith + * Copyright (C) 2009 John Brooks + * Copyright (C) 2009 Dennis Friis * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2008 Robin Burchell - * Copyright (C) 2008 Craig Edwards + * Copyright (C) 2008-2010 Craig Edwards + * Copyright (C) 2008-2009 Robin Burchell * Copyright (C) 2008 Thomas Stagner * * This file is part of InspIRCd. InspIRCd is free software: you can @@ -35,7 +46,7 @@ class ShunFactory : public XLineFactory /** Generate a shun */ - 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 Shun(set_time, duration, source, reason, xline_specific_mask); } @@ -53,7 +64,7 @@ class CommandShun : public Command public: CommandShun(Module* Creator) : Command(Creator, "SHUN", 1, 3) { - flags_needed = 'o'; this->syntax = " [] :"; + flags_needed = 'o'; this->syntax = " [ :]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE @@ -69,17 +80,19 @@ class CommandShun : public Command if (parameters.size() == 1) { - if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user)) + std::string reason; + + if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", reason, user)) { - ServerInstance->SNO->WriteToSnoMask('x', "%s removed SHUN on %s", user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s removed SHUN on %s: %s", user->nick.c_str(), parameters[0].c_str(), reason.c_str()); } - else if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user)) + else if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", reason, user)) { - ServerInstance->SNO->WriteToSnoMask('x',"%s removed SHUN on %s", user->nick.c_str(), target.c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s removed SHUN on %s: %s", user->nick.c_str(), target.c_str(), reason.c_str()); } else { - user->WriteNotice("*** Shun " + parameters[0] + " not found in list, try /stats H."); + user->WriteNotice("*** Shun " + parameters[0] + " not found on the list."); return CMD_FAILURE; } } @@ -90,7 +103,11 @@ class CommandShun : public Command std::string expr; if (parameters.size() > 2) { - duration = InspIRCd::Duration(parameters[1]); + if (!InspIRCd::Duration(parameters[1], duration)) + { + user->WriteNotice("*** Invalid duration for SHUN."); + return CMD_FAILURE; + } expr = parameters[2]; } else @@ -104,21 +121,20 @@ class CommandShun : public Command { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent SHUN for %s: %s", + ServerInstance->SNO->WriteToSnoMask('x', "%s added permanent SHUN for %s: %s", user->nick.c_str(), target.c_str(), expr.c_str()); } else { - time_t c_requires_crap = duration + ServerInstance->Time(); - std::string timestr = InspIRCd::TimeString(c_requires_crap); - ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s to expire on %s: %s", - user->nick.c_str(), target.c_str(), timestr.c_str(), expr.c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s, expires in %s (on %s): %s", + user->nick.c_str(), target.c_str(), InspIRCd::DurationString(duration).c_str(), + InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), expr.c_str()); } } else { delete r; - user->WriteNotice("*** Shun for " + target + " already exists"); + user->WriteNotice("*** Shun for " + target + " already exists."); return CMD_FAILURE; } } @@ -171,27 +187,20 @@ class ModuleShun : public Module, public Stats::EventListener if (stats.GetSymbol() != 'H') return MOD_RES_PASSTHRU; - ServerInstance->XLines->InvokeStats("SHUN", 223, stats); + ServerInstance->XLines->InvokeStats("SHUN", stats); return MOD_RES_DENY; } void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { ConfigTag* tag = ServerInstance->Config->ConfValue("shun"); - std::string cmds = tag->getString("enabledcommands"); - std::transform(cmds.begin(), cmds.end(), cmds.begin(), ::toupper); - - if (cmds.empty()) - cmds = "PING PONG QUIT"; ShunEnabledCommands.clear(); - - irc::spacesepstream dcmds(cmds); - std::string thiscmd; - - while (dcmds.GetToken(thiscmd)) + irc::spacesepstream enabledcmds(tag->getString("enabledcommands", "ADMIN OPER PING PONG QUIT", 1)); + for (std::string enabledcmd; enabledcmds.GetToken(enabledcmd); ) { - ShunEnabledCommands.insert(thiscmd); + std::transform(enabledcmd.begin(), enabledcmd.end(), enabledcmd.begin(), ::toupper); + ShunEnabledCommands.insert(enabledcmd); } NotifyOfShun = tag->getBool("notifyuser", true); @@ -203,19 +212,13 @@ class ModuleShun : public Module, public Stats::EventListener if (validated) return MOD_RES_PASSTHRU; - if (!ServerInstance->XLines->MatchesLine("SHUN", user)) - { - /* Not shunned, don't touch. */ - return MOD_RES_PASSTHRU; - } - - if (!affectopers && user->IsOper()) - { - /* Don't do anything if the user is an operator and affectopers isn't set */ - return MOD_RES_PASSTHRU; - } + // Exempt the user from shuns if: + // (1) They are an oper and affectopers is disabled. + // (2) They have the servers/ignore-shun privilege. + if ((!affectopers && user->IsOper()) || user->HasPrivPermission("servers/ignore-shun")) + return MOD_RES_PASSTHRU; - if (!ShunEnabledCommands.count(command)) + if (ServerInstance->XLines->MatchesLine("SHUN", user) && !ShunEnabledCommands.count(command)) { if (NotifyOfShun) user->WriteNotice("*** Command " + command + " not processed, as you have been blocked from issuing commands (SHUN)"); @@ -239,7 +242,7 @@ class ModuleShun : public Module, public Stats::EventListener Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the /SHUN command, which stops a user from executing all except configured commands.",VF_VENDOR|VF_COMMON); + return Version("Adds the /SHUN command which allows server operators to prevent users from executing commands.", VF_VENDOR|VF_COMMON); } };