Add DYING link state, push error messages on link, and only limit recvq on unauthenti...

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

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 0fddd8bf2329cea1d1d4929ad0c8340a7bc7ebeb..b67498072426a2e8ec6e38dc6443584ac3c2ab70 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -127,8 +127,8 @@ class ModuleSSLInfo : public Module
 
                ServerInstance->Extensions.Register(&cmd.CertExt);
 
-               Implementation eventlist[] = { I_OnWhois, I_OnPreCommand };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
        Version GetVersion()
@@ -173,7 +173,7 @@ class ModuleSSLInfo : public Module
                                if (ifo->oper_block->getBool("sslonly") && !cert)
                                {
                                        user->WriteNumeric(491, "%s :This oper login requires an SSL connection.", user->nick.c_str());
-                                       IS_LOCAL(user)->CommandFloodPenalty += 10000;
+                                       user->CommandFloodPenalty += 10000;
                                        return MOD_RES_DENY;
                                }
 
@@ -181,7 +181,7 @@ class ModuleSSLInfo : public Module
                                if (ifo->oper_block->readString("fingerprint", fingerprint) && (!cert || cert->GetFingerprint() != fingerprint))
                                {
                                        user->WriteNumeric(491, "%s :This oper login requires a matching SSL fingerprint.",user->nick.c_str());
-                                       IS_LOCAL(user)->CommandFloodPenalty += 10000;
+                                       user->CommandFloodPenalty += 10000;
                                        return MOD_RES_DENY;
                                }
                        }
@@ -191,6 +191,13 @@ class ModuleSSLInfo : public Module
                return MOD_RES_PASSTHRU;
        }
 
+       ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
+       {
+               if (myclass->config->getBool("requiressl") && !cmd.CertExt.get(user))
+                       return MOD_RES_DENY;
+               return MOD_RES_PASSTHRU;
+       }
+
        void OnRequest(Request& request)
        {
                if (strcmp("GET_USER_CERT", request.id) == 0)