X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=b0143ea4522269714387f34ff6a5128f702f9e32;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=8dfc5dd6f724b8825ce4ee53899dd2ae72df2840;hpb=feaf72ecb48470114fbe3f3058b5f4b9622b88a5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 8dfc5dd6f..b0143ea45 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -14,45 +14,46 @@ * --------------------------------------------------- */ -using namespace std; - -#include #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "configreader.h" +#include "inspircd.h" /* $ModDesc: Provides support for unreal-style oper-override */ +typedef std::map override_t; + class ModuleOverride : public Module { - Server *Srv; - bool NoisyOverride; - ConfigReader *Conf; + override_t overrides; + bool NoisyOverride; public: - ModuleOverride(Server* Me) + ModuleOverride(InspIRCd* Me) : Module::Module(Me) - { - - // here we initialise our module. Use new to create new instances of the required - // classes. - - Srv = Me; - Conf = new ConfigReader; - + { // read our config options (main config file) - NoisyOverride = Conf->ReadFlag("override","noisy",0); + OnRehash(""); } - virtual void OnRehash(std::string parameter) + virtual void OnRehash(const std::string ¶meter) { // on a rehash we delete our classes for good measure and create them again. - delete Conf; - Conf = new ConfigReader; + 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++) + { + std::string typen = Conf->ReadValue("type","name",j); + std::string tokenlist = Conf->ReadValue("type","override",j); + overrides[typen] = tokenlist; + } + + DELETE(Conf); } void Implements(char* List) @@ -60,35 +61,33 @@ class ModuleOverride : public Module List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = 1; } - virtual void On005Numeric(std::string &output) - { - output = output + std::string(" OVERRIDE"); - } + virtual void On005Numeric(std::string &output) + { + output.append(" OVERRIDE"); + } virtual bool CanOverride(userrec* source, char* token) { // checks to see if the oper's type has - for (int j =0; j < Conf->Enumerate("type"); j++) - { - std::string typen = Conf->ReadValue("type","name",j); - if (!strcmp(typen.c_str(),source->oper)) - { - // its defined, return its value as a boolean for if the token is set - std::string tokenlist = Conf->ReadValue("type","override",j); - return strstr(tokenlist.c_str(),token); - } - } + 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 not defined at all, count as false return false; } - virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, std::string reason) + virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { if ((*source->oper) && (CanOverride(source,"KICK"))) { - if (((Srv->ChanMode(source,chan) == "%") && (Srv->ChanMode(user,chan) == "@")) || (Srv->ChanMode(source,chan) == "")) + if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE)) { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")"); + ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")"); } /* Returning -1 explicitly allows the kick */ return -1; @@ -100,65 +99,84 @@ class ModuleOverride : public Module { if (*source->oper) { - if ((Srv) && (source) && (channel)) + 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 - if ((!Srv->IsOnChannel(source,channel)) || ((Srv->ChanMode(source,channel) != "%") && (Srv->ChanMode(source,channel) != "@"))) + int mode = channel->GetStatus(source); + if ((!channel->HasUser(source)) || ((mode != STATUS_HOP) && (mode != STATUS_OP))) { 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; + 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; } - 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; + 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; } - 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; + 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; } - 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; + 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; } - 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; + 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; } - 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; + 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; } - else return ACR_DEFAULT; - break; } } } + if (CanOverride(source,"OTHERMODE")) { return ACR_ALLOW; @@ -178,38 +196,43 @@ class ModuleOverride : public Module { if (chan) { - if ((chan->binarymodes & CM_INVITEONLY) && (CanOverride(user,"INVITE"))) + if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE"))) { if (NoisyOverride) { irc::string x = chan->name; if (!user->IsInvited(x)) { - WriteChannelWithServ((char*)Srv->GetServerName().c_str(),chan,"NOTICE %s :%s invited himself into the channel",cname,user->nick); + /* 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); } } - Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride 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 (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)); + + if ((chan->key[0]) && (CanOverride(user,"KEY"))) + { + 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)); 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)); + } + + if ((chan->limit > 0) && (chan->GetUserCounter() >= chan->limit) && (CanOverride(user,"LIMIT"))) + { + 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)); return -1; - } + } if (CanOverride(user,"BANWALK")) { // other join - return -1; + if (NoisyOverride) + chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel bans", cname, user->nick); + return -1; } } } @@ -218,7 +241,6 @@ class ModuleOverride : public Module virtual ~ModuleOverride() { - delete Conf; } virtual Version GetVersion() @@ -239,7 +261,7 @@ class ModuleOverrideFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleOverride(Me); } @@ -251,4 +273,3 @@ extern "C" void * init_module( void ) { return new ModuleOverrideFactory; } -