X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=02b95e150a63ac97773eb2e9bbc8e2cdd194c2e8;hb=e94b673532f7833aaa4789f834e61d68e0b4fc56;hp=cd7698d69564d2104650e8710d701798d8c20ef2;hpb=b9e11915a976daaf790ebc763aff56e19fd49e0f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index cd7698d69..02b95e150 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -1,10 +1,15 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2006, 2008 Craig Edwards - * Copyright (C) 2006-2007 Dennis Friis - * Copyright (C) 2007 Robin Burchell - * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2013, 2017-2018, 2020-2021 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 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 @@ -21,25 +26,21 @@ #include "inspircd.h" - - -/** Handles the +B channel mode - */ -class BlockCaps : public SimpleChannelModeHandler -{ - public: - BlockCaps(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcaps", 'B') { } -}; +#include "modules/exemption.h" class ModuleBlockCAPS : public Module { - BlockCaps bc; + CheckExemption::EventProvider exemptionprov; + SimpleChannelModeHandler bc; unsigned int percent; unsigned int minlen; - char capsmap[256]; + std::bitset lowercase; + std::bitset uppercase; public: - ModuleBlockCAPS() : bc(this) + ModuleBlockCAPS() + : exemptionprov(this) + , bc(this, "blockcaps", 'B') { } @@ -48,33 +49,57 @@ public: tokens["EXTBAN"].push_back('B'); } - ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE + 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)) + if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; - Channel* c = (Channel*)dest; - ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcaps"); + Channel* c = target.Get(); + ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcaps"); if (res == MOD_RES_ALLOW) return MOD_RES_PASSTHRU; if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet(bc))) { - std::string::size_type caps = 0; - unsigned int offset = 0; - // Ignore the beginning of the text if it's a CTCP ACTION (/me) - if (!text.compare(0, 8, "\1ACTION ", 8)) - offset = 8; + // 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)) + { + // 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; - for (std::string::const_iterator i = text.begin() + offset; i != text.end(); ++i) - 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) / 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->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, InspIRCd::Format("Your message cannot contain %d%% or more capital letters if it's longer than %d characters", percent, minlen)); + 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; } } @@ -85,17 +110,23 @@ public: void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps"); - percent = tag->getInt("percent", 100, 1, 100); - minlen = tag->getInt("minlen", 1, 1, ServerInstance->Config->Limits.MaxLine); - std::string hmap = tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); - memset(capsmap, 0, sizeof(capsmap)); - for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++) - capsmap[(unsigned char)*n] = 1; + 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)); } Version GetVersion() CXX11_OVERRIDE { - return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR); + return Version("Adds channel mode B (blockcaps) which allows channels to block messages which are excessively capitalised.", VF_VENDOR); } };