X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=ea5e36d94cb87b32892730da9f276173d6d982d7;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=16c3a529579cb978afe2c76ea090dc3b73c74aca;hpb=80005149269014babdcacd76f2be1d7249c489eb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 16c3a5295..ea5e36d94 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -2,22 +2,17 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" +#include "m_override.h" /* $ModDesc: Provides support for unreal-style oper-override */ @@ -25,45 +20,79 @@ typedef std::map override_t; class ModuleOverride : public Module { - Server *Srv; override_t overrides; + bool RequireKey; bool NoisyOverride; + bool OverriddenMode; + bool OverOther; + int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops; + public: - - ModuleOverride(Server* Me) - : Module::Module(Me) + + ModuleOverride(InspIRCd* Me) + : Module(Me) { - - // here we initialise our module. Use new to create new instances of the required - // classes. - - Srv = Me; - // read our config options (main config file) - OnRehash(""); + OnRehash(NULL); + ServerInstance->SNO->EnableSnomask('G', "GODMODE"); + if (!ServerInstance->Modules->PublishFeature("Override", this)) + { + throw ModuleException("m_override: Unable to publish feature 'Override'"); + } + 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_OnLocalTopicChange, I_OnRequest }; + ServerInstance->Modules->Attach(eventlist, this, 8); } - - virtual void OnRehash(const std::string ¶meter) + + virtual void OnRehash(User* user) { // on a rehash we delete our classes for good measure and create them again. - ConfigReader* Conf = new ConfigReader; - + ConfigReader Conf(ServerInstance); + // re-read our config options on a rehash - NoisyOverride = Conf->ReadFlag("override","noisy",0); + NoisyOverride = Conf.ReadFlag("override", "noisy", 0); + RequireKey = Conf.ReadFlag("override", "requirekey", 0); + overrides.clear(); - for (int j =0; j < Conf->Enumerate("type"); j++) + + 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); + std::string typen = Conf.ReadValue("type","name",j); + std::string tokenlist = Conf.ReadValue("type","override",j); overrides[typen] = tokenlist; } - - delete Conf; } - void Implements(char* List) + + virtual void OnPostCommand(const std::string &command, const std::vector ¶meters, User *user, CmdResult result, const std::string &original_line) { - List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = 1; + 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; + } } virtual void On005Numeric(std::string &output) @@ -71,208 +100,229 @@ class ModuleOverride : public Module output.append(" OVERRIDE"); } - virtual bool CanOverride(userrec* source, char* token) + 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, return its value as a boolean for if the token is set - return (j->second.find(token, 0) != std::string::npos); + // 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; } - virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + + virtual int OnLocalTopicChange(User *source, Channel *channel, const std::string &topic) { - if ((*source->oper) && (CanOverride(source,"KICK"))) + if (IS_OPER(source) && CanOverride(source, "TOPIC")) { - if (((Srv->ChanMode(source,chan) == "%") && (Srv->ChanMode(user,chan) == "@")) || (Srv->ChanMode(source,chan) == "")) + if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetStatus(source) < STATUS_HOP)) { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")"); + ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name)); } - /* Returning -1 explicitly allows the kick */ + + // Explicit allow return -1; } + return 0; } - - virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) + + virtual int OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason) { - if (*source->oper) + if (IS_OPER(source) && CanOverride(source,"KICK")) { - if ((Srv) && (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 ((chan->GetStatus(source) < chan->GetStatus(user)) || (chan->GetStatus(source) <= STATUS_VOICE)) { - // 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 - std::string mode = Srv->ChanMode(source,channel); - if ((!channel->HasUser(source)) || ((mode != "%") && (mode != "@"))) + ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")"); + } + /* Returning -1 explicitly allows the kick */ + return -1; + } + return 0; + } + + virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) + { + if (!IS_OPER(source)) + return ACR_DEFAULT; + if (!source || !channel) + return ACR_DEFAULT; + + int mode = STATUS_NORMAL; + if (channel->HasUser(source)) + mode = channel->GetStatus(source); + bool over_this = false; + + switch (access_type) + { + case AC_DEOP: + if (mode < STATUS_OP && CanOverride(source,"MODEDEOP")) { - switch (access_type) - { - case AC_DEOP: - if (CanOverride(source,"MODEDEOP")) - { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Deopped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - - case AC_OP: - if (CanOverride(source,"MODEOP")) - { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Opped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - - case AC_VOICE: - if (CanOverride(source,"MODEVOICE")) - { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Voiced "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - - case AC_DEVOICE: - if (CanOverride(source,"MODEDEVOICE")) - { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Devoiced "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - - case AC_HALFOP: - if (CanOverride(source,"MODEHALFOP")) - { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Halfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - - case AC_DEHALFOP: - if (CanOverride(source,"MODEDEHALFOP")) - { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Dehalfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - } + over_this = true; + OverDeops++; } - } - - if (CanOverride(source,"OTHERMODE")) - { - return ACR_ALLOW; - } - else + break; + case AC_OP: + if (mode < STATUS_OP && CanOverride(source,"MODEOP")) + { + over_this = true; + OverOps++; + } + break; + case AC_VOICE: + if (mode < STATUS_HOP && CanOverride(source,"MODEVOICE")) + { + over_this = true; + OverVoices++; + } + break; + case AC_DEVOICE: + if (mode < STATUS_HOP && CanOverride(source,"MODEDEVOICE")) + { + over_this = true; + OverDevoices++; + } + break; + case AC_HALFOP: + if (mode < STATUS_OP && CanOverride(source,"MODEHALFOP")) + { + over_this = true; + OverHalfops++; + } + break; + case AC_DEHALFOP: + if (mode < STATUS_OP && CanOverride(source,"MODEDEHALFOP")) + { + over_this = true; + OverDehalfops++; + } + break; + case AC_GENERAL_MODE: { - return ACR_DEFAULT; + std::string modes = ServerInstance->Modes->GetLastParse(); + bool ohv_only = (modes.find_first_not_of("+-ohv") == std::string::npos); + + if (mode < STATUS_HOP && (ohv_only || CanOverride(source,"OTHERMODE"))) + { + over_this = true; + if (!ohv_only) + OverOther = true; + } } + break; } - return ACR_DEFAULT; + if (over_this) + { + OverriddenMode = true; + return ACR_ALLOW; + } + else + { + return ACR_DEFAULT; + } } - - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + + virtual int 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 (NoisyOverride) + irc::string x(chan->name.c_str()); + if (!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 */ - WriteChannelWithServ((char*)Srv->GetServerName().c_str(), chan, "NOTICE %s :%s invited himself into the channel",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 0; } + + 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)); } - Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname)); return -1; } - - if ((chan->key[0]) && (CanOverride(user,"KEY"))) + + 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 0; + } + if (NoisyOverride) - WriteChannelWithServ((char*)Srv->GetServerName().c_str(),chan,"NOTICE %s :%s bypassed the channel key",cname,user->nick); - Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride to bypass +k on "+std::string(cname)); + 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 -1; } - - if ((chan->limit > 0) && (Srv->CountUsers(chan) >= chan->limit) && (CanOverride(user,"LIMIT"))) + + 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 0; + } + if (NoisyOverride) - WriteChannelWithServ((char*)Srv->GetServerName().c_str(),chan,"NOTICE %s :%s passed through your channel limit",cname,user->nick); - Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride to bypass +l on "+std::string(cname)); + 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 -1; } - if (CanOverride(user,"BANWALK")) + if (chan->IsBanned(user) && CanOverride(user,"BANWALK")) { - // other join + 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 0; + } + + 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 -1; } } } return 0; } - - virtual ~ModuleOverride() - { - } - - virtual Version GetVersion() - { - return Version(1,0,0,1,VF_VENDOR); - } -}; - -class ModuleOverrideFactory : public ModuleFactory -{ - public: - ModuleOverrideFactory() + 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; } - - ~ModuleOverrideFactory() + + virtual ~ModuleOverride() { + ServerInstance->Modules->UnpublishFeature("Override"); + ServerInstance->SNO->DisableSnomask('G'); } - - virtual Module * CreateModule(Server* Me) + + virtual Version GetVersion() { - return new ModuleOverride(Me); + return Version("$Id$",VF_VENDOR,API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleOverrideFactory; -} +MODULE_INIT(ModuleOverride)