X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=d931891c2e67a1ad86e578e6224da831cdd303fe;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=58fa0ac4882eab3885203de4cda229470140ef1b;hpb=981ca37d6641404548a13623b90438f8f1c87ded;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 58fa0ac48..d931891c2 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -2,25 +2,16 @@ * | 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. * * --------------------------------------------------- */ -using namespace std; - -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides support for unreal-style oper-override */ @@ -28,234 +19,196 @@ typedef std::map override_t; class ModuleOverride : public Module { - Server *Srv; override_t overrides; + bool RequireKey; bool NoisyOverride; - ConfigReader *Conf; - + public: - - ModuleOverride(Server* Me) - : Module::Module(Me) - { - - // here we initialise our module. Use new to create new instances of the required - // classes. - - Srv = Me; - Conf = new ConfigReader; - + + ModuleOverride() + { // read our config options (main config file) - OnRehash(""); + OnRehash(NULL); + ServerInstance->SNO->EnableSnomask('G', "GODMODE"); + Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange }; + ServerInstance->Modules->Attach(eventlist, this, 6); } - - virtual void OnRehash(const std::string ¶meter) + + void OnRehash(User* user) { // on a rehash we delete our classes for good measure and create them again. - delete Conf; - Conf = new ConfigReader; + ConfigReader Conf; + // 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; } } - void Implements(char* List) + void On005Numeric(std::string &output) { - List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = 1; + output.append(" OVERRIDE"); } - virtual void On005Numeric(std::string &output) - { - output = output + std::string(" OVERRIDE"); - } - - virtual bool CanOverride(userrec* source, 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); + override_t::iterator j = overrides.find(source->oper->name); + if (j != overrides.end()) - { - // its defined, return its value as a boolean for if the token is set - return strstr(j->second.c_str(),token); - } + { + // 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) + + ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) { - if ((*source->oper) && (CanOverride(source,"KICK"))) + if (IS_LOCAL(source) && 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->GetPrefixValue(source) < HALFOP_VALUE)) { - 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 */ - return -1; + + // Explicit allow + return MOD_RES_ALLOW; } - return 0; + + return MOD_RES_PASSTHRU; } - - virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) + + ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) { - if (*source->oper) + if (IS_OPER(source) && CanOverride(source,"KICK")) { - if ((Srv) && (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 - std::string mode = Srv->ChanMode(source,channel); - if ((!channel->HasUser(source)) || ((mode != "%") && (mode != "@"))) - { - 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; - break; - 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; - break; - 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; - break; - 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; - break; - 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; - break; - 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; - break; - } - } - } - if (CanOverride(source,"OTHERMODE")) - { - return ACR_ALLOW; - } - else + // 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)) { - 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; + + unsigned int mode = 0; + if (channel->HasUser(source)) + mode = channel->GetPrefixValue(source); - return ACR_DEFAULT; + 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(userrec* user, chanrec* chan, const char* cname) + + ModResult 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->binarymodes & CM_INVITEONLY) && (CanOverride(user,"INVITE"))) + if (chan->IsModeSet('i') && (CanOverride(user,"INVITE"))) { - if (NoisyOverride) + irc::string x(chan->name.c_str()); + if (!IS_LOCAL(user)->IsInvited(x)) { - irc::string x = chan->name; - if (!user->IsInvited(x)) + if (RequireKey && keygiven != "override") { - 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 MOD_RES_PASSTHRU; } + + 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)); } - Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname)); - return -1; + return MOD_RES_ALLOW; } - if ((chan->key[0]) && (CanOverride(user,"KEY"))) - { - 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)); - return -1; - } - if ((chan->limit >= Srv->CountUsers(chan)) && (CanOverride(user,"LIMIT"))) - { - 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)); - return -1; - } - - if (CanOverride(user,"BANWALK")) + + if (chan->IsModeSet('k') && (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.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)); + return MOD_RES_ALLOW; + } + + if (chan->IsModeSet('l') && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT"))) { - // other join - return -1; + 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.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)); + return MOD_RES_ALLOW; + } + + if (chan->IsBanned(user) && CanOverride(user,"BANWALK")) + { + 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.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); + return MOD_RES_ALLOW; } } } - return 0; - } - - virtual ~ModuleOverride() - { - delete Conf; + return MOD_RES_PASSTHRU; } - - virtual Version GetVersion() - { - return Version(1,0,0,1,VF_VENDOR); - } -}; - -class ModuleOverrideFactory : public ModuleFactory -{ - public: - ModuleOverrideFactory() - { - } - - ~ModuleOverrideFactory() + ~ModuleOverride() { + ServerInstance->SNO->DisableSnomask('G'); } - - virtual Module * CreateModule(Server* Me) + + Version GetVersion() { - return new ModuleOverride(Me); + return Version("Provides support for unreal-style oper-override",VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleOverrideFactory; -} - +MODULE_INIT(ModuleOverride)