X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=116042ae62f31958ceeae1857de6277a28cffc3b;hb=6ab1d0dffb8084bf6a2ad8a446a3836fa3760c8a;hp=df6eb0616b74404f62aac327e6a3edb25c2684e0;hpb=65620235afcc04cab373ed5bd3dcdae646f3a0a5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index df6eb0616..116042ae6 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -14,9 +14,6 @@ * --------------------------------------------------- */ -using namespace std; - -#include #include "users.h" #include "channels.h" #include "modules.h" @@ -31,8 +28,6 @@ class ModuleOverride : public Module Server *Srv; override_t overrides; bool NoisyOverride; - ConfigReader *Conf; - public: ModuleOverride(Server* Me) @@ -43,17 +38,16 @@ class ModuleOverride : public Module // classes. Srv = Me; - Conf = new ConfigReader; // read our config options (main config file) 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; + // re-read our config options on a rehash NoisyOverride = Conf->ReadFlag("override","noisy",0); overrides.clear(); @@ -63,6 +57,8 @@ class ModuleOverride : public Module std::string tokenlist = Conf->ReadValue("type","override",j); overrides[typen] = tokenlist; } + + DELETE(Conf); } void Implements(char* List) @@ -70,25 +66,27 @@ 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 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 strstr(j->second.c_str(),token); - } + 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"))) { @@ -110,7 +108,8 @@ class ModuleOverride : public Module { // 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) != "@"))) + std::string mode = Srv->ChanMode(source,channel); + if ((!channel->HasUser(source)) || ((mode != "%") && (mode != "@"))) { switch (access_type) { @@ -118,53 +117,71 @@ class ModuleOverride : public Module 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; + 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; + return ACR_ALLOW; } - else return ACR_DEFAULT; - break; + else + { + return ACR_DEFAULT; + } + 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; + 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; + 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; + return ACR_ALLOW; } - else return ACR_DEFAULT; - break; + else + { + return ACR_DEFAULT; + } + 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; + return ACR_ALLOW; + } + else + { + return ACR_DEFAULT; } - else return ACR_DEFAULT; - break; } } } + if (CanOverride(source,"OTHERMODE")) { return ACR_ALLOW; @@ -184,38 +201,41 @@ 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(Srv->GetServerName().c_str(), "NOTICE %s :%s invited himself into the channel", cname, user->nick); } } Srv->SendOpers("*** "+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(Srv->GetServerName().c_str(), "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)); + } + + if ((chan->limit > 0) && (Srv->CountUsers(chan) >= chan->limit) && (CanOverride(user,"LIMIT"))) + { + if (NoisyOverride) + chan->WriteChannelWithServ(Srv->GetServerName().c_str(), "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")) { // other join - return -1; + return -1; } } } @@ -224,7 +244,6 @@ class ModuleOverride : public Module virtual ~ModuleOverride() { - delete Conf; } virtual Version GetVersion() @@ -257,4 +276,3 @@ extern "C" void * init_module( void ) { return new ModuleOverrideFactory; } -