X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=ea5e36d94cb87b32892730da9f276173d6d982d7;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=8d01833d6cc846dcb3431ddad3b73365c72baeba;hpb=61d3a678caa80cba61087ffc9c6fb79a906f2624;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 8d01833d6..ea5e36d94 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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. @@ -12,7 +12,7 @@ */ #include "inspircd.h" -#include "wildcard.h" +#include "m_override.h" /* $ModDesc: Provides support for unreal-style oper-override */ @@ -20,11 +20,11 @@ typedef std::map override_t; class ModuleOverride : public Module { - override_t overrides; bool RequireKey; bool NoisyOverride; bool OverriddenMode; + bool OverOther; int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops; public: @@ -33,52 +33,64 @@ class ModuleOverride : public Module : Module(Me) { // read our config options (main config file) - OnRehash(NULL,""); - ServerInstance->SNO->EnableSnomask('O', "OVERRIDE"); - OverriddenMode = false; + 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 }; - ServerInstance->Modules->Attach(eventlist, this, 7); + 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(User* user, 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(ServerInstance); + ConfigReader Conf(ServerInstance); // re-read our config options on a rehash - NoisyOverride = Conf->ReadFlag("override", "noisy", 0); - RequireKey = Conf->ReadFlag("override", "requirekey", 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; } virtual void OnPostCommand(const std::string &command, const std::vector ¶meters, User *user, CmdResult result, const std::string &original_line) { - if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS)) + if (OverriddenMode) { - 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; + 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; } } @@ -110,7 +122,7 @@ class ModuleOverride : public Module { if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetStatus(source) < STATUS_HOP)) { - ServerInstance->SNO->WriteToSnoMask('O',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name)); + ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name)); } // Explicit allow @@ -126,8 +138,8 @@ 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 ((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+")"); + { + 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; @@ -137,113 +149,84 @@ class ModuleOverride : public Module virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) { - if (IS_OPER(source)) + 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) { - 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 (mode < STATUS_OP && CanOverride(source,"MODEDEOP")) { - case AC_DEOP: - if (CanOverride(source,"MODEDEOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverDeops++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_OP: - if (CanOverride(source,"MODEOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverOps++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_VOICE: - if (CanOverride(source,"MODEVOICE")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_HOP)) - OverVoices++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_DEVOICE: - if (CanOverride(source,"MODEDEVOICE")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_HOP)) - OverDevoices++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_HALFOP: - if (CanOverride(source,"MODEHALFOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverHalfops++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; - case AC_DEHALFOP: - if (CanOverride(source,"MODEDEHALFOP")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - OverDehalfops++; - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } - break; + over_this = true; + OverDeops++; } - - if (CanOverride(source,"OTHERMODE")) + break; + case AC_OP: + if (mode < STATUS_OP && CanOverride(source,"MODEOP")) { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - { - OverriddenMode = true; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - } - return ACR_ALLOW; + 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++; } - else + break; + case AC_GENERAL_MODE: + { + 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"))) { - return ACR_DEFAULT; + 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(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) @@ -261,12 +244,12 @@ class ModuleOverride : public Module { // 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; + 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->WriteToSnoMask('O', user->nick+" used oper override to bypass +i on "+std::string(cname)); + ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +i on "+std::string(cname)); } return -1; } @@ -277,45 +260,42 @@ class ModuleOverride : public Module { // 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; + return 0; } 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)); + ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +k on "+std::string(cname)); return -1; } - if ((chan->modes[CM_LIMIT]) && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (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 1; + return 0; } 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)); + 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")) { - 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->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; } } @@ -323,14 +303,25 @@ class ModuleOverride : public Module return 0; } + 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; + } + virtual ~ModuleOverride() { - ServerInstance->SNO->DisableSnomask('O'); + ServerInstance->Modules->UnpublishFeature("Override"); + ServerInstance->SNO->DisableSnomask('G'); } virtual Version GetVersion() { - return Version(1,2,0,1,VF_VENDOR,API_VERSION); + return Version("$Id$",VF_VENDOR,API_VERSION); } };