X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=3e42c4f7927885f023bc9b5bf05775b21f8a28a8;hb=ccd4c11ea1a43d079eaae9708482ef4a9148796c;hp=3c45bb37db64cb35e1ce566277c2eafffea10504;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 3c45bb37d..3e42c4f79 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -1,61 +1,69 @@ -/* +------------------------------------+ - * | 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) 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" -#include "m_override.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; + static bool IsOverride(unsigned int userlevel, const std::string& modeline) + { + for (std::string::const_iterator i = modeline.begin(); i != modeline.end(); ++i) + { + ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL); + if (!mh) + continue; + + if (mh->GetLevelRequired() > userlevel) + return true; + } + return false; + } + public: - ModuleOverride() - { + void init() + { // read our config options (main config file) OnRehash(NULL); - ServerInstance->SNO->EnableSnomask('G', "GODMODE"); - if (!ServerInstance->Modules->PublishFeature("Override", this)) - { - throw ModuleException("m_override: Unable to publish feature 'Override'"); - } - Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange, I_OnRequest }; - ServerInstance->Modules->Attach(eventlist, this, 7); + 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)); } void OnRehash(User* user) { - // on a rehash we delete our classes for good measure and create them again. - ConfigReader Conf; - // 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; - } + ConfigTag* tag = ServerInstance->Config->ConfValue("override"); + NoisyOverride = tag->getBool("noisy"); + RequireKey = tag->getBool("requirekey"); } void On005Numeric(std::string &output) @@ -65,17 +73,10 @@ class ModuleOverride : public Module bool CanOverride(User* source, const char* token) { - // checks to see if the oper's type has - override_t::iterator j = overrides.find(source->oper); + std::string tokenlist = source->oper->getConfig("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)); - } - - // 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)); } @@ -85,7 +86,7 @@ class ModuleOverride : public Module { if (!channel->HasUser(source) || (channel->IsModeSet('t') && 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 @@ -102,7 +103,7 @@ class ModuleOverride : public Module // 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)) { - ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to kick "+std::string(memb->user->nick)+" on "+std::string(memb->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; } } @@ -111,21 +112,22 @@ class ModuleOverride : public Module ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector& parameters) { - if (!IS_OPER(source)) - return MOD_RES_PASSTHRU; if (!source || !channel) return MOD_RES_PASSTHRU; + if (!IS_OPER(source) || !IS_LOCAL(source)) + return MOD_RES_PASSTHRU; - unsigned int mode = 0; - if (channel->HasUser(source)) - mode = channel->GetPrefixValue(source); + unsigned int mode = channel->GetPrefixValue(source); + + if (!IsOverride(mode, parameters[1])) + return MOD_RES_PASSTHRU; - if (mode < HALFOP_VALUE && CanOverride(source, "MODE")) + if (CanOverride(source, "MODE")) { - std::string msg = std::string(source->nick)+" overriding modes:"; + std::string msg = source->nick+" overriding modes:"; for(unsigned int i=0; i < parameters.size(); i++) msg += " " + parameters[i]; - ServerInstance->SNO->WriteGlobalSno('G',msg); + ServerInstance->SNO->WriteGlobalSno('v',msg); return MOD_RES_ALLOW; } return MOD_RES_PASSTHRU; @@ -137,10 +139,10 @@ class ModuleOverride : public Module { 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(x)) { if (RequireKey && keygiven != "override") { @@ -151,12 +153,12 @@ class ModuleOverride : public Module 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)); + ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +i on "+std::string(cname)); } 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") { @@ -167,11 +169,11 @@ class ModuleOverride : public Module 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)); + ServerInstance->SNO->WriteGlobalSno('v', 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 (chan->IsModeSet('l') && (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter('l'))) && (CanOverride(user,"LIMIT"))) { if (RequireKey && keygiven != "override") { @@ -182,7 +184,7 @@ class ModuleOverride : public Module 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)); + ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +l on "+std::string(cname)); return MOD_RES_ALLOW; } @@ -197,7 +199,7 @@ class ModuleOverride : public Module 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); + ServerInstance->SNO->WriteGlobalSno('v',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname); return MOD_RES_ALLOW; } } @@ -205,25 +207,9 @@ class ModuleOverride : public Module return MOD_RES_PASSTHRU; } - 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; - } - - ~ModuleOverride() - { - ServerInstance->Modules->UnpublishFeature("Override"); - ServerInstance->SNO->DisableSnomask('G'); - } - Version GetVersion() { - return Version("Provides support for unreal-style oper-override",VF_VENDOR,API_VERSION); + return Version("Provides support for allowing opers to override certain things",VF_VENDOR); } };