X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=054d56a4b1d4be9238deb4e2103a0675c064e95f;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=50b2cfce85befcca0515b652bc21c80bd97e2a1a;hpb=4b0f6c610f755e0cb93843d5a2a6c70336eafe39;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 50b2cfce8..054d56a4b 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -2,22 +2,15 @@ * | 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" @@ -29,6 +22,7 @@ class ModuleOverride : public Module { override_t overrides; + bool RequireKey; bool NoisyOverride; bool OverriddenMode; int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops; @@ -36,23 +30,28 @@ class ModuleOverride : public Module public: ModuleOverride(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { // read our config options (main config file) - OnRehash(""); - ServerInstance->SNO->EnableSnomask('O',"OVERRIDE"); + 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); @@ -60,15 +59,11 @@ class ModuleOverride : public Module overrides[typen] = tokenlist; } - DELETE(Conf); + delete Conf; } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = List[I_OnPostCommand] = 1; - } - virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) + 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)) { @@ -93,24 +88,24 @@ 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)) { @@ -122,9 +117,9 @@ 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) { @@ -134,7 +129,6 @@ class ModuleOverride : public Module switch (access_type) { case AC_DEOP: - ServerInstance->Log(DEBUG,"Override access check AC_DEOP"); if (CanOverride(source,"MODEDEOP")) { if (NoisyOverride) @@ -148,7 +142,6 @@ class ModuleOverride : public Module } break; case AC_OP: - ServerInstance->Log(DEBUG,"Override access check AC_OP"); if (CanOverride(source,"MODEOP")) { if (NoisyOverride) @@ -162,7 +155,6 @@ class ModuleOverride : public Module } break; case AC_VOICE: - ServerInstance->Log(DEBUG,"Override access check AC_VOICE"); if (CanOverride(source,"MODEVOICE")) { if (NoisyOverride) @@ -176,7 +168,6 @@ class ModuleOverride : public Module } break; case AC_DEVOICE: - ServerInstance->Log(DEBUG,"Override access check AC_DEVOICE"); if (CanOverride(source,"MODEDEVOICE")) { if (NoisyOverride) @@ -190,7 +181,6 @@ class ModuleOverride : public Module } break; case AC_HALFOP: - ServerInstance->Log(DEBUG,"Override access check AC_HALFOP"); if (CanOverride(source,"MODEHALFOP")) { if (NoisyOverride) @@ -204,7 +194,6 @@ class ModuleOverride : public Module } break; case AC_DEHALFOP: - ServerInstance->Log(DEBUG,"Override access check AC_DEHALFOP"); if (CanOverride(source,"MODEDEHALFOP")) { if (NoisyOverride) @@ -224,7 +213,6 @@ class ModuleOverride : public Module if (NoisyOverride) if ((!channel->HasUser(source)) || (mode < STATUS_OP)) { - ServerInstance->Log(DEBUG,"Overridden mode"); OverriddenMode = true; OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0; } @@ -240,40 +228,58 @@ class ModuleOverride : public Module return ACR_DEFAULT; } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + 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->SNO->WriteToSnoMask('O',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->SNO->WriteToSnoMask('O',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->SNO->WriteToSnoMask('O',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; } @@ -281,11 +287,16 @@ class ModuleOverride : public Module { if (chan->IsBanned(user)) { - if (NoisyOverride) + if (RequireKey && keygiven != "override") { - 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", 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 channel ban", cname, user->nick); + ServerInstance->SNO->WriteToSnoMask('O',"%s used oper override to bypass channel ban on %s", user->nick, cname); } return -1; } @@ -301,31 +312,8 @@ class ModuleOverride : public Module virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR,API_VERSION); - } -}; - - -class ModuleOverrideFactory : public ModuleFactory -{ - public: - ModuleOverrideFactory() - { + return Version(1,2,0,1,VF_VENDOR,API_VERSION); } - - ~ModuleOverrideFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleOverride(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleOverrideFactory; -} +MODULE_INIT(ModuleOverride)