X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=d63b721a0ebe5938c285cbcbbfcfacb948692e58;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=a53ed43b828b9a51639c9147928a7e756b64a973;hpb=44489ddf7e90413d8f656aea24d74445bab227af;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index a53ed43b8..d63b721a0 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -4,18 +4,16 @@ * 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) 2013, 2017-2018, 2020-2021 Sadie Powell + * Copyright (C) 2012-2013, 2015-2016 Attila Molnar + * Copyright (C) 2012, 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-2010 Craig Edwards - * Copyright (C) 2008-2009 Robin Burchell * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 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 @@ -57,14 +55,13 @@ class ShunFactory : public XLineFactory } }; -//typedef std::vector shunlist; - class CommandShun : public Command { public: CommandShun(Module* Creator) : Command(Creator, "SHUN", 1, 3) { - flags_needed = 'o'; this->syntax = " [ :]"; + flags_needed = 'o'; + syntax = " [ :]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE @@ -152,11 +149,33 @@ class CommandShun : public Command class ModuleShun : public Module, public Stats::EventListener { + private: CommandShun cmd; - ShunFactory f; - insp::flat_set ShunEnabledCommands; - bool NotifyOfShun; + ShunFactory shun; + insp::flat_set cleanedcommands; + insp::flat_set enabledcommands; bool affectopers; + bool allowconnect; + bool allowtags; + bool notifyuser; + + bool IsShunned(LocalUser* user) + { + // Exempt the user if they are not fully connected and allowconnect is enabled. + if (allowconnect && user->registered != REG_ALL) + return false; + + // 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() @@ -167,13 +186,13 @@ class ModuleShun : public Module, public Stats::EventListener void init() CXX11_OVERRIDE { - ServerInstance->XLines->RegisterFactory(&f); + ServerInstance->XLines->RegisterFactory(&shun); } ~ModuleShun() { ServerInstance->XLines->DelAll("SHUN"); - ServerInstance->XLines->UnregisterFactory(&f); + ServerInstance->XLines->UnregisterFactory(&shun); } void Prioritize() CXX11_OVERRIDE @@ -195,48 +214,66 @@ class ModuleShun : public Module, public Stats::EventListener { ConfigTag* tag = ServerInstance->Config->ConfValue("shun"); - ShunEnabledCommands.clear(); + cleanedcommands.clear(); + irc::spacesepstream cleanedcmds(tag->getString("cleanedcommands", "AWAY PART QUIT")); + for (std::string cleanedcmd; cleanedcmds.GetToken(cleanedcmd); ) + cleanedcommands.insert(cleanedcmd); + + enabledcommands.clear(); irc::spacesepstream enabledcmds(tag->getString("enabledcommands", "ADMIN OPER PING PONG QUIT", 1)); for (std::string enabledcmd; enabledcmds.GetToken(enabledcmd); ) - { - std::transform(enabledcmd.begin(), enabledcmd.end(), enabledcmd.begin(), ::toupper); - ShunEnabledCommands.insert(enabledcmd); - } + enabledcommands.insert(enabledcmd); - NotifyOfShun = tag->getBool("notifyuser", true); affectopers = tag->getBool("affectopers", false); + allowtags = tag->getBool("allowtags"); + allowconnect = tag->getBool("allowconnect"); + notifyuser = tag->getBool("notifyuser", true); } ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE { - if (validated) + if (validated || !IsShunned(user)) 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 (ServerInstance->XLines->MatchesLine("SHUN", user) && !ShunEnabledCommands.count(command)) + if (!enabledcommands.count(command)) { - if (NotifyOfShun) - user->WriteNotice("*** Command " + command + " not processed, as you have been blocked from issuing commands (SHUN)"); + if (notifyuser) + user->WriteNotice("*** " + command + " command not processed as you have been blocked from issuing commands."); return MOD_RES_DENY; } - if (command == "QUIT") + if (!allowtags) { - /* Allow QUIT but dont show any quit message */ - parameters.clear(); + // Remove all client tags. + ClientProtocol::TagMap& tags = parameters.GetTags(); + for (ClientProtocol::TagMap::iterator tag = tags.begin(); tag != tags.end(); ) + { + if (tag->first[0] == '+') + tag = tags.erase(tag); + else + tag++; + } } - else if ((command == "PART") && (parameters.size() > 1)) + + if (cleanedcommands.count(command)) { - /* same for PART */ - parameters.pop_back(); + if (command == "AWAY" && !parameters.empty()) + { + // Allow away but only for unsetting. + parameters.clear(); + } + else if (command == "PART" && parameters.size() > 1) + { + // Allow part but strip the message. + parameters.pop_back(); + } + else if (command == "QUIT" && !parameters.empty()) + { + // Allow quit but strip the message. + parameters.clear(); + } } - /* if we're here, allow the command. */ return MOD_RES_PASSTHRU; }