X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=2a61478ab6e16822e7cd8974994e1cedc2342a92;hb=96befc58f073b4f96771b57d728b16742294c2fe;hp=54960a88ea7511163e071b5d91d6852ec5bc43de;hpb=4567a325b8cfc87ddf1aea1c0db7623d3b068931;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp index 54960a88e..2a61478ab 100644 --- a/src/modules/m_noctcp.cpp +++ b/src/modules/m_noctcp.cpp @@ -1,9 +1,16 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2007-2008 Robin Burchell + * 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) 2004, 2006 Craig Edwards + * Copyright (C) 2006 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 @@ -22,41 +29,93 @@ #include "inspircd.h" #include "modules/exemption.h" +class NoCTCPUser : public SimpleUserModeHandler +{ +public: + NoCTCPUser(Module* Creator) + : SimpleUserModeHandler(Creator, "u_noctcp", 'T') + { + if (!ServerInstance->Config->ConfValue("noctcp")->getBool("enableumode")) + DisableAutoRegister(); + } +}; + class ModuleNoCTCP : public Module { CheckExemption::EventProvider exemptionprov; SimpleChannelModeHandler nc; + NoCTCPUser ncu; public: ModuleNoCTCP() : exemptionprov(this) , nc(this, "noctcp", 'C') + , ncu(this) { } Version GetVersion() CXX11_OVERRIDE { - return Version("Provides channel mode +C to block CTCPs", VF_VENDOR); + 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); } ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { - if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user))) + if (!IS_LOCAL(user)) + return MOD_RES_PASSTHRU; + + std::string ctcpname; + if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION")) + return MOD_RES_PASSTHRU; + + switch (target.type) { - std::string ctcpname; - if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION")) - return MOD_RES_PASSTHRU; + case MessageTarget::TYPE_CHANNEL: + { + 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); + } - Channel* c = target.Get(); - ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp"); - if (res == MOD_RES_ALLOW) - return MOD_RES_PASSTHRU; + ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp"); + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet(nc))) + 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: { - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C set)"); - return MOD_RES_DENY; + if (user->HasPrivPermission("users/ignore-noctcp")) + return MOD_RES_PASSTHRU; + + User* u = target.Get(); + if (u->IsModeSet(ncu)) + { + user->WriteNumeric(Numerics::CannotSendTo(u, "CTCPs", &ncu)); + return MOD_RES_DENY; + } + break; } + case MessageTarget::TYPE_SERVER: + break; } return MOD_RES_PASSTHRU; }