X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=3c45bb37db64cb35e1ce566277c2eafffea10504;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=224a18ae477feb28351bdf311abe13201b11dc5c;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 224a18ae4..3c45bb37d 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-2007 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,75 +20,50 @@ typedef std::map override_t; class ModuleOverride : public Module { - override_t overrides; + bool RequireKey; bool NoisyOverride; - bool OverriddenMode; - int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops; public: - - ModuleOverride(InspIRCd* Me) - : Module(Me) - { + + ModuleOverride() + { // read our config options (main config file) - OnRehash(NULL,""); - ServerInstance->SNO->EnableSnomask('O',"OVERRIDE"); - OverriddenMode = false; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand }; - ServerInstance->Modules->Attach(eventlist, this, 6); - } - - virtual void OnRehash(User* user, const std::string ¶meter) - { - // 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++) + OnRehash(NULL); + ServerInstance->SNO->EnableSnomask('G', "GODMODE"); + if (!ServerInstance->Modules->PublishFeature("Override", this)) { - std::string typen = Conf->ReadValue("type","name",j); - std::string tokenlist = Conf->ReadValue("type","override",j); - overrides[typen] = tokenlist; + throw ModuleException("m_override: Unable to publish feature 'Override'"); } - - DELETE(Conf); + Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange, I_OnRequest }; + ServerInstance->Modules->Attach(eventlist, this, 7); } - void Implements(char* List) + void OnRehash(User* user) { - List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = List[I_OnPostCommand] = 1; - } + // on a rehash we delete our classes for good measure and create them again. + ConfigReader Conf; - virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line) - { - if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS)) + // 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++) { - 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; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; + std::string typen = Conf.ReadValue("type","name",j); + std::string tokenlist = Conf.ReadValue("type","override",j); + overrides[typen] = tokenlist; } } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::string &output) { output.append(" OVERRIDE"); } - virtual bool CanOverride(User* source, const 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); @@ -103,189 +78,152 @@ class ModuleOverride : public Module return false; } - virtual int OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason) + + ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) { - if (IS_OPER(source) && 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',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 */ - return -1; + + // Explicit allow + return MOD_RES_ALLOW; } - return 0; + + return MOD_RES_PASSTHRU; } - - virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) + + ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) { - if (IS_OPER(source)) + 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: - 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; - } - - if (CanOverride(source,"OTHERMODE")) - { - if (NoisyOverride) - if ((!channel->HasUser(source)) || (mode < STATUS_OP)) - { - OverriddenMode = true; - OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; - } - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } + 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+")"); + return MOD_RES_ALLOW; } } + return MOD_RES_PASSTHRU; + } + + 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; - return ACR_DEFAULT; + unsigned int mode = 0; + if (channel->HasUser(source)) + 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); + return MOD_RES_ALLOW; + } + return MOD_RES_PASSTHRU; } - - virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) + + ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { - if (IS_OPER(user)) + if (IS_LOCAL(user) && IS_OPER(user)) { if (chan) { if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE"))) { - irc::string x = chan->name; + irc::string x(chan->name.c_str()); if (!user->IsInvited(x)) { - /* XXX - Ugly cast for a parameter that isn't used? :< - Om */ + 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 invite-only", cname, user->nick); - ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname)); + 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)); } - return -1; + return MOD_RES_ALLOW; } - - if ((*chan->key) && (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 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('G', 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->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 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('G', 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 on %s", user->nick, 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 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('G',"%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; + } + + 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() + + ~ModuleOverride() { - ServerInstance->SNO->DisableSnomask('O'); + ServerInstance->Modules->UnpublishFeature("Override"); + ServerInstance->SNO->DisableSnomask('G'); } - - virtual Version GetVersion() + + Version GetVersion() { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version("Provides support for unreal-style oper-override",VF_VENDOR,API_VERSION); } };