Check fingerprint before checking password (server linking)

[user/henk/code/inspircd.git] / src / modules / m_override.cpp

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index e342e7dab2dffd92ded0ca0eafddf7114260e726..756ef8edcdbe37afce4f39a7cbdebe2c82e6be1f 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -35,6 +35,35 @@ class ModuleOverride : public Module
        ChanModeReference key;
        ChanModeReference limit;
 
+       static bool IsOverride(unsigned int userlevel, const std::string& modeline)
+       {
+               for (std::string::const_iterator i = modeline.begin(); i != modeline.end(); ++i)
+               {
+                       ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
+                       if (!mh)
+                               continue;
+
+                       if (mh->GetLevelRequired() > userlevel)
+                               return true;
+               }
+               return false;
+       }
+
+       ModResult HandleJoinOverride(LocalUser* user, Channel* chan, const std::string& keygiven, const char* bypasswhat, const char* mode)
+       {
+               if (RequireKey && keygiven != "override")
+               {
+                       // Can't join normally -- must use a special key to bypass restrictions
+                       user->WriteNotice("*** You may not join normally. You must join with a key of 'override' to oper override.");
+                       return MOD_RES_PASSTHRU;
+               }
+
+               if (NoisyOverride)
+                       chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass %s", chan->name.c_str(), user->nick.c_str(), bypasswhat);
+               ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass " + mode + " on " + chan->name);
+               return MOD_RES_ALLOW;
+       }
+
  public:
        ModuleOverride()
                : topiclock(this, "topiclock")
@@ -46,14 +75,12 @@ class ModuleOverride : public Module
 
        void init() CXX11_OVERRIDE
        {
-               // read our config options (main config file)
-               OnRehash(NULL);
                ServerInstance->SNO->EnableSnomask('v', "OVERRIDE");
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               // re-read our config options on a rehash
+               // re-read our config options
                ConfigTag* tag = ServerInstance->Config->ConfValue("override");
                NoisyOverride = tag->getBool("noisy");
                RequireKey = tag->getBool("requirekey");
@@ -105,14 +132,17 @@ class ModuleOverride : public Module
 
        ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
        {
-               if (!source || !channel)
+               if (!channel)
                        return MOD_RES_PASSTHRU;
                if (!source->IsOper() || !IS_LOCAL(source))
                        return MOD_RES_PASSTHRU;
 
                unsigned int mode = channel->GetPrefixValue(source);
 
-               if (mode < HALFOP_VALUE && CanOverride(source, "MODE"))
+               if (!IsOverride(mode, parameters[1]))
+                       return MOD_RES_PASSTHRU;
+
+               if (CanOverride(source, "MODE"))
                {
                        std::string msg = source->nick+" overriding modes:";
                        for(unsigned int i=0; i < parameters.size(); i++)
@@ -131,66 +161,19 @@ class ModuleOverride : public Module
                        {
                                if (chan->IsModeSet(inviteonly) && (CanOverride(user,"INVITE")))
                                {
-                                       if (!IS_LOCAL(user)->IsInvited(chan))
-                                       {
-                                               if (RequireKey && keygiven != "override")
-                                               {
-                                                       // Can't join normally -- must use a special key to bypass restrictions
-                                                       user->WriteNotice("*** You may not join normally. You must join with a key of 'override' to oper override.");
-                                                       return MOD_RES_PASSTHRU;
-                                               }
-
-                                               if (NoisyOverride)
-                                                       chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname.c_str(), user->nick.c_str());
-                                               ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +i on " + cname);
-                                       }
+                                       if (!user->IsInvited(chan))
+                                               return HandleJoinOverride(user, chan, keygiven, "invite-only", "+i");
                                        return MOD_RES_ALLOW;
                                }
 
                                if (chan->IsModeSet(key) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter(key))
-                               {
-                                       if (RequireKey && keygiven != "override")
-                                       {
-                                               // Can't join normally -- must use a special key to bypass restrictions
-                                               user->WriteNotice("*** You may not join normally. You must join with a key of 'override' to oper override.");
-                                               return MOD_RES_PASSTHRU;
-                                       }
-
-                                       if (NoisyOverride)
-                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname.c_str(), user->nick.c_str());
-                                       ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +k on " + cname);
-                                       return MOD_RES_ALLOW;
-                               }
+                                       return HandleJoinOverride(user, chan, keygiven, "the channel key", "+k");
 
                                if (chan->IsModeSet(limit) && (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter(limit))) && (CanOverride(user,"LIMIT")))
-                               {
-                                       if (RequireKey && keygiven != "override")
-                                       {
-                                               // Can't join normally -- must use a special key to bypass restrictions
-                                               user->WriteNotice("*** You may not join normally. You must join with a key of 'override' to oper override.");
-                                               return MOD_RES_PASSTHRU;
-                                       }
-
-                                       if (NoisyOverride)
-                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname.c_str(), user->nick.c_str());
-                                       ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +l on " + cname);
-                                       return MOD_RES_ALLOW;
-                               }
+                                       return HandleJoinOverride(user, chan, keygiven, "the channel limit", "+l");
 
                                if (chan->IsBanned(user) && CanOverride(user,"BANWALK"))
-                               {
-                                       if (RequireKey && keygiven != "override")
-                                       {
-                                               // Can't join normally -- must use a special key to bypass restrictions
-                                               user->WriteNotice("*** You may not join normally. You must join with a key of 'override' to oper override.");
-                                               return MOD_RES_PASSTHRU;
-                                       }
-
-                                       if (NoisyOverride)
-                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname.c_str(), user->nick.c_str());
-                                       ServerInstance->SNO->WriteGlobalSno('v',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname.c_str());
-                                       return MOD_RES_ALLOW;
-                               }
+                                       return HandleJoinOverride(user, chan, keygiven, "channel ban", "channel ban");
                        }
                }
                return MOD_RES_PASSTHRU;