X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=c5dc35fe371b52fc1881a6686716b3fdc2c52772;hb=c7795d6b93297ec5d1ce5d9d998a42aec575502e;hp=9ce42816c8f70773568216c2a6388ecbe1c089dd;hpb=40e990ed06126c1ba6164738527127d1f58fc032;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index 9ce42816c..c5dc35fe3 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -1,145 +1,86 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2013, 2017, 2020 Sadie Powell + * Copyright (C) 2012, 2018 Robby + * Copyright (C) 2012 Shawn Smith + * Copyright (C) 2012 DjSlash + * Copyright (C) 2012 Attila Molnar + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2010 Craig Edwards * - * --------------------------------------------------- + * 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 . */ -using namespace std; -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" +#include "modules/exemption.h" -/* $ModDesc: Provides support for unreal-style channel mode +c */ - - - -class BlockColor : public ModeHandler +class ModuleBlockColor : public Module { + CheckExemption::EventProvider exemptionprov; + SimpleChannelModeHandler bc; public: - BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) - { - if (adding) - { - if (!channel->IsModeSet('c')) - { - channel->SetMode('c',true); - return MODEACTION_ALLOW; - } - } - else - { - if (channel->IsModeSet('c')) - { - channel->SetMode('c',false); - return MODEACTION_ALLOW; - } - } - return MODEACTION_DENY; - } -}; - -class ModuleBlockColour : public Module -{ - - BlockColor *bc; - public: - - ModuleBlockColour(InspIRCd* Me) : Module::Module(Me) + ModuleBlockColor() + : exemptionprov(this) + , bc(this, "blockcolor", 'c') { - - bc = new BlockColor(ServerInstance); - ServerInstance->AddMode(bc, 'c'); } - void Implements(char* List) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; + tokens["EXTBAN"].push_back('c'); } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { - if (target_type == TYPE_CHANNEL) + if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user))) { - chanrec* c = (chanrec*)dest; - - if(c->IsModeSet('c')) + Channel* c = target.Get(); + + ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor"); + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; + + bool modeset = c->IsModeSet(bc); + if (!c->GetExtBanStatus(user, 'c').check(!modeset)) { - /* Replace a strlcpy(), which ran even when +c wasn't set, with this (no copies at all) -- Om */ - for (std::string::iterator i = text.begin(); i != text.end(); i++) + for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++) { - switch (*i) + // Block all control codes except \001 for CTCP + if ((*i >= 0) && (*i < 32) && (*i != 1)) { - case 2: - case 3: - case 15: - case 21: - case 22: - case 31: - user->WriteServ("404 %s %s :Can't send colours to channel (+c set)",user->nick, c->name); - return 1; - break; + if (modeset) + user->WriteNumeric(Numerics::CannotSendTo(c, "messages containing formatting characters", &bc)); + else + user->WriteNumeric(Numerics::CannotSendTo(c, "messages containing formatting characters", 'c', "nocolor")); + return MOD_RES_DENY; } } } } - return 0; - } - - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status) - { - return OnUserPreMessage(user,dest,target_type,text,status); + return MOD_RES_PASSTHRU; } - virtual ~ModuleBlockColour() - { - ServerInstance->Modes->DelMode(bc); - DELETE(bc); - } - - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1,0,0,0,VF_COMMON|VF_VENDOR); + return Version("Adds channel mode c (blockcolor) which allows channels to block messages which contain IRC formatting codes.",VF_VENDOR); } }; - -class ModuleBlockColourFactory : public ModuleFactory -{ - public: - ModuleBlockColourFactory() - { - } - - ~ModuleBlockColourFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleBlockColour(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleBlockColourFactory; -} +MODULE_INIT(ModuleBlockColor)