X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=9e30ceca2a95dc6a9b72a38ff7dc696728bedb5f;hb=HEAD;hp=8d066b2111e1db4740d8b7327b7aa6332f1c6dfc;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp index 8d066b211..9e30ceca2 100644 --- a/src/modules/m_operchans.cpp +++ b/src/modules/m_operchans.cpp @@ -1,132 +1,89 @@ -/* +------------------------------------+ - * | 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) 2013, 2018-2020 Sadie Powell + * Copyright (C) 2012-2013 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2004, 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 "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" #include "inspircd.h" -/* $ModDesc: Provides support for oper-only chans via the +O channel mode */ - -class OperChans : public ModeHandler +enum { - public: - /* This is an oper-only mode */ - OperChans() : ModeHandler('O', 0, 0, false, MODETYPE_CHANNEL, true) { } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) - { - if (adding) - { - if (!channel->IsModeSet('O')) - { - channel->SetMode('O',true); - return MODEACTION_ALLOW; - } - } - else - { - if (channel->IsModeSet('O')) - { - channel->SetMode('O',false); - return MODEACTION_ALLOW; - } - } - - return MODEACTION_DENY; - } + // From UnrealIRCd. + ERR_CANTJOINOPERSONLY = 520 }; class ModuleOperChans : public Module { - Server* Srv; - OperChans* oc; + private: + SimpleChannelModeHandler oc; + std::string space; + std::string underscore; + public: - ModuleOperChans(Server* Me) - : Module::Module(Me) + ModuleOperChans() + : oc(this, "operonly", 'O', true) + , space(" ") + , underscore("_") { - Srv = Me; - // Add a mode +O for channels with no parameters - oc = new OperChans(); - Srv->AddMode(oc, 'O'); } - void Implements(char* List) - { - List[I_On005Numeric] = List[I_OnUserPreJoin] = 1; - } - - virtual void On005Numeric(std::string &output) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - InsertMode(output,"O",4); - } - - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) - { - if (!*user->oper) + if (chan && chan->IsModeSet(oc) && !user->IsOper()) { - if (chan) - { - if (chan->IsModeSet('O')) - { - user->WriteServ("520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name); - return 1; - } - } + user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only server operators may join %s (+O is set)", chan->name.c_str())); + return MOD_RES_DENY; } - return 0; - } - - virtual ~ModuleOperChans() - { - DELETE(oc); + return MOD_RES_PASSTHRU; } - - virtual Version GetVersion() + + ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); - } -}; + // Check whether the entry is an extban. + if (mask.length() <= 2 || mask[0] != 'O' || mask[1] != ':') + return MOD_RES_PASSTHRU; + // If the user is not an oper they can't match this. + if (!user->IsOper()) + return MOD_RES_PASSTHRU; -class ModuleOperChansFactory : public ModuleFactory -{ - public: - ModuleOperChansFactory() - { + // Replace spaces with underscores as they're prohibited in mode parameters. + std::string opername(user->oper->name); + stdalgo::string::replace_all(opername, space, underscore); + if (InspIRCd::Match(opername, mask.substr(2))) + return MOD_RES_DENY; + + return MOD_RES_PASSTHRU; } - - ~ModuleOperChansFactory() + + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { + tokens["EXTBAN"].push_back('O'); } - - virtual Module * CreateModule(Server* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleOperChans(Me); + return Version("Adds channel mode O (operonly) which prevents non-server operators from joining the channel.", VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleOperChansFactory; -} - +MODULE_INIT(ModuleOperChans)