X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=2a61478ab6e16822e7cd8974994e1cedc2342a92;hb=ad797e3a77c69791c02db6d238817d3e23821dec;hp=d431a7369a95795343eb88029a2fae15a040b142;hpb=7ce1303cab4b56478b209f95c7958eea61a5d083;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp index d431a7369..2a61478ab 100644 --- a/src/modules/m_noctcp.cpp +++ b/src/modules/m_noctcp.cpp @@ -1,111 +1,128 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012 Attila Molnar + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Craig Edwards * - * 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 for unreal-style channel mode +C */ +#include "inspircd.h" +#include "modules/exemption.h" -class NoCTCP : public ModeHandler +class NoCTCPUser : public SimpleUserModeHandler { - public: - NoCTCP(InspIRCd* Instance) : ModeHandler(Instance, 'C', 0, 0, false, MODETYPE_CHANNEL, false) { } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) +public: + NoCTCPUser(Module* Creator) + : SimpleUserModeHandler(Creator, "u_noctcp", 'T') { - 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; + if (!ServerInstance->Config->ConfValue("noctcp")->getBool("enableumode")) + DisableAutoRegister(); } }; class ModuleNoCTCP : public Module { - - NoCTCP* nc; + CheckExemption::EventProvider exemptionprov; + SimpleChannelModeHandler nc; + NoCTCPUser ncu; public: - - ModuleNoCTCP(InspIRCd* Me) - : Module(Me) + ModuleNoCTCP() + : exemptionprov(this) + , nc(this, "noctcp", 'C') + , ncu(this) { - - nc = new NoCTCP(ServerInstance); - if (!ServerInstance->Modes->AddMode(nc)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric }; - ServerInstance->Modules->Attach(eventlist, this, 3); } - virtual ~ModuleNoCTCP() + Version GetVersion() CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(nc); - delete nc; + return Version("Adds channel mode C (noctcp) which allows channels to block messages which contain CTCPs and user mode T (u_noctcp) which allows users to block private messages that contain CTCPs.", VF_VENDOR); } - virtual Version GetVersion() + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); - } + if (!IS_LOCAL(user)) + return MOD_RES_PASSTHRU; - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - return OnUserPreNotice(user,dest,target_type,text,status,exempt_list); - } + std::string ctcpname; + if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION")) + return MOD_RES_PASSTHRU; - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user))) + switch (target.type) { - Channel* c = (Channel*)dest; - - if (CHANOPS_EXEMPT(ServerInstance, 'C') && c->GetStatus(user) == STATUS_OP) + case MessageTarget::TYPE_CHANNEL: { - return 0; - } + if (user->HasPrivPermission("channels/ignore-noctcp")) + return MOD_RES_PASSTHRU; + + Channel* c = target.Get(); + const Channel::MemberMap& members = c->GetUsers(); + for (Channel::MemberMap::const_iterator member = members.begin(); member != members.end(); ++member) + { + User* u = member->first; + if (u->IsModeSet(ncu)) + details.exemptions.insert(u); + } - if (c->IsModeSet('C') || c->IsExtBanned(user, 'C')) + ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp"); + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; + + if (c->IsModeSet(nc)) + { + user->WriteNumeric(Numerics::CannotSendTo(c, "CTCPs", &nc)); + return MOD_RES_DENY; + } + + if (c->GetExtBanStatus(user, 'C') == MOD_RES_DENY) + { + user->WriteNumeric(Numerics::CannotSendTo(c, "CTCPs", 'C', "noctcp")); + return MOD_RES_DENY; + } + break; + } + case MessageTarget::TYPE_USER: { - if ((text.length()) && (text[0] == '\1')) + if (user->HasPrivPermission("users/ignore-noctcp")) + return MOD_RES_PASSTHRU; + + User* u = target.Get(); + if (u->IsModeSet(ncu)) { - if (strncmp(text.c_str(),"\1ACTION ",8)) - { - user->WriteNumeric(ERR_NOCTCPALLOWED, "%s %s :Can't send CTCP to channel (+C set)",user->nick.c_str(), c->name.c_str()); - return 1; - } + user->WriteNumeric(Numerics::CannotSendTo(u, "CTCPs", &ncu)); + return MOD_RES_DENY; } + break; } + case MessageTarget::TYPE_SERVER: + break; } - return 0; + return MOD_RES_PASSTHRU; } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - ServerInstance->AddExtBanChar('C'); + tokens["EXTBAN"].push_back('C'); } };