/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- * Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2004, 2006, 2010 Craig Edwards <brain@inspircd.org>
*
* 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
#include "inspircd.h"
-class OperChans : public SimpleChannelModeHandler
+enum
{
- public:
- /* This is an oper-only mode */
- OperChans(Module* Creator) : SimpleChannelModeHandler(Creator, "operonly", 'O')
- {
- oper = true;
- }
+ // From UnrealIRCd.
+ ERR_CANTJOINOPERSONLY = 520
};
class ModuleOperChans : public Module
{
- OperChans oc;
+ private:
+ SimpleChannelModeHandler oc;
+ std::string space;
+ std::string underscore;
+
public:
- ModuleOperChans() : oc(this)
+ ModuleOperChans()
+ : oc(this, "operonly", 'O', true)
+ , space(" ")
+ , underscore("_")
{
}
{
if (chan && chan->IsModeSet(oc) && !user->IsOper())
{
- user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s :Only IRC operators may join %s (+O is set)",
- chan->name.c_str(), chan->name.c_str());
+ user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only server operators may join %s (+O is set)", chan->name.c_str()));
return MOD_RES_DENY;
}
return MOD_RES_PASSTHRU;
}
- ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
+ ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE
{
- if ((mask.length() > 2) && (mask[0] == 'O') && (mask[1] == ':'))
- {
- if (user->IsOper() && InspIRCd::Match(user->oper->name, mask.substr(2)))
- return MOD_RES_DENY;
- }
+ // Check whether the entry is an extban.
+ if (mask.length() <= 2 || mask[0] != 'O' || mask[1] != ':')
+ return MOD_RES_PASSTHRU;
+
+ // If the user is not an oper they can't match this.
+ if (!user->IsOper())
+ return MOD_RES_PASSTHRU;
+
+ // Replace spaces with underscores as they're prohibited in mode parameters.
+ std::string opername(user->oper->name);
+ stdalgo::string::replace_all(opername, space, underscore);
+ if (InspIRCd::Match(opername, mask.substr(2)))
+ return MOD_RES_DENY;
+
return MOD_RES_PASSTHRU;
}
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR);
+ return Version("Adds channel mode O (operonly) which prevents non-server operators from joining the channel.", VF_VENDOR);
}
};