* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
override_t overrides;
bool RequireKey;
bool NoisyOverride;
- bool OverriddenMode;
- int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops;
public:
- ModuleOverride(InspIRCd* Me)
- : Module(Me)
- {
+ ModuleOverride()
+ {
// read our config options (main config file)
- OnRehash(NULL,"");
+ OnRehash(NULL);
ServerInstance->SNO->EnableSnomask('G', "GODMODE");
- OverriddenMode = false;
- OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
- Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand, I_OnLocalTopicChange };
- ServerInstance->Modules->Attach(eventlist, this, 7);
+ Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange };
+ ServerInstance->Modules->Attach(eventlist, this, 6);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ void OnRehash(User* user)
{
// on a rehash we delete our classes for good measure and create them again.
- ConfigReader* Conf = new ConfigReader(ServerInstance);
+ ConfigReader Conf;
// re-read our config options on a rehash
- NoisyOverride = Conf->ReadFlag("override", "noisy", 0);
- RequireKey = Conf->ReadFlag("override", "requirekey", 0);
+ NoisyOverride = Conf.ReadFlag("override", "noisy", 0);
+ RequireKey = Conf.ReadFlag("override", "requirekey", 0);
overrides.clear();
- for (int j =0; j < Conf->Enumerate("type"); j++)
+ 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);
+ std::string typen = Conf.ReadValue("type","name",j);
+ std::string tokenlist = Conf.ReadValue("type","override",j);
overrides[typen] = tokenlist;
}
-
- delete Conf;
- }
-
-
- virtual void OnPostCommand(const std::string &command, const std::vector<std::string> ¶meters, User *user, CmdResult result, const std::string &original_line)
- {
- if ((OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
- {
- int Total = OverOps + OverDeops + OverVoices + OverDevoices + OverHalfops + OverDehalfops;
- if (Total == 0 || ServerInstance->Modes->GetLastParse().empty())
- return;
-
- ServerInstance->SNO->WriteToSnoMask('G',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)
+ void On005Numeric(std::string &output)
{
output.append(" OVERRIDE");
}
- virtual bool CanOverride(User* source, const char* token)
+ bool CanOverride(User* source, const char* token)
{
// checks to see if the oper's type has <type:override>
- override_t::iterator j = overrides.find(source->oper);
+ override_t::iterator j = overrides.find(source->oper->name);
if (j != overrides.end())
{
}
- virtual int OnLocalTopicChange(User *source, Channel *channel, const std::string &topic)
+ ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic)
{
- if (IS_OPER(source) && CanOverride(source, "TOPIC"))
+ if (IS_LOCAL(source) && IS_OPER(source) && CanOverride(source, "TOPIC"))
{
- if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetStatus(source) < STATUS_HOP))
+ if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetPrefixValue(source) < HALFOP_VALUE))
{
- ServerInstance->SNO->WriteToSnoMask('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
+ ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
}
// Explicit allow
- return -1;
+ return MOD_RES_ALLOW;
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual int OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason)
+ ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
{
if (IS_OPER(source) && CanOverride(source,"KICK"))
{
// If the kicker's status is less than the target's, or the kicker's status is less than or equal to voice
- if ((chan->GetStatus(source) < chan->GetStatus(user)) || (chan->GetStatus(source) <= STATUS_VOICE))
- {
- ServerInstance->SNO->WriteToSnoMask('G',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+ if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE))
+ {
+ ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to kick "+std::string(memb->user->nick)+" on "+std::string(memb->chan->name)+" ("+reason+")");
+ return MOD_RES_ALLOW;
}
- /* Returning -1 explicitly allows the kick */
- return -1;
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
+ ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
{
- if (IS_OPER(source))
- {
- 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
- int mode = channel->GetStatus(source);
- switch (access_type)
- {
- case AC_DEOP:
- if (CanOverride(source,"MODEDEOP"))
- {
- if ((!channel->HasUser(source)) || (mode < STATUS_OP))
- OverDeops++;
- return ACR_ALLOW;
- }
- else
- {
- return ACR_DEFAULT;
- }
- break;
- case AC_OP:
- if (CanOverride(source,"MODEOP"))
- {
- if ((!channel->HasUser(source)) || (mode < STATUS_OP))
- OverOps++;
- return ACR_ALLOW;
- }
- else
- {
- return ACR_DEFAULT;
- }
- break;
- case AC_VOICE:
- if (CanOverride(source,"MODEVOICE"))
- {
- if ((!channel->HasUser(source)) || (mode < STATUS_HOP))
- OverVoices++;
- return ACR_ALLOW;
- }
- else
- {
- return ACR_DEFAULT;
- }
- break;
- case AC_DEVOICE:
- if (CanOverride(source,"MODEDEVOICE"))
- {
- if ((!channel->HasUser(source)) || (mode < STATUS_HOP))
- OverDevoices++;
- return ACR_ALLOW;
- }
- else
- {
- return ACR_DEFAULT;
- }
- break;
- case AC_HALFOP:
- if (CanOverride(source,"MODEHALFOP"))
- {
- if ((!channel->HasUser(source)) || (mode < STATUS_OP))
- OverHalfops++;
- return ACR_ALLOW;
- }
- else
- {
- return ACR_DEFAULT;
- }
- break;
- case AC_DEHALFOP:
- if (CanOverride(source,"MODEDEHALFOP"))
- {
- if ((!channel->HasUser(source)) || (mode < STATUS_OP))
- OverDehalfops++;
- return ACR_ALLOW;
- }
- else
- {
- return ACR_DEFAULT;
- }
- break;
- }
+ if (!IS_OPER(source))
+ return MOD_RES_PASSTHRU;
+ if (!source || !channel)
+ return MOD_RES_PASSTHRU;
- if (CanOverride(source,"OTHERMODE"))
- {
- if ((!channel->HasUser(source)) || (mode < STATUS_OP))
- {
- OverriddenMode = true;
- OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
- }
- return ACR_ALLOW;
- }
- else
- {
- return ACR_DEFAULT;
- }
- }
- }
+ unsigned int mode = 0;
+ if (channel->HasUser(source))
+ mode = channel->GetPrefixValue(source);
- return ACR_DEFAULT;
+ if (mode < HALFOP_VALUE && CanOverride(source, "MODE"))
+ {
+ std::string msg = std::string(source->nick)+" overriding modes:";
+ for(unsigned int i=0; i < parameters.size(); i++)
+ msg += " " + parameters[i];
+ ServerInstance->SNO->WriteGlobalSno('G',msg);
+ return MOD_RES_ALLOW;
+ }
+ return MOD_RES_PASSTHRU;
}
- virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+ ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
{
if (IS_LOCAL(user) && IS_OPER(user))
{
if (chan)
{
- if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE")))
+ if (chan->IsModeSet('i') && (CanOverride(user,"INVITE")))
{
irc::string x(chan->name.c_str());
- if (!user->IsInvited(x))
+ if (!IS_LOCAL(user)->IsInvited(x))
{
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.c_str());
- return 1;
+ return MOD_RES_PASSTHRU;
}
if (NoisyOverride)
- chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str());
- ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
+ chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str());
+ ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
}
- return -1;
+ return MOD_RES_ALLOW;
}
- if ((chan->modes[CM_KEY]) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k'))
+ if (chan->IsModeSet('k') && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k'))
{
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.c_str());
- return 1;
+ return MOD_RES_PASSTHRU;
}
if (NoisyOverride)
- chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str());
- ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
- return -1;
+ chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str());
+ ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
+ return MOD_RES_ALLOW;
}
- if ((chan->modes[CM_LIMIT]) && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT")))
+ if (chan->IsModeSet('l') && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (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.c_str());
- return 1;
+ return MOD_RES_PASSTHRU;
}
if (NoisyOverride)
- chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str());
- ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
- return -1;
+ chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str());
+ ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
+ return MOD_RES_ALLOW;
}
if (chan->IsBanned(user) && CanOverride(user,"BANWALK"))
{
// 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.c_str());
- return 1;
+ return MOD_RES_PASSTHRU;
}
if (NoisyOverride)
- chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
- ServerInstance->SNO->WriteToSnoMask('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
- return -1;
+ chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
+ ServerInstance->SNO->WriteGlobalSno('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
+ return MOD_RES_ALLOW;
}
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual ~ModuleOverride()
+ ~ModuleOverride()
{
ServerInstance->SNO->DisableSnomask('G');
}
- virtual Version GetVersion()
+ Version GetVersion()
{
- return Version("$Id$",VF_VENDOR,API_VERSION);
+ return Version("Provides support for unreal-style oper-override",VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff