* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2007 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"
/* $ModDesc: Provides support for unreal-style oper-override */
-
-
typedef std::map<std::string,std::string> override_t;
class ModuleOverride : public Module
override_t overrides;
bool NoisyOverride;
+ bool OverriddenMode;
+ int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops;
+
public:
ModuleOverride(InspIRCd* Me)
: Module::Module(Me)
- {
-
- // here we initialise our module. Use new to create new instances of the required
- // classes.
-
-
-
+ {
// read our config options (main config file)
- OnRehash("");
+ OnRehash(NULL,"");
+ ServerInstance->SNO->EnableSnomask('O',"OVERRIDE");
+ OverriddenMode = false;
+ OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
}
- virtual void OnRehash(const std::string ¶meter)
+ virtual void OnRehash(userrec* user, const std::string ¶meter)
{
// on a rehash we delete our classes for good measure and create them again.
ConfigReader* Conf = new ConfigReader(ServerInstance);
void Implements(char* List)
{
- List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = 1;
+ 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)
+ {
+ if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
+ {
+ int Total = OverOps + OverDeops + OverVoices + OverDevoices + OverHalfops + OverDehalfops;
+
+ ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" Overriding modes: "+ServerInstance->Modes->GetLastParse()+" "+(Total ? "[Detail: " : "")+
+ (OverOps ? ConvToStr(OverOps)+" op"+(OverOps != 1 ? "s" : "")+" " : "")+
+ (OverDeops ? ConvToStr(OverDeops)+" deop"+(OverDeops != 1 ? "s" : "")+" " : "")+
+ (OverVoices ? ConvToStr(OverVoices)+" voice"+(OverVoices != 1 ? "s" : "")+" " : "")+
+ (OverDevoices ? ConvToStr(OverDevoices)+" devoice"+(OverDevoices != 1 ? "s" : "")+" " : "")+
+ (OverHalfops ? ConvToStr(OverHalfops)+" halfop"+(OverHalfops != 1 ? "s" : "")+" " : "")+
+ (OverDehalfops ? ConvToStr(OverDehalfops)+" dehalfop"+(OverDehalfops != 1 ? "s" : "") : "")
+ +(Total ? "]" : ""));
+
+ OverriddenMode = false;
+ OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
+ }
}
virtual void On005Numeric(std::string &output)
{
// 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 (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;
}
{
if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE))
{
- ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+ ServerInstance->SNO->WriteToSnoMask('O',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
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"))
+ {
+ if (NoisyOverride)
+ if ((!channel->HasUser(source)) || (mode < STATUS_OP))
+ OverDeops++;
+ return ACR_ALLOW;
+ }
+ else
+ {
+ return ACR_DEFAULT;
+ }
+ break;
+ case AC_OP:
+ if (CanOverride(source,"MODEOP"))
+ {
+ if (NoisyOverride)
+ if ((!channel->HasUser(source)) || (mode < STATUS_OP))
+ OverOps++;
+ return ACR_ALLOW;
+ }
+ else
+ {
+ return ACR_DEFAULT;
+ }
+ break;
+ case AC_VOICE:
+ if (CanOverride(source,"MODEVOICE"))
+ {
+ if (NoisyOverride)
+ if ((!channel->HasUser(source)) || (mode < STATUS_HOP))
+ OverVoices++;
+ return ACR_ALLOW;
+ }
+ else
+ {
+ return ACR_DEFAULT;
+ }
+ break;
+ case AC_DEVOICE:
+ if (CanOverride(source,"MODEDEVOICE"))
+ {
+ if (NoisyOverride)
+ if ((!channel->HasUser(source)) || (mode < STATUS_HOP))
+ OverDevoices++;
+ return ACR_ALLOW;
+ }
+ else
+ {
+ return ACR_DEFAULT;
+ }
+ break;
+ case AC_HALFOP:
+ if (CanOverride(source,"MODEHALFOP"))
+ {
+ if (NoisyOverride)
+ if ((!channel->HasUser(source)) || (mode < STATUS_OP))
+ OverHalfops++;
+ return ACR_ALLOW;
+ }
+ else
+ {
+ return ACR_DEFAULT;
+ }
+ break;
+ case AC_DEHALFOP:
+ if (CanOverride(source,"MODEDEHALFOP"))
+ {
+ if (NoisyOverride)
+ if ((!channel->HasUser(source)) || (mode < STATUS_OP))
+ OverDehalfops++;
+ return ACR_ALLOW;
+ }
+ else
+ {
+ return ACR_DEFAULT;
+ }
+ break;
+ }
+
+ if (CanOverride(source,"OTHERMODE"))
{
- switch (access_type)
+ if (NoisyOverride)
+ if ((!channel->HasUser(source)) || (mode < STATUS_OP))
{
- case AC_DEOP:
- if (CanOverride(source,"MODEDEOP"))
- {
- 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;
- }
-
- case AC_OP:
- if (CanOverride(source,"MODEOP"))
- {
- 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;
- }
-
- case AC_VOICE:
- if (CanOverride(source,"MODEVOICE"))
- {
- 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;
- }
-
- case AC_DEVOICE:
- if (CanOverride(source,"MODEDEVOICE"))
- {
- 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;
- }
-
- case AC_HALFOP:
- if (CanOverride(source,"MODEHALFOP"))
- {
- 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;
- }
-
- case AC_DEHALFOP:
- if (CanOverride(source,"MODEDEHALFOP"))
- {
- 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;
- }
+ OverriddenMode = true;
+ OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
}
+ return ACR_ALLOW;
+ }
+ else
+ {
+ return ACR_DEFAULT;
}
- }
-
- if (CanOverride(source,"OTHERMODE"))
- {
- return ACR_ALLOW;
- }
- else
- {
- return ACR_DEFAULT;
}
}
return ACR_DEFAULT;
}
- virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+ virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
{
if (*user->oper)
{
{
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))
- {
- /* 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);
- }
+ /* XXX - Ugly cast for a parameter that isn't used? :< - Om */
+ 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 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 ((*chan->key) && (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));
+ 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));
return -1;
}
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));
+ 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));
return -1;
}
if (CanOverride(user,"BANWALK"))
{
- // other join
+ if (chan->IsBanned(user))
+ {
+ 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;
}
}
virtual ~ModuleOverride()
{
+ ServerInstance->SNO->DisableSnomask('O');
}
virtual Version GetVersion()
{
- return Version(1,0,0,1,VF_VENDOR);
+ return Version(1,1,0,1,VF_VENDOR,API_VERSION);
}
};