X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=054d56a4b1d4be9238deb4e2103a0675c064e95f;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=ca0deda470003b60045f9037903c71cac8975468;hpb=00e8cce2195bed557469d2d76ed8a8e901a0bc8f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index ca0deda47..054d56a4b 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -2,59 +2,56 @@ * | 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-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#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 */ - - 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::Module(Me) - { - - // here we initialise our module. Use new to create new instances of the required - // classes. - - - + : Module(Me) + { // read our config options (main config file) - OnRehash(""); + 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(const std::string ¶meter) + 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); + 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); @@ -62,12 +59,28 @@ class ModuleOverride : public Module overrides[typen] = tokenlist; } - DELETE(Conf); + 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 ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS)) + { + 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; + } } virtual void On005Numeric(std::string &output) @@ -75,28 +88,28 @@ 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 OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason) { - if ((*source->oper) && (CanOverride(source,"KICK"))) + if (IS_OPER(source) && CanOverride(source,"KICK")) { if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE)) { - ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")"); + ServerInstance->SNO->WriteToSnoMask('O',std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")"); } /* Returning -1 explicitly allows the kick */ return -1; @@ -104,143 +117,187 @@ class ModuleOverride : public Module return 0; } - virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) + virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) { - if (*source->oper) + if (IS_OPER(source)) { 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); - if ((!channel->HasUser(source)) || ((mode != STATUS_HOP) && (mode != STATUS_OP))) + switch (access_type) { - 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)) { - case AC_DEOP: - if (CanOverride(source,"MODEDEOP")) - { - ServerInstance->WriteOpers("*** 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")) - { - ServerInstance->WriteOpers("*** 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")) - { - ServerInstance->WriteOpers("*** 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")) - { - ServerInstance->WriteOpers("*** 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")) - { - ServerInstance->WriteOpers("*** 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")) - { - ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Dehalfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; - } + OverriddenMode = true; + OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; } + return ACR_ALLOW; + } + else + { + return ACR_DEFAULT; } - } - - if (CanOverride(source,"OTHERMODE")) - { - return ACR_ALLOW; - } - else - { - return ACR_DEFAULT; } } 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; + 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 */ - 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); + return 1; } + + 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 oper override to bypass +i on "+std::string(cname)); } - ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname)); return -1; } - if ((chan->key[0]) && (CanOverride(user,"KEY"))) + if ((*chan->key) && (CanOverride(user,"KEY")) && strcasecmp(keygiven.c_str(), chan->key)) { + 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); + return 1; + } + if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel key", cname, user->nick); - ServerInstance->WriteOpers("*** "+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); + ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used oper override to bypass +k on "+std::string(cname)); return -1; } if ((chan->limit > 0) && (chan->GetUserCounter() >= chan->limit) && (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); + return 1; + } + if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel limit", cname, user->nick); - ServerInstance->WriteOpers("*** "+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); + ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used oper override to bypass +l on "+std::string(cname)); return -1; } if (CanOverride(user,"BANWALK")) { - // other join - if (NoisyOverride) - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel bans", cname, user->nick); + if (chan->IsBanned(user)) + { + 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); + return 1; + } + + 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); + } return -1; } } @@ -250,35 +307,13 @@ class ModuleOverride : public Module virtual ~ModuleOverride() { + ServerInstance->SNO->DisableSnomask('O'); } virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR); - } -}; - - -class ModuleOverrideFactory : public ModuleFactory -{ - public: - ModuleOverrideFactory() - { - } - - ~ModuleOverrideFactory() - { + return Version(1,2,0,1,VF_VENDOR,API_VERSION); } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleOverride(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleOverrideFactory; -} +MODULE_INIT(ModuleOverride)