A few more I missed.

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

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 8c08fb80bb2bfc3d44d7e4866a36948d96c4b82e..c8cff3a21ef590f3b324d1ac63ecf330910b6719 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -80,6 +80,7 @@ class ModuleSSLGnuTLS : public Module
        std::string certfile;
        std::string cafile;
        std::string crlfile;
+       std::string sslports;
        int dh_bits;
 
        int clientactive;
@@ -124,6 +125,7 @@ class ModuleSSLGnuTLS : public Module
 
                listenports.clear();
                clientactive = 0;
+               sslports.clear();
 
                for(int i = 0; i < Conf->Enumerate("bind"); i++)
                {
@@ -147,6 +149,7 @@ class ModuleSSLGnuTLS : public Module
                                                                if (ServerInstance->Config->ports[i]->GetPort() == portno)
                                                                        ServerInstance->Config->ports[i]->SetDescription("ssl");
                                                        ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", portno);
+                                                       sslports.append("*:").append(ConvToStr(portno)).append(";");
                                                }
                                                else
                                                {
@@ -208,9 +211,11 @@ class ModuleSSLGnuTLS : public Module
                if((ret = gnutls_certificate_set_x509_crl_file (x509_cred, crlfile.c_str(), GNUTLS_X509_FMT_PEM)) < 0)
                        ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: Failed to set X.509 CRL file '%s': %s", crlfile.c_str(), gnutls_strerror(ret));
 
-               // Guessing on the return value of this, manual doesn't say :|
                if((ret = gnutls_certificate_set_x509_key_file (x509_cred, certfile.c_str(), keyfile.c_str(), GNUTLS_X509_FMT_PEM)) < 0)
-                       ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: Failed to set X.509 certificate and key files '%s' and '%s': %s", certfile.c_str(), keyfile.c_str(), gnutls_strerror(ret));
+               {
+                       // If this fails, no SSL port will work. At all. So, do the smart thing - throw a ModuleException
+                       throw ModuleException("Unable to load GnuTLS server certificate: " + std::string(gnutls_strerror(ret)));
+               }
 
                // This may be on a large (once a day or week) timer eventually.
                GenerateDHParams();
@@ -248,7 +253,7 @@ class ModuleSSLGnuTLS : public Module
                        {
                                // User is using SSL, they're a local user, and they're using one of *our* SSL ports.
                                // Potentially there could be multiple SSL modules loaded at once on different ports.
-                               ServerInstance->GlobalCulls.AddItem(user, "SSL module unloading");
+                               userrec::QuitUser(ServerInstance, user, "SSL module unloading");
                        }
                        if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports))
                        {
@@ -281,10 +286,15 @@ class ModuleSSLGnuTLS : public Module
 
        void Implements(char* List)
        {
-               List[I_OnRawSocketConnect] = List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = 1;
+               List[I_On005Numeric] = List[I_OnRawSocketConnect] = List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = 1;
                List[I_OnRequest] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnPostConnect] = 1;
        }
 
+       virtual void On005Numeric(std::string &output)
+       {
+               output.append(" SSL=" + sslports);
+       }
+
        virtual char* OnRequest(Request* request)
        {
                ISHRequest* ISR = (ISHRequest*)request;
@@ -498,6 +508,7 @@ class ModuleSSLGnuTLS : public Module
 
                if (!session->sess)
                {
+                       ServerInstance->Log(DEBUG,"No session");
                        CloseSession(session);
                        return 1;
                }
@@ -506,9 +517,10 @@ class ModuleSSLGnuTLS : public Module
                sendbuffer = session->outbuf.c_str();
                count = session->outbuf.size();
 
-               if(session->status == ISSL_HANDSHAKING_WRITE)
+               if (session->status == ISSL_HANDSHAKING_WRITE)
                {
                        // The handshake isn't finished, try to finish it.
+                       ServerInstance->Log(DEBUG,"Finishing handshake");
                        Handshake(session);
                        errno = EAGAIN;
                        return -1;
@@ -516,11 +528,13 @@ class ModuleSSLGnuTLS : public Module
 
                int ret = 0;
 
-               if(session->status == ISSL_HANDSHAKEN)
+               if (session->status == ISSL_HANDSHAKEN)
                {
+                       ServerInstance->Log(DEBUG,"Send record");
                        ret = gnutls_record_send(session->sess, sendbuffer, count);
+                       ServerInstance->Log(DEBUG,"Return: %d", ret);
 
-                       if(ret == 0)
+                       if (ret == 0)
                        {
                                CloseSession(session);
                        }
@@ -528,16 +542,19 @@ class ModuleSSLGnuTLS : public Module
                        {
                                if(ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED)
                                {
+                                       ServerInstance->Log(DEBUG,"Not egain or interrupt, close session");
                                        CloseSession(session);
                                }
                                else
                                {
+                                       ServerInstance->Log(DEBUG,"Again please");
                                        errno = EAGAIN;
                                        return -1;
                                }
                        }
                        else
                        {
+                               ServerInstance->Log(DEBUG,"Trim buffer");
                                session->outbuf = session->outbuf.substr(ret);
                        }
                }