X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=c5dc35fe371b52fc1881a6686716b3fdc2c52772;hb=c7795d6b93297ec5d1ce5d9d998a42aec575502e;hp=6ba86e59555f227820ab35b5a52ea40c8b1ac6db;hpb=eb4229deed0281ae566ef7e55a144e5d3183a4b2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index 6ba86e595..c5dc35fe3 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -1,144 +1,86 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * Inspire is copyright (C) 2002-2004 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 . */ -#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() + : exemptionprov(this) + , bc(this, "blockcolor", 'c') { - Srv = new Server; - Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0); } - virtual void On005Numeric(std::string &output) - { - // we don't really have a limit... - std::stringstream line(output); - std::string temp1, temp2; - while (!line.eof()) - { - line >> temp1; - if (temp1.substr(0,10) == "CHANMODES=") - { - // append the chanmode to the end - temp1 = temp1.substr(10,temp1.length()); - temp1 = "CHANMODES=" + temp1 + "c"; - } - temp2 = temp2 + temp1 + " "; - } - if (temp2.length()) - output = temp2.substr(0,temp2.length()-1); - } - - 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]; - snprintf(ctext,MAXBUF,"%s",text.c_str()); - if (c->IsCustomModeSet('c')) - { - if ((strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31))) - { - WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name); - return 1; - } - } - } - 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]; - snprintf(ctext,MAXBUF,"%s",text.c_str()); - if (c->IsCustomModeSet('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)) { - if ((strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31))) + for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++) { - WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name); - return 1; + // Block all control codes except \001 for CTCP + if ((*i >= 0) && (*i < 32) && (*i != 1)) + { + 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() - { - delete Srv; - } - - 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() - { - return new ModuleBlockColor; - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleBlockColorFactory; -} - +MODULE_INIT(ModuleBlockColor)