X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=1e875a3d67456d656df3c0db9e32a61827611a8d;hb=9539fa9d7bcb19100bd5b7f67d6f792e48fff909;hp=d931891c2e67a1ad86e578e6224da831cdd303fe;hpb=df37ab42f454e3a96d59a2a86eb76bcb4af0818a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index d931891c2..1e875a3d6 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -1,25 +1,35 @@ -/* +------------------------------------+ - * | 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" /* $ModDesc: Provides support for unreal-style oper-override */ -typedef std::map override_t; - class ModuleOverride : public Module { - override_t overrides; bool RequireKey; bool NoisyOverride; @@ -29,7 +39,7 @@ class ModuleOverride : public Module { // read our config options (main config file) OnRehash(NULL); - ServerInstance->SNO->EnableSnomask('G', "GODMODE"); + ServerInstance->SNO->EnableSnomask('v', "OVERRIDE"); Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange }; ServerInstance->Modules->Attach(eventlist, this, 6); } @@ -42,15 +52,6 @@ class ModuleOverride : public Module // 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; - } } void On005Numeric(std::string &output) @@ -60,17 +61,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->name); + 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)); } @@ -80,7 +74,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',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name)); } // Explicit allow @@ -97,7 +91,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',std::string(source->nick)+" used oper override to kick "+std::string(memb->user->nick)+" on "+std::string(memb->chan->name)+" ("+reason+")"); return MOD_RES_ALLOW; } } @@ -106,21 +100,19 @@ 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 (mode < HALFOP_VALUE && CanOverride(source, "MODE")) { std::string msg = std::string(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; @@ -146,7 +138,7 @@ class ModuleOverride : public Module if (NoisyOverride) chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "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; } @@ -162,7 +154,7 @@ class ModuleOverride : public Module if (NoisyOverride) chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "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; } @@ -177,7 +169,7 @@ class ModuleOverride : public Module if (NoisyOverride) chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "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; } @@ -192,7 +184,7 @@ class ModuleOverride : public Module if (NoisyOverride) chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "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; } } @@ -200,11 +192,6 @@ class ModuleOverride : public Module return MOD_RES_PASSTHRU; } - ~ModuleOverride() - { - ServerInstance->SNO->DisableSnomask('G'); - } - Version GetVersion() { return Version("Provides support for unreal-style oper-override",VF_VENDOR);