Fix null-checking the wrong variable in the disable module.

[user/henk/code/inspircd.git] / src / modules / m_shun.cpp

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index cd2743ab09d1bbfbbbed25db1632f517ee3542cc..a62d8369d29dad2a99807f4f73ac9a1e9aee0729 100644 (file)
--- 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 <genius3000@g3k.solutions>
+ *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2017-2018 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2018-2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Jens Voss <DukePyrolator@anope.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Matt Smith <dz@inspircd.org>
+ *   Copyright (C) 2009 John Brooks <special@inspircd.org>
+ *   Copyright (C) 2009 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008-2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2008-2009 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -53,7 +64,7 @@ class CommandShun : public Command
  public:
        CommandShun(Module* Creator) : Command(Creator, "SHUN", 1, 3)
        {
-               flags_needed = 'o'; this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
+               flags_needed = 'o'; this->syntax = "<nick!user@host> [<duration> :<reason>]";
        }
 
        CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
@@ -81,7 +92,7 @@ class CommandShun : public Command
                        }
                        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;
                        }
                }
@@ -110,15 +121,14 @@ 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
@@ -148,6 +158,20 @@ class ModuleShun : public Module, public Stats::EventListener
        bool NotifyOfShun;
        bool affectopers;
 
+       bool IsShunned(LocalUser* user)
+       {
+               // Exempt the user from shuns if they are an oper and affectopers is disabled.
+               if (!affectopers && user->IsOper())
+                       return false;
+
+               // Exempt the user from shuns if they are an oper with the servers/ignore-shun privilege.
+               if (user->HasPrivPermission("servers/ignore-shun"))
+                       return false;
+
+               // Check whether the user is actually shunned.
+               return ServerInstance->XLines->MatchesLine("SHUN", user);
+       }
+
  public:
        ModuleShun()
                : Stats::EventListener(this)
@@ -177,27 +201,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);
@@ -206,21 +223,9 @@ class ModuleShun : public Module, public Stats::EventListener
 
        ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
-               if (validated)
+               if (validated || !IsShunned(user))
                        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;
-               }
-
                if (!ShunEnabledCommands.count(command))
                {
                        if (NotifyOfShun)
@@ -245,7 +250,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);
        }
 };