-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
+ * Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2008 Geoff Bricker <geoff.bricker@gmail.com>
+ * Copyright (C) 2004-2006 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-#include "m_override.h"
-/* $ModDesc: Provides support for unreal-style oper-override */
+#include "inspircd.h"
-typedef std::map<std::string,std::string> override_t;
+/* $ModDesc: Provides support for allowing opers to override certain things. */
class ModuleOverride : public Module
{
- override_t overrides;
bool RequireKey;
bool NoisyOverride;
- bool OverriddenMode;
- bool OverOther;
- int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops;
-
- public:
- ModuleOverride(InspIRCd* Me)
- : Module(Me)
+ static bool IsOverride(unsigned int userlevel, const std::string& modeline)
{
- // read our config options (main config file)
- OnRehash(NULL);
- ServerInstance->SNO->EnableSnomask('G', "GODMODE");
- if (!ServerInstance->Modules->PublishFeature("Override", this))
+ for (std::string::const_iterator i = modeline.begin(); i != modeline.end(); ++i)
{
- throw ModuleException("m_override: Unable to publish feature 'Override'");
- }
- OverriddenMode = OverOther = false;
- OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
- Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand, I_OnLocalTopicChange, I_OnRequest };
- ServerInstance->Modules->Attach(eventlist, this, 8);
- }
+ ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
+ if (!mh)
+ continue;
- virtual void OnRehash(User* user)
- {
- // on a rehash we delete our classes for good measure and create them again.
- ConfigReader Conf(ServerInstance);
-
- // re-read our config options on a rehash
- NoisyOverride = Conf.ReadFlag("override", "noisy", 0);
- RequireKey = Conf.ReadFlag("override", "requirekey", 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;
+ if (mh->GetLevelRequired() > userlevel)
+ return true;
}
+ return false;
}
+ public:
- virtual void OnPostCommand(const std::string &command, const std::vector<std::string> ¶meters, User *user, CmdResult result, const std::string &original_line)
+ void init()
{
- if (OverriddenMode)
- {
- if ((irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS) && !ServerInstance->Modes->GetLastParse().empty())
- {
- std::string msg = std::string(user->nick)+" overriding modes: "+ServerInstance->Modes->GetLastParse()+" [Detail: ";
- if (OverOps)
- msg += ConvToStr(OverOps)+" op"+(OverOps != 1 ? "s" : "")+", ";
- if (OverDeops)
- msg += ConvToStr(OverDeops)+" deop"+(OverDeops != 1 ? "s" : "")+", ";
- if (OverVoices)
- msg += ConvToStr(OverVoices)+" voice"+(OverVoices != 1 ? "s" : "")+", ";
- if (OverDevoices)
- msg += ConvToStr(OverDevoices)+" devoice"+(OverDevoices != 1 ? "s" : "")+", ";
- if (OverHalfops)
- msg += ConvToStr(OverHalfops)+" halfop"+(OverHalfops != 1 ? "s" : "")+", ";
- if (OverDehalfops)
- msg += ConvToStr(OverDehalfops)+" dehalfop"+(OverDehalfops != 1 ? "s" : "")+", ";
- if (OverOther)
- msg += "others, ";
- msg.replace(msg.length()-2, 2, 1, ']');
- ServerInstance->SNO->WriteGlobalSno('G',msg);
- }
+ // read our config options (main config file)
+ OnRehash(NULL);
+ ServerInstance->SNO->EnableSnomask('v', "OVERRIDE");
+ Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+ }
- OverriddenMode = OverOther = false;
- OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
- }
+ void OnRehash(User* user)
+ {
+ // re-read our config options on a rehash
+ ConfigTag* tag = ServerInstance->Config->ConfValue("override");
+ NoisyOverride = tag->getBool("noisy");
+ RequireKey = tag->getBool("requirekey");
}
- 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);
-
- if (j != overrides.end())
- {
- // 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));
- }
+ std::string tokenlist = source->oper->getConfig("override");
- // its not defined at all, count as false
- return false;
+ // its defined or * is set, return its value as a boolean for if the token is set
+ return ((tokenlist.find(token, 0) != std::string::npos) || (tokenlist.find("*", 0) != std::string::npos));
}
- virtual ModResult 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->WriteGlobalSno('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
+ ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to change a topic on "+channel->name);
}
// Explicit allow
return MOD_RES_PASSTHRU;
}
- virtual ModResult 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))
+ 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(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+ ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")");
+ return MOD_RES_ALLOW;
}
- return MOD_RES_ALLOW;
}
return MOD_RES_PASSTHRU;
}
- virtual ModResult 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))
- return MOD_RES_PASSTHRU;
if (!source || !channel)
return MOD_RES_PASSTHRU;
+ if (!IS_OPER(source) || !IS_LOCAL(source))
+ return MOD_RES_PASSTHRU;
- int mode = STATUS_NORMAL;
- if (channel->HasUser(source))
- mode = channel->GetStatus(source);
- bool over_this = false;
-
- switch (access_type)
- {
- case AC_DEOP:
- if (mode < STATUS_OP && CanOverride(source,"MODEDEOP"))
- {
- over_this = true;
- OverDeops++;
- }
- break;
- case AC_OP:
- if (mode < STATUS_OP && CanOverride(source,"MODEOP"))
- {
- over_this = true;
- OverOps++;
- }
- break;
- case AC_VOICE:
- if (mode < STATUS_HOP && CanOverride(source,"MODEVOICE"))
- {
- over_this = true;
- OverVoices++;
- }
- break;
- case AC_DEVOICE:
- if (mode < STATUS_HOP && CanOverride(source,"MODEDEVOICE"))
- {
- over_this = true;
- OverDevoices++;
- }
- break;
- case AC_HALFOP:
- if (mode < STATUS_OP && CanOverride(source,"MODEHALFOP"))
- {
- over_this = true;
- OverHalfops++;
- }
- break;
- case AC_DEHALFOP:
- if (mode < STATUS_OP && CanOverride(source,"MODEDEHALFOP"))
- {
- over_this = true;
- OverDehalfops++;
- }
- break;
- case AC_GENERAL_MODE:
- {
- std::string modes = ServerInstance->Modes->GetLastParse();
- bool ohv_only = (modes.find_first_not_of("+-ohv") == std::string::npos);
+ unsigned int mode = channel->GetPrefixValue(source);
- if (mode < STATUS_HOP && (ohv_only || CanOverride(source,"OTHERMODE")))
- {
- over_this = true;
- if (!ohv_only)
- OverOther = true;
- }
- }
- break;
- }
+ if (!IsOverride(mode, parameters[1]))
+ return MOD_RES_PASSTHRU;
- if (over_this)
+ if (CanOverride(source, "MODE"))
{
- OverriddenMode = true;
+ std::string msg = source->nick+" overriding modes:";
+ for(unsigned int i=0; i < parameters.size(); i++)
+ msg += " " + parameters[i];
+ ServerInstance->SNO->WriteGlobalSno('v',msg);
return MOD_RES_ALLOW;
}
- else
- {
- return MOD_RES_PASSTHRU;
- }
+ return MOD_RES_PASSTHRU;
}
- virtual ModResult 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")
{
if (NoisyOverride)
chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "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));
+ ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +i on "+std::string(cname));
}
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")
{
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->WriteGlobalSno('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
+ ServerInstance->SNO->WriteGlobalSno('v', 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() >= ConvToInt(chan->GetModeParameter('l'))) && (CanOverride(user,"LIMIT")))
{
if (RequireKey && keygiven != "override")
{
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->WriteGlobalSno('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
+ ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +l on "+std::string(cname));
return MOD_RES_ALLOW;
}
if (NoisyOverride)
chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "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);
+ ServerInstance->SNO->WriteGlobalSno('v',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
return MOD_RES_ALLOW;
}
}
return MOD_RES_PASSTHRU;
}
- virtual const char* OnRequest(Request* request)
- {
- if(strcmp(OVRREQID, request->GetId()) == 0)
- {
- OVRrequest* req = static_cast<OVRrequest*>(request);
- return this->CanOverride(req->requser,req->reqtoken.c_str()) ? "yes":"";
- }
- return NULL;
- }
-
- virtual ~ModuleOverride()
- {
- ServerInstance->Modules->UnpublishFeature("Override");
- ServerInstance->SNO->DisableSnomask('G');
- }
-
- virtual Version GetVersion()
+ Version GetVersion()
{
- return Version("$Id$",VF_VENDOR,API_VERSION);
+ return Version("Provides support for allowing opers to override certain things",VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff