X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=289c894bf1df9a3e364fd61fa6c8af2ab0c03352;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=be123d4fd71448ebfeb80332748cdf79594a71bf;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index be123d4fd..289c894bf 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -1,293 +1,232 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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 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" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.h" -#include "wildcard.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; - bool OverriddenMode; - int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops; - - public: - - ModuleOverride(InspIRCd* Me) - : Module(Me) - { - // read our config options (main config file) - OnRehash(NULL,""); - ServerInstance->SNO->EnableSnomask('O',"OVERRIDE"); - OverriddenMode = false; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - } - - virtual void OnRehash(userrec* user, const std::string ¶meter) + 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) { - // 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++) + for (Modes::ChangeList::List::const_iterator i = list.begin(); i != list.end(); ++i) { - std::string typen = Conf->ReadValue("type","name",j); - std::string tokenlist = Conf->ReadValue("type","override",j); - overrides[typen] = tokenlist; + ModeHandler* mh = i->mh; + if (mh->GetLevelRequired(i->adding) > userlevel) + return true; } - - DELETE(Conf); + return false; } - void Implements(char* List) + ModResult HandleJoinOverride(LocalUser* user, Channel* chan, const std::string& keygiven, const char* bypasswhat, const char* mode) { - List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = List[I_OnPostCommand] = 1; + if (RequireKey && keygiven != "override") + { + // 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; + } + + 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; } - virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) + public: + ModuleOverride() + : UmodeEnabled(false) + , ou(this) + , topiclock(this, "topiclock") + , inviteonly(this, "inviteonly") + , key(this, "key") + , limit(this, "limit") + , invapi(this) { - if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS)) - { - int Total = OverOps + OverDeops + OverVoices + OverDevoices + OverHalfops + OverDehalfops; + } - ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" Overriding modes: "+ServerInstance->Modes->GetLastParse()+" "+(Total ? "[Detail: " : "")+ - (OverOps ? ConvToStr(OverOps)+" op"+(OverOps != 1 ? "s" : "")+" " : "")+ - (OverDeops ? ConvToStr(OverDeops)+" deop"+(OverDeops != 1 ? "s" : "")+" " : "")+ - (OverVoices ? ConvToStr(OverVoices)+" voice"+(OverVoices != 1 ? "s" : "")+" " : "")+ - (OverDevoices ? ConvToStr(OverDevoices)+" devoice"+(OverDevoices != 1 ? "s" : "")+" " : "")+ - (OverHalfops ? ConvToStr(OverHalfops)+" halfop"+(OverHalfops != 1 ? "s" : "")+" " : "")+ - (OverDehalfops ? ConvToStr(OverDehalfops)+" dehalfop"+(OverDehalfops != 1 ? "s" : "") : "") - +(Total ? "]" : "")); + void init() CXX11_OVERRIDE + { + ServerInstance->SNO->EnableSnomask('v', "OVERRIDE"); + UmodeEnabled = ServerInstance->Config->ConfValue("override")->getBool("enableumode"); + } - OverriddenMode = false; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - } + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + // re-read our config options + ConfigTag* tag = ServerInstance->Config->ConfValue("override"); + NoisyOverride = tag->getBool("noisy"); + RequireKey = tag->getBool("requirekey"); } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - output.append(" OVERRIDE"); + tokens["OVERRIDE"]; } - virtual bool CanOverride(userrec* source, char* token) + bool CanOverride(User* source, const char* token) { - // checks to see if the oper's type has - override_t::iterator j = overrides.find(source->oper); + // 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)); + } - if (j != overrides.end()) + + ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) CXX11_OVERRIDE + { + if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC")) { - // its defined or * is set, return its value as a boolean for if the token is set - return ((j->second.find(token, 0) != std::string::npos) || (j->second.find("*", 0) != std::string::npos)); + if (!channel->HasUser(source) || (channel->IsModeSet(topiclock) && channel->GetPrefixValue(source) < HALFOP_VALUE)) + { + ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to change a topic on "+channel->name); + } + + // Explicit allow + return MOD_RES_ALLOW; } - // its not defined at all, count as false - return false; + return MOD_RES_PASSTHRU; } - virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE { - if (IS_OPER(source) && CanOverride(source,"KICK")) + if (source->IsOper() && CanOverride(source,"KICK")) { - if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE)) + // 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)) { - ServerInstance->SNO->WriteToSnoMask('O',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 kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")"); + return MOD_RES_ALLOW; } - /* Returning -1 explicitly allows the kick */ - return -1; } - return 0; + return MOD_RES_PASSTHRU; } - - virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) + + ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE { - if (IS_OPER(source)) + if (!channel) + return MOD_RES_PASSTHRU; + if (!source->IsOper() || !IS_LOCAL(source)) + return MOD_RES_PASSTHRU; + + const Modes::ChangeList::List& list = modes.getlist(); + unsigned int mode = channel->GetPrefixValue(source); + + if (!IsOverride(mode, list)) + return MOD_RES_PASSTHRU; + + if (CanOverride(source, "MODE")) { - if (source && channel) + std::string msg = source->nick + " used oper override to set modes on " + channel->name + ": "; + + // 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) { - // 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); - switch (access_type) - { - case AC_DEOP: - if (CanOverride(source,"MODEDEOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverDeops++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_OP: - if (CanOverride(source,"MODEOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverOps++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_VOICE: - if (CanOverride(source,"MODEVOICE")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_HOP)) - OverVoices++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_DEVOICE: - if (CanOverride(source,"MODEDEVOICE")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_HOP)) - OverDevoices++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_HALFOP: - if (CanOverride(source,"MODEHALFOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverHalfops++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_DEHALFOP: - if (CanOverride(source,"MODEDEHALFOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverDehalfops++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - } - - if (CanOverride(source,"OTHERMODE")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - { - OverriddenMode = true; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - } - return ACR_ALLOW; - } - else + const Modes::Change& item = *i; + if (!item.param.empty()) + params.append(1, ' ').append(item.param); + + char wanted_pm = (item.adding ? '+' : '-'); + if (wanted_pm != pm) { - return ACR_DEFAULT; + 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, std::string &privs) + + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - if (IS_OPER(user)) + if (user->IsOper()) { if (chan) { - if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE"))) - { - irc::string x = chan->name; - if (!user->IsInvited(x)) - { - /* XXX - Ugly cast for a parameter that isn't used? :< - Om */ - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass invite-only", cname, user->nick); - ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname)); - } - return -1; - } - - if ((*chan->key) && (CanOverride(user,"KEY"))) + if (chan->IsModeSet(inviteonly) && (CanOverride(user,"INVITE"))) { - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel key", cname, user->nick); - ServerInstance->SNO->WriteToSnoMask('O',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 used oper-override to bypass the channel limit", cname, user->nick); - ServerInstance->SNO->WriteToSnoMask('O',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")) - { - if (chan->IsBanned(user)) - { - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel ban", cname, user->nick); - ServerInstance->SNO->WriteToSnoMask('O',"%s used oper-override to bypass channel ban on %s", user->nick, cname); - } - 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; + return MOD_RES_PASSTHRU; } - - virtual ~ModuleOverride() - { - ServerInstance->SNO->DisableSnomask('O'); - } - - virtual Version GetVersion() + + Version GetVersion() CXX11_OVERRIDE { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version("Allows server operators to be given privileges that allow them to ignore various channel-level restrictions.",VF_VENDOR); } };