X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=3bf9c98d0940ab44354cffb481359b6b0c95f103;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=88d7ab5f4d4a9f755785f842f80b7e92e20f4a2f;hpb=3fb96ec5df7d91a263ec9d3cae61b3372c4fddf3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index 88d7ab5f4..3bf9c98d0 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -1,130 +1,132 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2012-2014 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2008-2009 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * 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" - -/* $ModDesc: Provides support to block all-CAPS channel messages and notices */ - -/** Handles the +P channel mode - */ -class BlockCaps : public SimpleChannelModeHandler -{ - public: - BlockCaps(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'B') { } -}; +#include "inspircd.h" +#include "modules/exemption.h" class ModuleBlockCAPS : public Module { - BlockCaps* bc; - int percent; + CheckExemption::EventProvider exemptionprov; + SimpleChannelModeHandler bc; + unsigned int percent; unsigned int minlen; - char capsmap[256]; + std::bitset lowercase; + std::bitset uppercase; + public: - - ModuleBlockCAPS(InspIRCd* Me) : Module(Me) + ModuleBlockCAPS() + : exemptionprov(this) + , bc(this, "blockcaps", 'B') { - OnRehash(NULL,""); - bc = new BlockCaps(ServerInstance); - if (!ServerInstance->Modes->AddMode(bc)) - { - delete bc; - throw ModuleException("Could not add new modes!"); - } - Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 3); } - - virtual void OnRehash(User* user, const std::string ¶m) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - ReadConf(); + tokens["EXTBAN"].push_back('B'); } - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { - if (target_type == TYPE_CHANNEL) + if (target.type == MessageTarget::TYPE_CHANNEL) { - if ((!IS_LOCAL(user)) || (text.length() < minlen)) - return 0; + if (!IS_LOCAL(user)) + return MOD_RES_PASSTHRU; - Channel* c = (Channel*)dest; + Channel* c = target.Get(); + ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcaps"); - if (CHANOPS_EXEMPT(ServerInstance, 'B') && c->GetStatus(user) == STATUS_OP) - { - return 0; - } + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - if (c->IsModeSet('B')) + if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet(bc))) { - int caps = 0; - const char* actstr = "\1ACTION "; - - for (std::string::iterator i = text.begin(); i != text.end(); i++) + // If the message is a CTCP then we skip it unless it is + // an ACTION in which case we just check against the body. + std::string ctcpname; + std::string message(details.text); + if (details.IsCTCP(ctcpname, message)) { - /* Smart fix for suggestion from Jobe, ignore CTCP ACTION (part of /ME) */ - if (*actstr && *i == *actstr++) - continue; + // If the CTCP is not an action then skip it. + if (!irc::equals(ctcpname, "ACTION")) + return MOD_RES_PASSTHRU; + } + + // If the message is shorter than the minimum length + // then we don't need to do anything else. + size_t length = message.length(); + if (length < minlen) + return MOD_RES_PASSTHRU; - caps += capsmap[(unsigned char)*i]; + // Count the characters to see how many upper case and + // ignored (non upper or lower) characters there are. + size_t upper = 0; + for (std::string::const_iterator iter = message.begin(); iter != message.end(); ++iter) + { + unsigned char chr = static_cast(*iter); + if (uppercase.test(chr)) + upper += 1; + else if (!lowercase.test(chr)) + length -= 1; } - if ( ((caps*100)/(int)text.length()) >= percent ) + + // Calculate the percentage which is upper case. If the + // message was entirely symbols then it can't contain + // any upper case letters. + if (length > 0 && round((upper * 100) / length) >= percent) { - user->WriteServ( "404 %s %s :Your line cannot be more than %d%% capital letters if it is %d or more letters long", user->nick, c->name, percent, minlen); - return 1; + const std::string msg = InspIRCd::Format("Your message cannot contain %d%% or more capital letters if it's longer than %d characters", percent, minlen); + user->WriteNumeric(Numerics::CannotSendTo(c, msg)); + return MOD_RES_DENY; } } } - return 0; - } - - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); - } - - void ReadConf() - { - ConfigReader Conf(ServerInstance); - percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true); - minlen = Conf.ReadInteger("blockcaps", "minlen", "1", 0, true); - std::string hmap = Conf.ReadValue("blockcaps", "capsmap", 0); - if (hmap.empty()) - hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - memset(&capsmap, 0, 255); - for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++) - capsmap[(unsigned char)*n] = 1; - if (percent < 1 || percent > 100) - { - ServerInstance->Logs->Log("CONFIG",DEFAULT, " out of range, setting to default of 100."); - percent = 100; - } - if (minlen < 1 || minlen > MAXBUF-1) - { - ServerInstance->Logs->Log("CONFIG",DEFAULT, " out of range, setting to default of 1."); - minlen = 1; - } + return MOD_RES_PASSTHRU; } - virtual ~ModuleBlockCAPS() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(bc); - delete bc; + ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps"); + percent = tag->getUInt("percent", 100, 1, 100); + minlen = tag->getUInt("minlen", 1, 1, ServerInstance->Config->Limits.MaxLine); + + lowercase.reset(); + const std::string lower = tag->getString("lowercase", "abcdefghijklmnopqrstuvwxyz"); + for (std::string::const_iterator iter = lower.begin(); iter != lower.end(); ++iter) + lowercase.set(static_cast(*iter)); + + uppercase.reset(); + const std::string upper = tag->getString("uppercase", tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1)); + for (std::string::const_iterator iter = upper.begin(); iter != upper.end(); ++iter) + uppercase.set(static_cast(*iter)); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Adds channel mode B (blockcaps) which allows channels to block messages which are excessively capitalised.", VF_VENDOR); } };