#include "inspircd.h"
-/* $ModDesc: Provides support for oper-only chans via the +O channel mode */
+enum
+{
+ // From UnrealIRCd.
+ ERR_CANTJOINOPERSONLY = 520
+};
class OperChans : public SimpleChannelModeHandler
{
class ModuleOperChans : public Module
{
+ private:
OperChans oc;
- public:
- ModuleOperChans() : oc(this)
- {
- }
+ std::string space;
+ std::string underscore;
- void init()
+ public:
+ ModuleOperChans()
+ : oc(this)
+ , space(" ")
+ , underscore("_")
{
- ServerInstance->Modules->AddService(oc);
- Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin };
- ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
- ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+ ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
{
- if (chan && chan->IsModeSet('O') && !IS_OPER(user))
+ if (chan && chan->IsModeSet(oc) && !user->IsOper())
{
- user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join %s (+O is set)",
- user->nick.c_str(), 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)
+ ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE
{
- if ((mask.length() > 2) && (mask[0] == 'O') && (mask[1] == ':'))
- {
- if (IS_OPER(user) && InspIRCd::Match(user->oper->name, mask.substr(2)))
- return MOD_RES_DENY;
- }
- return MOD_RES_PASSTHRU;
- }
+ // Check whether the entry is an extban.
+ if (mask.length() <= 2 || mask[0] != 'O' || mask[1] != ':')
+ return MOD_RES_PASSTHRU;
- void On005Numeric(std::string &output)
- {
- ServerInstance->AddExtBanChar('O');
+ // If the user is not an oper they can't match this.
+ if (!user->IsOper())
+ return MOD_RES_PASSTHRU;
+
+ // Check whether the oper's type matches the ban.
+ const std::string submask = mask.substr(2);
+ if (InspIRCd::Match(user->oper->name, submask))
+ return MOD_RES_DENY;
+
+ // If the oper's type contains spaces recheck with underscores.
+ std::string opername(user->oper->name);
+ stdalgo::string::replace_all(opername, space, underscore);
+ if (InspIRCd::Match(opername, submask))
+ return MOD_RES_DENY;
+
+ return MOD_RES_PASSTHRU;
}
- ~ModuleOperChans()
+ void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
{
+ tokens["EXTBAN"].push_back('O');
}
- Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR);
+ return Version("Provides support for oper-only channels via channel mode +O and extban 'O'", VF_VENDOR);
}
};