* ---------------------------------------------------
*/
-using namespace std;
-
-#include <stdio.h>
#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 */
+extern InspIRCd* ServerInstance;
+
typedef std::map<std::string,std::string> override_t;
class ModuleOverride : public Module
Server *Srv;
override_t overrides;
bool NoisyOverride;
- ConfigReader *Conf;
-
public:
ModuleOverride(Server* Me)
// 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();
std::string tokenlist = Conf->ReadValue("type","override",j);
overrides[typen] = tokenlist;
}
+
+ DELETE(Conf);
}
void Implements(char* List)
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 <type:override>
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")))
{
- 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;
{
// 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;
- break;
+ else
+ {
+ return ACR_DEFAULT;
+ }
+
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;
- 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;
+ 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;
- break;
+ else
+ {
+ return ACR_DEFAULT;
+ }
+
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;
- 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;
+ 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;
{
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 invited himself into the channel", 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 bypassed 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 passed through your 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;
+ return -1;
}
}
}
virtual ~ModuleOverride()
{
- delete Conf;
}
virtual Version GetVersion()
{
return new ModuleOverrideFactory;
}
-
projects / user / henk / code / inspircd.git / blobdiff