X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=c5dc35fe371b52fc1881a6686716b3fdc2c52772;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=461a05de4e86c21821eaeb273da92240e190ab51;hpb=e80a1792ae0f75168064164105ff72a3b8ac5580;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index 461a05de4..c5dc35fe3 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -1,164 +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 "helperfuncs.h" -/* $ModDesc: Provides support for unreal-style channel mode +c */ +#include "inspircd.h" +#include "modules/exemption.h" class ModuleBlockColor : public Module { - Server *Srv; + CheckExemption::EventProvider exemptionprov; + SimpleChannelModeHandler bc; public: - - ModuleBlockColor(Server* Me) - : Module::Module(Me) + + ModuleBlockColor() + : exemptionprov(this) + , bc(this, "blockcolor", 'c') { - Srv = Me; - Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0); } - void Implements(char* List) - { - List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1; - } - - virtual void On005Numeric(std::string &output) - { - InsertMode(output,"c",4); - } - - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - if (target_type == TYPE_CHANNEL) - { - chanrec* c = (chanrec*)dest; - char ctext[MAXBUF]; - char *ctptr = ctext; - strlcpy(ctext,text.c_str(),MAXBUF); - - - if (c->IsCustomModeSet('c')) - { - /* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */ - while (ctptr && *ctptr) - { - switch (*ctptr++) - { - case 2: - case 3: - case 15: - case 21: - case 22: - case 31: - WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name); - return 1; - break; - } - } - } - } - return 0; + tokens["EXTBAN"].push_back('c'); } - - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) + + 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; - char ctext[MAXBUF]; - char *ctptr = ctext; - strlcpy(ctext,text.c_str(),MAXBUF); + Channel* c = target.Get(); + ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor"); + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - if (c->IsCustomModeSet('c')) + bool modeset = c->IsModeSet(bc); + if (!c->GetExtBanStatus(user, 'c').check(!modeset)) { - /* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */ - while (ctptr && *ctptr) + for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++) { - switch (*ctptr++) + // 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: - WriteServ(user->fd,"404 %s %s :Can't send colors 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; + return MOD_RES_PASSTHRU; } - - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) - { - // check if this is our mode character... - if ((modechar == 'c') && (type == MT_CHANNEL)) - { - log(DEBUG,"Allowing c change"); - return 1; - } - else - { - return 0; - } - } - - virtual ~ModuleBlockColor() - { - } - - virtual Version GetVersion() - { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); - } -}; - -class ModuleBlockColorFactory : public ModuleFactory -{ - public: - ModuleBlockColorFactory() + Version GetVersion() CXX11_OVERRIDE { + return Version("Adds channel mode c (blockcolor) which allows channels to block messages which contain IRC formatting codes.",VF_VENDOR); } - - ~ModuleBlockColorFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleBlockColor(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleBlockColorFactory; -} - +MODULE_INIT(ModuleBlockColor)