X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=289c894bf1df9a3e364fd61fa6c8af2ab0c03352;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=c65a992e7ad45d6d04858c65e907d1a658f84641;hpb=12737ab4ad61a0d8a908c8a21594c7012e21eb3c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index c65a992e7..289c894bf 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -1,282 +1,233 @@ -/* +------------------------------------+ - * | 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) 2020 satmd + * Copyright (C) 2017 B00mX0r + * Copyright (C) 2017 Adam + * Copyright (C) 2016 Sheogorath + * Copyright (C) 2013, 2017, 2020 Sadie Powell + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2012-2015 Attila Molnar + * Copyright (C) 2012 Shawn Smith + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007-2008 Dennis Friis + * Copyright (C) 2004, 2006, 2008, 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 "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" -#include "configreader.h" -#include "inspircd.h" - -/* $ModDesc: Provides support for unreal-style oper-override */ - +#include "inspircd.h" +#include "modules/invite.h" -typedef std::map override_t; +class Override : public SimpleUserModeHandler +{ + public: + Override(Module* Creator) : SimpleUserModeHandler(Creator, "override", 'O') + { + oper = true; + if (!ServerInstance->Config->ConfValue("override")->getBool("enableumode")) + DisableAutoRegister(); + } +}; class ModuleOverride : public Module { - - override_t overrides; + bool RequireKey; bool NoisyOverride; - public: - - ModuleOverride(InspIRCd* Me) - : Module::Module(Me) + bool UmodeEnabled; + Override ou; + ChanModeReference topiclock; + ChanModeReference inviteonly; + ChanModeReference key; + ChanModeReference limit; + Invite::API invapi; + + static bool IsOverride(unsigned int userlevel, const Modes::ChangeList::List& list) { - - // here we initialise our module. Use new to create new instances of the required - // classes. - - - - // read our config options (main config file) - OnRehash(""); + for (Modes::ChangeList::List::const_iterator i = list.begin(); i != list.end(); ++i) + { + ModeHandler* mh = i->mh; + if (mh->GetLevelRequired(i->adding) > userlevel) + return true; + } + return false; } - - virtual void OnRehash(const std::string ¶meter) + + ModResult HandleJoinOverride(LocalUser* user, Channel* chan, const std::string& keygiven, const char* bypasswhat, const char* mode) { - // on a rehash we delete our classes for good measure and create them again. - ConfigReader* Conf = new ConfigReader(ServerInstance); - - // re-read our config options on a rehash - NoisyOverride = Conf->ReadFlag("override","noisy",0); - overrides.clear(); - for (int j =0; j < Conf->Enumerate("type"); j++) + if (RequireKey && keygiven != "override") { - std::string typen = Conf->ReadValue("type","name",j); - std::string tokenlist = Conf->ReadValue("type","override",j); - overrides[typen] = tokenlist; + // Can't join normally -- must use a special key to bypass restrictions + user->WriteNotice("*** You may not join normally. You must join with a key of 'override' to oper override."); + return MOD_RES_PASSTHRU; } - - DELETE(Conf); + + if (NoisyOverride) + chan->WriteRemoteNotice(InspIRCd::Format("%s used oper override to bypass %s", user->nick.c_str(), bypasswhat)); + ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass " + mode + " on " + chan->name); + return MOD_RES_ALLOW; } - void Implements(char* List) + public: + ModuleOverride() + : UmodeEnabled(false) + , ou(this) + , topiclock(this, "topiclock") + , inviteonly(this, "inviteonly") + , key(this, "key") + , limit(this, "limit") + , invapi(this) { - List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = 1; } - virtual void On005Numeric(std::string &output) + void init() CXX11_OVERRIDE { - output.append(" OVERRIDE"); + ServerInstance->SNO->EnableSnomask('v', "OVERRIDE"); + UmodeEnabled = ServerInstance->Config->ConfValue("override")->getBool("enableumode"); } - virtual bool CanOverride(userrec* source, char* token) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - // checks to see if the oper's type has - override_t::iterator j = overrides.find(source->oper); - - if (j != overrides.end()) - { - // its defined, return its value as a boolean for if the token is set - return (j->second.find(token, 0) != std::string::npos); - } - - // its not defined at all, count as false - return false; + // re-read our config options + ConfigTag* tag = ServerInstance->Config->ConfValue("override"); + NoisyOverride = tag->getBool("noisy"); + RequireKey = tag->getBool("requirekey"); } - virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - if ((*source->oper) && (CanOverride(source,"KICK"))) + tokens["OVERRIDE"]; + } + + bool CanOverride(User* source, const char* token) + { + // If we require oper override umode (+O) but it is not set + if (UmodeEnabled && !source->IsModeSet(ou)) + return false; + + std::string tokenlist = source->oper->getConfig("override"); + // its defined or * is set, return its value as a boolean for if the token is set + return ((tokenlist.find(token, 0) != std::string::npos) || (tokenlist.find("*", 0) != std::string::npos)); + } + + + ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) CXX11_OVERRIDE + { + if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC")) { - if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE)) + if (!channel->HasUser(source) || (channel->IsModeSet(topiclock) && channel->GetPrefixValue(source) < HALFOP_VALUE)) { - ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")"); + ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to change a topic on "+channel->name); } - /* Returning -1 explicitly allows the kick */ - return -1; + + // Explicit allow + return MOD_RES_ALLOW; } - return 0; + + return MOD_RES_PASSTHRU; } - - virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) + + ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE { - if (*source->oper) + if (source->IsOper() && CanOverride(source,"KICK")) { - if (source && channel) + // If the kicker's status is less than the target's, or the kicker's status is less than or equal to voice + if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE) || + (memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->getRank() == HALFOP_VALUE)) { - // Fix by brain - allow the change if they arent on channel - rely on boolean short-circuit - // to not check the other items in the statement if they arent on the channel - int mode = channel->GetStatus(source); - if ((!channel->HasUser(source)) || ((mode != STATUS_HOP) && (mode != STATUS_OP))) - { - switch (access_type) - { - case AC_DEOP: - if (CanOverride(source,"MODEDEOP")) - { - ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Deopped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } + ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")"); + return MOD_RES_ALLOW; + } + } + return MOD_RES_PASSTHRU; + } - case AC_OP: - if (CanOverride(source,"MODEOP")) - { - ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Opped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } + ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE + { + if (!channel) + return MOD_RES_PASSTHRU; + if (!source->IsOper() || !IS_LOCAL(source)) + return MOD_RES_PASSTHRU; - case AC_VOICE: - if (CanOverride(source,"MODEVOICE")) - { - ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Voiced "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } + const Modes::ChangeList::List& list = modes.getlist(); + unsigned int mode = channel->GetPrefixValue(source); - case AC_DEVOICE: - if (CanOverride(source,"MODEDEVOICE")) - { - ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Devoiced "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } + if (!IsOverride(mode, list)) + return MOD_RES_PASSTHRU; - case AC_HALFOP: - if (CanOverride(source,"MODEHALFOP")) - { - ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Halfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } + if (CanOverride(source, "MODE")) + { + std::string msg = source->nick + " used oper override to set modes on " + channel->name + ": "; - case AC_DEHALFOP: - if (CanOverride(source,"MODEDEHALFOP")) - { - ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Dehalfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - } - } - } - - if (CanOverride(source,"OTHERMODE")) + // Construct a MODE string in the old format for sending it as a snotice + std::string params; + char pm = 0; + for (Modes::ChangeList::List::const_iterator i = list.begin(); i != list.end(); ++i) { - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; + const Modes::Change& item = *i; + if (!item.param.empty()) + params.append(1, ' ').append(item.param); + + char wanted_pm = (item.adding ? '+' : '-'); + if (wanted_pm != pm) + { + pm = wanted_pm; + msg += pm; + } + + msg += item.mh->GetModeChar(); } + msg += params; + ServerInstance->SNO->WriteGlobalSno('v',msg); + return MOD_RES_ALLOW; } - - return ACR_DEFAULT; + return MOD_RES_PASSTHRU; } - - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - if (*user->oper) + if (user->IsOper()) { if (chan) { - if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE"))) + if (chan->IsModeSet(inviteonly) && (CanOverride(user,"INVITE"))) { - if (NoisyOverride) - { - irc::string x = chan->name; - if (!user->IsInvited(x)) - { - /* XXX - Ugly cast for a parameter that isn't used? :< - Om */ - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s invited himself into the channel", cname, user->nick); - } - } - ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname)); - return -1; - } - - if ((chan->key[0]) && (CanOverride(user,"KEY"))) - { - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s bypassed the channel key", cname, user->nick); - ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +k on "+std::string(cname)); - return -1; - } - - if ((chan->limit > 0) && (chan->GetUserCounter() >= chan->limit) && (CanOverride(user,"LIMIT"))) - { - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s passed through your channel limit", cname, user->nick); - ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +l on "+std::string(cname)); - return -1; + if (!invapi->IsInvited(user, chan)) + return HandleJoinOverride(user, chan, keygiven, "invite-only", "+i"); + return MOD_RES_ALLOW; } - if (CanOverride(user,"BANWALK")) - { - // other join - return -1; - } + if (chan->IsModeSet(key) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter(key)) + return HandleJoinOverride(user, chan, keygiven, "the channel key", "+k"); + + if (chan->IsModeSet(limit) && (chan->GetUserCounter() >= ConvToNum(chan->GetModeParameter(limit))) && (CanOverride(user,"LIMIT"))) + return HandleJoinOverride(user, chan, keygiven, "the channel limit", "+l"); + + if (chan->IsBanned(user) && CanOverride(user,"BANWALK")) + return HandleJoinOverride(user, chan, keygiven, "channel ban", "channel ban"); } } - return 0; - } - - virtual ~ModuleOverride() - { + return MOD_RES_PASSTHRU; } - - virtual Version GetVersion() - { - return Version(1,0,0,1,VF_VENDOR); - } -}; - -class ModuleOverrideFactory : public ModuleFactory -{ - public: - ModuleOverrideFactory() - { - } - - ~ModuleOverrideFactory() + Version GetVersion() CXX11_OVERRIDE { + return Version("Allows server operators to be given privileges that allow them to ignore various channel-level restrictions.",VF_VENDOR); } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleOverride(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleOverrideFactory; -} +MODULE_INIT(ModuleOverride)