inspircd

A modular C++ IRC daemon (ircd). https://www.inspircd.org/
Log | Files | Refs | README

commit 9f3502de449f3bd4a88163ddc39626305071531f
parent e915fcbc00b7ac3fbe9d7af11e4f56778f9d2200
Author: Peter Powell <petpow@saberuk.com>
Date:   Tue, 16 Apr 2019 22:58:15 +0100

Remove m_silence pending a complete rewrite.

Diffstat:
Mdocs/conf/helpop.conf.example | 30------------------------------
Dsrc/modules/m_silence.cpp | 386-------------------------------------------------------------------------------
Msrc/modules/m_spanningtree/compat.cpp | 5+++++
3 files changed, 5 insertions(+), 416 deletions(-)

diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example @@ -145,36 +145,6 @@ E.g. '/RMODE #channel b m:*' will remove all mute extbans on the channel."> This behaves identically to /REMOVE. /REMOVE is a built-in mIRC command which caused trouble for some users."> -<helpop key="silence" value="/SILENCE [(+|-)<mask> [p|c|i|n|t|a|x]] - -A server-side ignore of the given n!u@h mask. The flags at the end -are optional, and specify what is to be ignored from this mask. - -/SILENCE - Shows a list of silenced masks -/SILENCE +<mask> [<flags>] - Add a mask -/SILENCE -<mask> - Remove a mask - -Valid SILENCE Flags -------------------- - - p Block private messages - c Block channel messages - i Block invites - n Block private notices - t Block channel notices - a Block all of the above - x Exception - -Multiple flags may be specified. For an exception, you must pair x -with what you want excepted. For example, if you wanted to except -everything from people with a host matching *.foo.net, you would do -/SILENCE +*!*@*.foo.net xa - -If no flags are specified, it will default to blocking private messages -and private notices (pn). - -/SILENCE without a parameter will list the masks that you have silenced."> - <helpop key="knock" value="/KNOCK <channel> :<reason> Sends a notice to a channel indicating you wish to join."> diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp @@ -1,386 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org> - * Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net> - * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org> - * Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc> - * Copyright (C) 2006 John Brooks <john.brooks@dereferenced.net> - * - * 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 <http://www.gnu.org/licenses/>. - */ - - -#include "inspircd.h" - -/* Improved drop-in replacement for the /SILENCE command - * syntax: /SILENCE [(+|-)<mask> [p|c|i|n|t|a|x]] as in [privatemessages|channelmessages|invites|privatenotices|channelnotices|all|exclude] - * - * example that blocks all except private messages - * /SILENCE +*!*@* a - * /SILENCE +*!*@* px - * - * example that blocks all invites except from channel services - * /SILENCE +*!*@* i - * /SILENCE +chanserv!services@chatters.net ix - * - * example that blocks some bad dude from private, notice and inviting you - * /SILENCE +*!kiddie@lamerz.net pin - * - * TODO: possibly have add and remove check for existing host and only modify flags according to - * what's been changed instead of having to remove first, then add if you want to change - * an entry. - */ - -// pair of hostmask and flags -typedef std::pair<std::string, int> silenceset; - -// list of pairs -typedef std::vector<silenceset> silencelist; - -// intmasks for flags -static int SILENCE_PRIVATE = 0x0001; /* p private messages */ -static int SILENCE_CHANNEL = 0x0002; /* c channel messages */ -static int SILENCE_INVITE = 0x0004; /* i invites */ -static int SILENCE_NOTICE = 0x0008; /* n notices */ -static int SILENCE_CNOTICE = 0x0010; /* t channel notices */ -static int SILENCE_ALL = 0x0020; /* a all, (pcint) */ -static int SILENCE_EXCLUDE = 0x0040; /* x exclude this pattern */ - -enum -{ - // From ircu? - RPL_SILELIST = 271, - RPL_ENDOFSILELIST = 272, - - // InspIRCd-specific. - RPL_UNSILENCED = 950, - RPL_SILENCED = 951, - ERR_NOTSILENCED = 952 -}; - -class CommandSVSSilence : public Command -{ - public: - CommandSVSSilence(Module* Creator) : Command(Creator,"SVSSILENCE", 2) - { - syntax = "<target> (+|-)<mask> [p|c|i|n|t|a|x]"; - TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); - } - - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE - { - /* - * XXX: thought occurs to me - * We may want to change the syntax of this command to - * SVSSILENCE <flagsora+> +<nick> -<nick> +<nick> - * style command so services can modify lots of entries at once. - * leaving it backwards compatible for now as it's late. -- w - */ - if (!user->server->IsULine()) - return CMD_FAILURE; - - User *u = ServerInstance->FindNick(parameters[0]); - if (!u) - return CMD_FAILURE; - - if (IS_LOCAL(u)) - { - CommandBase::Params params(parameters.begin() + 1, parameters.end()); - ServerInstance->Parser.CallHandler("SILENCE", params, u); - } - - return CMD_SUCCESS; - } - - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE - { - return ROUTE_OPT_UCAST(parameters[0]); - } -}; - -class CommandSilence : public Command -{ - unsigned int& maxsilence; - public: - SimpleExtItem<silencelist> ext; - CommandSilence(Module* Creator, unsigned int &max) : Command(Creator, "SILENCE", 0), - maxsilence(max) - , ext("silence_list", ExtensionItem::EXT_USER, Creator) - { - allow_empty_last_param = false; - syntax = "[(+|-)<mask> [p|c|i|n|t|a|x]]"; - } - - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE - { - if (parameters.empty()) - { - // no parameters, show the current silence list. - silencelist* sl = ext.get(user); - // if the user has a silence list associated with their user record, show it - if (sl) - { - for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) - { - std::string decomppattern = DecompPattern(c->second); - user->WriteNumeric(RPL_SILELIST, user->nick, c->first, decomppattern); - } - } - user->WriteNumeric(RPL_ENDOFSILELIST, "End of Silence List"); - - return CMD_SUCCESS; - } - else - { - // one or more parameters, add or delete entry from the list (only the first parameter is used) - std::string mask(parameters[0], 1); - char action = parameters[0][0]; - // Default is private and notice so clients do not break - int pattern = CompilePattern("pn"); - - // if pattern supplied, use it - if (parameters.size() > 1) { - pattern = CompilePattern(parameters[1].c_str()); - } - - if (pattern == 0) - { - user->WriteNotice("Bad SILENCE pattern"); - return CMD_INVALID; - } - - if (!mask.length()) - { - // 'SILENCE +' or 'SILENCE -', assume *!*@* - mask = "*!*@*"; - } - - ModeParser::CleanMask(mask); - - if (action == '-') - { - std::string decomppattern = DecompPattern(pattern); - // fetch their silence list - silencelist* sl = ext.get(user); - // does it contain any entries and does it exist? - if (sl) - { - for (silencelist::iterator i = sl->begin(); i != sl->end(); i++) - { - // search through for the item - const std::string& listitem = i->first; - if ((irc::equals(listitem, mask)) && (i->second == pattern)) - { - sl->erase(i); - user->WriteNumeric(RPL_UNSILENCED, user->nick, InspIRCd::Format("Removed %s %s from silence list", mask.c_str(), decomppattern.c_str())); - if (!sl->size()) - { - ext.unset(user); - } - return CMD_SUCCESS; - } - } - } - user->WriteNumeric(ERR_NOTSILENCED, user->nick, InspIRCd::Format("%s %s does not exist on your silence list", mask.c_str(), decomppattern.c_str())); - } - else if (action == '+') - { - // fetch the user's current silence list - silencelist* sl = ext.get(user); - if (!sl) - { - sl = new silencelist; - ext.set(user, sl); - } - if (sl->size() > maxsilence) - { - user->WriteNumeric(ERR_NOTSILENCED, user->nick, "Your silence list is full"); - return CMD_FAILURE; - } - - std::string decomppattern = DecompPattern(pattern); - for (silencelist::iterator n = sl->begin(); n != sl->end(); n++) - { - const std::string& listitem = n->first; - if ((irc::equals(listitem, mask)) && (n->second == pattern)) - { - user->WriteNumeric(ERR_NOTSILENCED, user->nick, InspIRCd::Format("%s %s is already on your silence list", mask.c_str(), decomppattern.c_str())); - return CMD_FAILURE; - } - } - if (((pattern & SILENCE_EXCLUDE) > 0)) - { - sl->insert(sl->begin(), silenceset(mask, pattern)); - } - else - { - sl->push_back(silenceset(mask,pattern)); - } - user->WriteNumeric(RPL_SILENCED, user->nick, InspIRCd::Format("Added %s %s to silence list", mask.c_str(), decomppattern.c_str())); - return CMD_SUCCESS; - } - } - return CMD_SUCCESS; - } - - /* turn the nice human readable pattern into a mask */ - int CompilePattern(const char* pattern) - { - int p = 0; - for (const char* n = pattern; *n; n++) - { - switch (*n) - { - case 'p': - p |= SILENCE_PRIVATE; - break; - case 'c': - p |= SILENCE_CHANNEL; - break; - case 'i': - p |= SILENCE_INVITE; - break; - case 'n': - p |= SILENCE_NOTICE; - break; - case 't': - p |= SILENCE_CNOTICE; - break; - case 'a': - case '*': - p |= SILENCE_ALL; - break; - case 'x': - p |= SILENCE_EXCLUDE; - break; - default: - break; - } - } - return p; - } - - /* turn the mask into a nice human readable format */ - std::string DecompPattern (const int pattern) - { - std::string out; - if (pattern & SILENCE_PRIVATE) - out += ",privatemessages"; - if (pattern & SILENCE_CHANNEL) - out += ",channelmessages"; - if (pattern & SILENCE_INVITE) - out += ",invites"; - if (pattern & SILENCE_NOTICE) - out += ",privatenotices"; - if (pattern & SILENCE_CNOTICE) - out += ",channelnotices"; - if (pattern & SILENCE_ALL) - out = ",all"; - if (pattern & SILENCE_EXCLUDE) - out += ",exclude"; - if (out.length()) - return "<" + out.substr(1) + ">"; - else - return "<none>"; - } - -}; - -class ModuleSilence : public Module -{ - unsigned int maxsilence; - bool ExemptULine; - CommandSilence cmdsilence; - CommandSVSSilence cmdsvssilence; - public: - - ModuleSilence() - : maxsilence(32), cmdsilence(this, maxsilence), cmdsvssilence(this) - { - } - - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE - { - ConfigTag* tag = ServerInstance->Config->ConfValue("silence"); - - maxsilence = tag->getUInt("maxentries", 32, 1); - ExemptULine = tag->getBool("exemptuline", true); - } - - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE - { - tokens["ESILENCE"]; - tokens["SILENCE"] = ConvToStr(maxsilence); - } - - void BuildExemptList(MessageType message_type, Channel* chan, User* sender, CUList& exempt_list) - { - int public_silence = (message_type == MSG_PRIVMSG ? SILENCE_CHANNEL : SILENCE_CNOTICE); - - const Channel::MemberMap& ulist = chan->GetUsers(); - for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i) - { - if (IS_LOCAL(i->first)) - { - if (MatchPattern(i->first, sender, public_silence) == MOD_RES_DENY) - { - exempt_list.insert(i->first); - } - } - } - } - - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE - { - if (target.type == MessageTarget::TYPE_USER && IS_LOCAL(target.Get<User>())) - { - return MatchPattern(target.Get<User>(), user, ((details.type == MSG_PRIVMSG) ? SILENCE_PRIVATE : SILENCE_NOTICE)); - } - else if (target.type == MessageTarget::TYPE_CHANNEL) - { - Channel* chan = target.Get<Channel>(); - BuildExemptList(details.type, chan, user, details.exemptions); - } - return MOD_RES_PASSTHRU; - } - - ModResult OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout) CXX11_OVERRIDE - { - return MatchPattern(dest, source, SILENCE_INVITE); - } - - ModResult MatchPattern(User* dest, User* source, int pattern) - { - if (ExemptULine && source->server->IsULine()) - return MOD_RES_PASSTHRU; - - silencelist* sl = cmdsilence.ext.get(dest); - if (sl) - { - for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) - { - if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (InspIRCd::Match(source->GetFullHost(), c->first))) - return (c->second & SILENCE_EXCLUDE) ? MOD_RES_PASSTHRU : MOD_RES_DENY; - } - } - return MOD_RES_PASSTHRU; - } - - Version GetVersion() CXX11_OVERRIDE - { - return Version("Provides support for the /SILENCE command", VF_OPTCOMMON | VF_VENDOR); - } -}; - -MODULE_INIT(ModuleSilence) diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp @@ -519,6 +519,11 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, Comm // SVSWATCH was removed because nothing was using it, but better be sure return false; } + else if (cmd == "SVSSILENCE") + { + // SVSSILENCE was removed because nothing was using it, but better be sure + return false; + } else if (cmd == "PUSH") { if ((params.size() != 2) || (!this->MyRoot))