X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=a653dd33eef84416bc000a58f4fb08d71392b17e;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=56e7dae7c9aa366164680e4ffe87acd8009f4817;hpb=1d72f2227e71cb129f8a3af50bebe308c77c53e8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 56e7dae7c..a653dd33e 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -1,327 +1,197 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2007-2009 Robin Burchell + * Copyright (C) 2007-2008 Dennis Friis + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2008 Geoff Bricker + * Copyright (C) 2004-2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * 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" -/* $ModDesc: Provides support for unreal-style oper-override */ +#include "inspircd.h" -typedef std::map override_t; +/* $ModDesc: Provides support for allowing opers to override certain things. */ 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) + void init() CXX11_OVERRIDE { // read our config options (main config file) - OnRehash(NULL,""); - ServerInstance->SNO->EnableSnomask('O', "OVERRIDE"); - OverriddenMode = false; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand, I_OnLocalTopicChange }; - ServerInstance->Modules->Attach(eventlist, this, 7); + OnRehash(NULL); + ServerInstance->SNO->EnableSnomask('v', "OVERRIDE"); + Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - virtual void OnRehash(User* user, const std::string ¶meter) + void OnRehash(User* user) CXX11_OVERRIDE { - // 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); - RequireKey = Conf->ReadFlag("override", "requirekey", 0); - - overrides.clear(); - - for (int j =0; j < Conf->Enumerate("type"); j++) - { - std::string typen = Conf->ReadValue("type","name",j); - std::string tokenlist = Conf->ReadValue("type","override",j); - overrides[typen] = tokenlist; - } - - delete Conf; + ConfigTag* tag = ServerInstance->Config->ConfValue("override"); + NoisyOverride = tag->getBool("noisy"); + RequireKey = tag->getBool("requirekey"); } - - virtual void OnPostCommand(const std::string &command, const std::vector ¶meters, User *user, CmdResult result, const std::string &original_line) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - if ((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 ? "]" : "")); - - OverriddenMode = false; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - } + tokens["OVERRIDE"]; } - virtual void On005Numeric(std::string &output) + bool CanOverride(User* source, const char* token) { - output.append(" OVERRIDE"); - } - - virtual 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 (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)); - } + std::string tokenlist = source->oper->getConfig("override"); - // its not defined at all, count as false - return false; + // 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 int OnLocalTopicChange(User *source, Channel *channel, const std::string &topic) + ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) CXX11_OVERRIDE { - if (IS_OPER(source) && CanOverride(source, "TOPIC")) + if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC")) { - if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetStatus(source) < STATUS_HOP)) + if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetPrefixValue(source) < HALFOP_VALUE)) { - ServerInstance->SNO->WriteToSnoMask('O',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 - return -1; + return MOD_RES_ALLOW; } - return 0; + return MOD_RES_PASSTHRU; } - virtual int 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->GetStatus(source) < chan->GetStatus(user)) || (chan->GetStatus(source) <= STATUS_VOICE)) - { - ServerInstance->SNO->WriteToSnoMask('O',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")"); + if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE)) + { + 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(User* source,User* dest,Channel* channel,int access_type) + ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector& parameters) CXX11_OVERRIDE { - if (IS_OPER(source)) - { - if (source && channel) - { - // 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 ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverDeops++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_OP: - if (CanOverride(source,"MODEOP")) - { - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverOps++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_VOICE: - if (CanOverride(source,"MODEVOICE")) - { - if ((!channel->HasUser(source)) || (mode < STATUS_HOP)) - OverVoices++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_DEVOICE: - if (CanOverride(source,"MODEDEVOICE")) - { - if ((!channel->HasUser(source)) || (mode < STATUS_HOP)) - OverDevoices++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_HALFOP: - if (CanOverride(source,"MODEHALFOP")) - { - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverHalfops++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_DEHALFOP: - if (CanOverride(source,"MODEDEHALFOP")) - { - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverDehalfops++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - } + if (!source || !channel) + return MOD_RES_PASSTHRU; + if (!source->IsOper() || !IS_LOCAL(source)) + return MOD_RES_PASSTHRU; - if (CanOverride(source,"OTHERMODE")) - { - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - { - OverriddenMode = true; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - } - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - } - } + unsigned int mode = channel->GetPrefixValue(source); - return ACR_DEFAULT; + if (mode < HALFOP_VALUE && CanOverride(source, "MODE")) + { + std::string msg = source->nick+" overriding modes:"; + for(unsigned int i=0; i < parameters.size(); i++) + msg += " " + parameters[i]; + ServerInstance->SNO->WriteGlobalSno('v',msg); + return MOD_RES_ALLOW; + } + return MOD_RES_PASSTHRU; } - virtual int 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('i') && (CanOverride(user,"INVITE"))) { - irc::string x(chan->name.c_str()); - if (!user->IsInvited(x)) + if (!IS_LOCAL(user)->IsInvited(chan)) { 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 1; + 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->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str()); - ServerInstance->SNO->WriteToSnoMask('O', user->nick+" used oper override to bypass +i on "+std::string(cname)); + chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname.c_str(), user->nick.c_str()); + ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +i on " + cname); } - return -1; + return MOD_RES_ALLOW; } - if ((chan->modes[CM_KEY]) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k')) + if (chan->IsModeSet('k') && (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 1; + 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->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str()); - ServerInstance->SNO->WriteToSnoMask('O', user->nick+" used oper override to bypass +k on "+std::string(cname)); - return -1; + chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname.c_str(), user->nick.c_str()); + ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +k on " + cname); + return MOD_RES_ALLOW; } - if ((chan->modes[CM_LIMIT]) && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT"))) + if (chan->IsModeSet('l') && (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter('l'))) && (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 1; + 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->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str()); - ServerInstance->SNO->WriteToSnoMask('O', user->nick+" used oper override to bypass +l on "+std::string(cname)); - return -1; + chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname.c_str(), user->nick.c_str()); + ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +l on " + cname); + return MOD_RES_ALLOW; } - if (CanOverride(user,"BANWALK")) + if (chan->IsBanned(user) && CanOverride(user,"BANWALK")) { - if (chan->IsBanned(user)) + if (RequireKey && keygiven != "override") { - 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 1; - } - - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str()); - ServerInstance->SNO->WriteToSnoMask('O',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname); + // 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; } - return -1; + + if (NoisyOverride) + chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname.c_str(), user->nick.c_str()); + ServerInstance->SNO->WriteGlobalSno('v',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname.c_str()); + return MOD_RES_ALLOW; } } } - return 0; - } - - virtual ~ModuleOverride() - { - ServerInstance->SNO->DisableSnomask('O'); + return MOD_RES_PASSTHRU; } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$",VF_VENDOR,API_VERSION); + return Version("Provides support for allowing opers to override certain things",VF_VENDOR); } };