X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=289c894bf1df9a3e364fd61fa6c8af2ab0c03352;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=0a445eff746678121aef3b70c16a9da1717113a8;hpb=91df762e93212958db487d8517addba1a63a4ddd;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 0a445eff7..289c894bf 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -1,128 +1,137 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/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 "m_override.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; - bool OverOther; - int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops; - - public: - - ModuleOverride(InspIRCd* Me) - : 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) { - // read our config options (main config file) - OnRehash(NULL); - ServerInstance->SNO->EnableSnomask('G', "GODMODE"); - if (!ServerInstance->Modules->PublishFeature("Override", this)) + for (Modes::ChangeList::List::const_iterator i = list.begin(); i != list.end(); ++i) { - throw ModuleException("m_override: Unable to publish feature 'Override'"); + ModeHandler* mh = i->mh; + if (mh->GetLevelRequired(i->adding) > userlevel) + return true; } - OverriddenMode = OverOther = false; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand, I_OnPreTopicChange, I_OnRequest }; - ServerInstance->Modules->Attach(eventlist, this, 8); + return false; } - virtual void OnRehash(User* user) + 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(ServerInstance); - - // re-read our config options on a rehash - NoisyOverride = Conf.ReadFlag("override", "noisy", 0); - RequireKey = Conf.ReadFlag("override", "requirekey", 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; } - } + 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 std::vector ¶meters, User *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 (OverriddenMode) - { - if ((irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS) && !ServerInstance->Modes->GetLastParse().empty()) - { - std::string msg = std::string(user->nick)+" overriding modes: "+ServerInstance->Modes->GetLastParse()+" [Detail: "; - if (OverOps) - msg += ConvToStr(OverOps)+" op"+(OverOps != 1 ? "s" : "")+", "; - if (OverDeops) - msg += ConvToStr(OverDeops)+" deop"+(OverDeops != 1 ? "s" : "")+", "; - if (OverVoices) - msg += ConvToStr(OverVoices)+" voice"+(OverVoices != 1 ? "s" : "")+", "; - if (OverDevoices) - msg += ConvToStr(OverDevoices)+" devoice"+(OverDevoices != 1 ? "s" : "")+", "; - if (OverHalfops) - msg += ConvToStr(OverHalfops)+" halfop"+(OverHalfops != 1 ? "s" : "")+", "; - if (OverDehalfops) - msg += ConvToStr(OverDehalfops)+" dehalfop"+(OverDehalfops != 1 ? "s" : "")+", "; - if (OverOther) - msg += "others, "; - msg.replace(msg.length()-2, 2, 1, ']'); - ServerInstance->SNO->WriteGlobalSno('G',msg); - } + } - OverriddenMode = OverOther = false; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - } + void init() CXX11_OVERRIDE + { + ServerInstance->SNO->EnableSnomask('v', "OVERRIDE"); + UmodeEnabled = ServerInstance->Config->ConfValue("override")->getBool("enableumode"); } - virtual void On005Numeric(std::string &output) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - output.append(" OVERRIDE"); + // re-read our config options + ConfigTag* tag = ServerInstance->Config->ConfValue("override"); + NoisyOverride = tag->getBool("noisy"); + RequireKey = tag->getBool("requirekey"); } - virtual bool CanOverride(User* source, const char* token) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - // checks to see if the oper's type has - override_t::iterator j = overrides.find(source->oper); + tokens["OVERRIDE"]; + } - if (j != overrides.end()) - { - // 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)); - } + 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; - // its not defined at all, count as false - 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)); } - virtual ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) + ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) CXX11_OVERRIDE { - if (IS_LOCAL(source) && IS_OPER(source) && CanOverride(source, "TOPIC")) + if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC")) { - if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetPrefixValue(source) < HALFOP_VALUE)) + if (!channel->HasUser(source) || (channel->IsModeSet(topiclock) && channel->GetPrefixValue(source) < HALFOP_VALUE)) { - ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name)); + ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to change a topic on "+channel->name); } // Explicit allow @@ -132,195 +141,92 @@ class ModuleOverride : public Module return MOD_RES_PASSTHRU; } - virtual ModResult OnUserPreKick(User* source, User* user, Channel* 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 the kicker's status is less than the target's, or the kicker's status is less than or equal to voice - if ((chan->GetPrefixValue(source) < chan->GetPrefixValue(user)) || (chan->GetPrefixValue(source) <= VOICE_VALUE)) + 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->WriteGlobalSno('G',std::string(source->nick)+" used oper override to kick "+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; } - return MOD_RES_ALLOW; } return MOD_RES_PASSTHRU; } - virtual ModResult OnAccessCheck(User* source,User* dest,Channel* 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 || !channel) + if (!source->IsOper() || !IS_LOCAL(source)) return MOD_RES_PASSTHRU; - int mode = 0; - if (channel->HasUser(source)) - mode = channel->GetPrefixValue(source); - bool over_this = false; + const Modes::ChangeList::List& list = modes.getlist(); + unsigned int mode = channel->GetPrefixValue(source); - switch (access_type) + if (!IsOverride(mode, list)) + return MOD_RES_PASSTHRU; + + if (CanOverride(source, "MODE")) { - case AC_DEOP: - if (mode < OP_VALUE && CanOverride(source,"MODEDEOP")) - { - over_this = true; - OverDeops++; - } - break; - case AC_OP: - if (mode < OP_VALUE && CanOverride(source,"MODEOP")) - { - over_this = true; - OverOps++; - } - break; - case AC_VOICE: - if (mode < HALFOP_VALUE && CanOverride(source,"MODEVOICE")) - { - over_this = true; - OverVoices++; - } - break; - case AC_DEVOICE: - if (mode < HALFOP_VALUE && CanOverride(source,"MODEDEVOICE")) - { - over_this = true; - OverDevoices++; - } - break; - case AC_HALFOP: - if (mode < OP_VALUE && CanOverride(source,"MODEHALFOP")) - { - over_this = true; - OverHalfops++; - } - break; - case AC_DEHALFOP: - if (mode < OP_VALUE && CanOverride(source,"MODEDEHALFOP")) - { - over_this = true; - OverDehalfops++; - } - break; - case AC_GENERAL_MODE: + 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) { - std::string modes = ServerInstance->Modes->GetLastParse(); - bool ohv_only = (modes.find_first_not_of("+-ohv") == std::string::npos); + const Modes::Change& item = *i; + if (!item.param.empty()) + params.append(1, ' ').append(item.param); - if (mode < HALFOP_VALUE && (ohv_only || CanOverride(source,"OTHERMODE"))) + char wanted_pm = (item.adding ? '+' : '-'); + if (wanted_pm != pm) { - over_this = true; - if (!ohv_only) - OverOther = true; + pm = wanted_pm; + msg += pm; } - } - break; - } - if (over_this) - { - OverriddenMode = true; + msg += item.mh->GetModeChar(); + } + msg += params; + ServerInstance->SNO->WriteGlobalSno('v',msg); return MOD_RES_ALLOW; } - else - { - return MOD_RES_PASSTHRU; - } + return MOD_RES_PASSTHRU; } - virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - if (IS_LOCAL(user) && IS_OPER(user)) + if (user->IsOper()) { if (chan) { - if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE"))) + if (chan->IsModeSet(inviteonly) && (CanOverride(user,"INVITE"))) { - irc::string x(chan->name.c_str()); - if (!user->IsInvited(x)) - { - if (RequireKey && keygiven != "override") - { - // Can't join normally -- must use a special key to bypass restrictions - user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str()); - return MOD_RES_PASSTHRU; - } - - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str()); - ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +i on "+std::string(cname)); - } + if (!invapi->IsInvited(user, chan)) + return HandleJoinOverride(user, chan, keygiven, "invite-only", "+i"); return MOD_RES_ALLOW; } - if ((chan->modes[CM_KEY]) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k')) - { - if (RequireKey && keygiven != "override") - { - // Can't join normally -- must use a special key to bypass restrictions - user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str()); - return MOD_RES_PASSTHRU; - } + if (chan->IsModeSet(key) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter(key)) + return HandleJoinOverride(user, chan, keygiven, "the channel key", "+k"); - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str()); - ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +k on "+std::string(cname)); - return MOD_RES_ALLOW; - } - - if ((chan->modes[CM_LIMIT]) && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT"))) - { - if (RequireKey && keygiven != "override") - { - // Can't join normally -- must use a special key to bypass restrictions - user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str()); - return MOD_RES_PASSTHRU; - } - - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str()); - ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +l on "+std::string(cname)); - return MOD_RES_ALLOW; - } + 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")) - { - if (RequireKey && keygiven != "override") - { - // Can't join normally -- must use a special key to bypass restrictions - user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str()); - return MOD_RES_PASSTHRU; - } - - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str()); - ServerInstance->SNO->WriteGlobalSno('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname); - return MOD_RES_ALLOW; - } + return HandleJoinOverride(user, chan, keygiven, "channel ban", "channel ban"); } } return MOD_RES_PASSTHRU; } - virtual const char* OnRequest(Request* request) - { - if(strcmp(OVRREQID, request->GetId()) == 0) - { - OVRrequest* req = static_cast(request); - return this->CanOverride(req->requser,req->reqtoken.c_str()) ? "yes":""; - } - return NULL; - } - - virtual ~ModuleOverride() - { - ServerInstance->Modules->UnpublishFeature("Override"); - ServerInstance->SNO->DisableSnomask('G'); - } - - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$",VF_VENDOR,API_VERSION); + return Version("Allows server operators to be given privileges that allow them to ignore various channel-level restrictions.",VF_VENDOR); } };