X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=3e42c4f7927885f023bc9b5bf05775b21f8a28a8;hb=3e20f7bd2959fb1f267ba03b0387443b1c30cba1;hp=3d97be577d21395626dc07f2b0529b574bd86a53;hpb=d4ec79a385b05e6ba54ec22457f043307f5a1af9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 3d97be577..3e42c4f79 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -1,304 +1,216 @@ -/* +------------------------------------+ - * | 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) 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 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 "configreader.h" -#include "inspircd.h" -#include "wildcard.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; - public: - - ModuleOverride(InspIRCd* Me) - : Module::Module(Me) - { - // read our config options (main config file) - OnRehash(""); - ServerInstance->SNO->EnableSnomask('O',"OVERRIDE"); - } - - virtual void OnRehash(const std::string ¶meter) + + static bool IsOverride(unsigned int userlevel, const std::string& modeline) { - // 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 (std::string::const_iterator i = modeline.begin(); i != modeline.end(); ++i) { - std::string typen = Conf->ReadValue("type","name",j); - std::string tokenlist = Conf->ReadValue("type","override",j); - overrides[typen] = tokenlist; + ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL); + if (!mh) + continue; + + if (mh->GetLevelRequired() > userlevel) + return true; } - - DELETE(Conf); + return false; + } + + public: + + void init() + { + // read our config options (main config file) + 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)); } - void Implements(char* List) + void OnRehash(User* user) { - List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = 1; + // re-read our config options on a rehash + ConfigTag* tag = ServerInstance->Config->ConfValue("override"); + NoisyOverride = tag->getBool("noisy"); + RequireKey = tag->getBool("requirekey"); } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::string &output) { output.append(" 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 (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; + 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 int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + + ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) { - if ((*source->oper) && (CanOverride(source,"KICK"))) + if (IS_LOCAL(source) && IS_OPER(source) && 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('t') && channel->GetPrefixValue(source) < HALFOP_VALUE)) { - ServerInstance->SNO->WriteToSnoMask('O',"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) { - ServerInstance->Log(DEBUG,"Override access check"); - if (*source->oper) + if (IS_OPER(source) && 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)) { - // 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: - ServerInstance->Log(DEBUG,"Override access check AC_DEOP"); - if (CanOverride(source,"MODEDEOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Deopped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_OP: - ServerInstance->Log(DEBUG,"Override access check AC_OP"); - if (CanOverride(source,"MODEOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Opped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_VOICE: - ServerInstance->Log(DEBUG,"Override access check AC_VOICE"); - if (CanOverride(source,"MODEVOICE")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_HOP)) - ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Voiced "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_DEVOICE: - ServerInstance->Log(DEBUG,"Override access check AC_DEVOICE"); - if (CanOverride(source,"MODEDEVOICE")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_HOP)) - ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Devoiced "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_HALFOP: - ServerInstance->Log(DEBUG,"Override access check AC_HALFOP"); - if (CanOverride(source,"MODEHALFOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Halfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_DEHALFOP: - ServerInstance->Log(DEBUG,"Override access check AC_DEHALFOP"); - if (CanOverride(source,"MODEDEHALFOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Dehalfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - } - - if (CanOverride(source,"OTHERMODE")) - { - ServerInstance->Log(DEBUG,"Override access check other mode"); - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" changed modes 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; + } + + ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector& parameters) + { + if (!source || !channel) + return MOD_RES_PASSTHRU; + if (!IS_OPER(source) || !IS_LOCAL(source)) + return MOD_RES_PASSTHRU; - return ACR_DEFAULT; + unsigned int mode = channel->GetPrefixValue(source); + + if (!IsOverride(mode, parameters[1])) + return MOD_RES_PASSTHRU; + + if (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(userrec* user, chanrec* chan, const char* cname) + + ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { - if (*user->oper) + if (IS_LOCAL(user) && IS_OPER(user)) { if (chan) { - if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE"))) + if (chan->IsModeSet('i') && (CanOverride(user,"INVITE"))) { - if (NoisyOverride) + irc::string x(chan->name.c_str()); + if (!IS_LOCAL(user)->IsInvited(x)) { - irc::string x = chan->name; - if (!user->IsInvited(x)) + if (RequireKey && keygiven != "override") { - /* XXX - Ugly cast for a parameter that isn't used? :< - Om */ - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass invite-only", cname, user->nick); + // 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('v', user->nick+" used oper override to bypass +i on "+std::string(cname)); } - ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname)); - return -1; + return MOD_RES_ALLOW; } - - if ((chan->key[0]) && (CanOverride(user,"KEY"))) + + 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 MOD_RES_PASSTHRU; + } + 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; + chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str()); + ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +k on "+std::string(cname)); + return MOD_RES_ALLOW; } - - if ((chan->limit > 0) && (chan->GetUserCounter() >= chan->limit) && (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 MOD_RES_PASSTHRU; + } + 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; + chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str()); + ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +l on "+std::string(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 (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", cname, user->nick); - } + // 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; } - 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->WriteGlobalSno('v',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname); + return MOD_RES_ALLOW; } } } - return 0; + return MOD_RES_PASSTHRU; } - - virtual ~ModuleOverride() - { - ServerInstance->SNO->DisableSnomask('O'); - } - - virtual Version GetVersion() - { - return Version(1,0,0,1,VF_VENDOR); - } -}; - -class ModuleOverrideFactory : public ModuleFactory -{ - public: - ModuleOverrideFactory() + Version GetVersion() { + return Version("Provides support for allowing opers to override certain things",VF_VENDOR); } - - ~ModuleOverrideFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleOverride(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleOverrideFactory; -} +MODULE_INIT(ModuleOverride)