Remove the size argument from IsChannel and IsNick.

[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 31beb258f6b8f0c1d260fa055fcebf4a5795d4fe..f85b886e1587038516d6fd1658b177be5a97163e 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -25,8 +25,8 @@
 #include <gcrypt.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#include "ssl.h"
-#include "m_cap.h"
+#include "modules/ssl.h"
+#include "modules/cap.h"
 
 #ifdef _WIN32
 # pragma comment(lib, "libgnutls.lib")
@@ -86,6 +86,12 @@ static ssize_t gnutls_pull_wrapper(gnutls_transport_ptr_t user_wrap, void* buffe
                return -1;
        }
        int rv = ServerInstance->SE->Recv(user, reinterpret_cast<char *>(buffer), size, 0);
+       if (rv < 0)
+       {
+               /* On Windows we need to set errno for gnutls */
+               if (SocketEngine::IgnoreError())
+                       errno = EAGAIN;
+       }
        if (rv < (int)size)
                ServerInstance->SE->ChangeEventMask(user, FD_READ_WILL_BLOCK);
        return rv;
@@ -100,6 +106,12 @@ static ssize_t gnutls_push_wrapper(gnutls_transport_ptr_t user_wrap, const void*
                return -1;
        }
        int rv = ServerInstance->SE->Send(user, reinterpret_cast<const char *>(buffer), size, 0);
+       if (rv < 0)
+       {
+               /* On Windows we need to set errno for gnutls */
+               if (SocketEngine::IgnoreError())
+                       errno = EAGAIN;
+       }
        if (rv < (int)size)
                ServerInstance->SE->ChangeEventMask(user, FD_WRITE_WILL_BLOCK);
        return rv;
@@ -221,7 +233,7 @@ class ModuleSSLGnuTLS : public Module
                dh_alloc = false;
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                // Needs the flag as it ignores a plain /rehash
                OnModuleRehash(NULL,"ssl");
@@ -238,7 +250,7 @@ class ModuleSSLGnuTLS : public Module
                ServerInstance->Modules->AddService(starttls);
        }
 
-       void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                sslports.clear();
 
@@ -278,7 +290,7 @@ class ModuleSSLGnuTLS : public Module
                }
        }
 
-       void OnModuleRehash(User* user, const std::string &param)
+       void OnModuleRehash(User* user, const std::string &param) CXX11_OVERRIDE
        {
                if(param != "ssl")
                        return;
@@ -322,6 +334,7 @@ class ModuleSSLGnuTLS : public Module
                {
                        gnutls_dh_params_deinit(dh_params);
                        dh_alloc = false;
+                       dh_params = NULL;
                }
 
                if (cred_alloc)
@@ -409,10 +422,30 @@ class ModuleSSLGnuTLS : public Module
                ret = gnutls_dh_params_init(&dh_params);
                dh_alloc = (ret >= 0);
                if (!dh_alloc)
-                       ServerInstance->Logs->Log("m_ssl_gnutls",LOG_DEFAULT, "m_ssl_gnutls.so: Failed to initialise DH parameters: %s", gnutls_strerror(ret));
+               {
+                       ServerInstance->Logs->Log("m_ssl_gnutls", LOG_DEFAULT, "m_ssl_gnutls.so: Failed to initialise DH parameters: %s", gnutls_strerror(ret));
+                       return;
+               }
 
-               // This may be on a large (once a day or week) timer eventually.
-               GenerateDHParams();
+               std::string dhfile = Conf->getString("dhfile");
+               if (!dhfile.empty())
+               {
+                       // Try to load DH params from file
+                       reader.LoadFile(dhfile);
+                       std::string dhstring = reader.Contents();
+                       gnutls_datum_t dh_datum = { (unsigned char*)dhstring.data(), static_cast<unsigned int>(dhstring.length()) };
+
+                       if ((ret = gnutls_dh_params_import_pkcs3(dh_params, &dh_datum, GNUTLS_X509_FMT_PEM)) < 0)
+                       {
+                               // File unreadable or GnuTLS was unhappy with the contents, generate the DH primes now
+                               ServerInstance->Logs->Log("m_ssl_gnutls", LOG_DEFAULT, "m_ssl_gnutls.so: Generating DH parameters because I failed to load them from file '%s': %s", dhfile.c_str(), gnutls_strerror(ret));
+                               GenerateDHParams();
+                       }
+               }
+               else
+               {
+                       GenerateDHParams();
+               }
        }
 
        void GenerateDHParams()
@@ -451,7 +484,7 @@ class ModuleSSLGnuTLS : public Module
                ServerInstance->GenRandom = &ServerInstance->HandleGenRandom;
        }
 
-       void OnCleanup(int target_type, void* item)
+       void OnCleanup(int target_type, void* item) CXX11_OVERRIDE
        {
                if(target_type == TYPE_USER)
                {
@@ -466,12 +499,12 @@ class ModuleSSLGnuTLS : public Module
                }
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides SSL support for clients", VF_VENDOR);
        }
 
-       void On005Numeric(std::map<std::string, std::string>& tokens)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
                if (!sslports.empty())
                        tokens["SSL"] = sslports;
@@ -479,7 +512,7 @@ class ModuleSSLGnuTLS : public Module
                        tokens["STARTTLS"];
        }
 
-       void OnHookIO(StreamSocket* user, ListenSocket* lsb)
+       void OnHookIO(StreamSocket* user, ListenSocket* lsb) CXX11_OVERRIDE
        {
                if (!user->GetIOHook() && lsb->bind_tag->getString("ssl") == "gnutls")
                {
@@ -488,7 +521,7 @@ class ModuleSSLGnuTLS : public Module
                }
        }
 
-       void OnRequest(Request& request)
+       void OnRequest(Request& request) CXX11_OVERRIDE
        {
                if (strcmp("GET_SSL_CERT", request.id) == 0)
                {
@@ -521,7 +554,7 @@ class ModuleSSLGnuTLS : public Module
                Handshake(session, user);
        }
 
-       void OnStreamSocketAccept(StreamSocket* user, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+       void OnStreamSocketAccept(StreamSocket* user, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
        {
                issl_session* session = &sessions[user->GetFd()];
 
@@ -532,17 +565,17 @@ class ModuleSSLGnuTLS : public Module
                InitSession(user, true);
        }
 
-       void OnStreamSocketConnect(StreamSocket* user)
+       void OnStreamSocketConnect(StreamSocket* user) CXX11_OVERRIDE
        {
                InitSession(user, false);
        }
 
-       void OnStreamSocketClose(StreamSocket* user)
+       void OnStreamSocketClose(StreamSocket* user) CXX11_OVERRIDE
        {
                CloseSession(&sessions[user->GetFd()]);
        }
 
-       int OnStreamSocketRead(StreamSocket* user, std::string& recvq)
+       int OnStreamSocketRead(StreamSocket* user, std::string& recvq) CXX11_OVERRIDE
        {
                issl_session* session = &sessions[user->GetFd()];
 
@@ -600,7 +633,7 @@ class ModuleSSLGnuTLS : public Module
                return 0;
        }
 
-       int OnStreamSocketWrite(StreamSocket* user, std::string& sendq)
+       int OnStreamSocketWrite(StreamSocket* user, std::string& sendq) CXX11_OVERRIDE
        {
                issl_session* session = &sessions[user->GetFd()];
 
@@ -699,7 +732,7 @@ class ModuleSSLGnuTLS : public Module
                }
        }
 
-       void OnUserConnect(LocalUser* user)
+       void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
        {
                if (user->eh.GetIOHook() == this)
                {
@@ -712,10 +745,10 @@ class ModuleSSLGnuTLS : public Module
 
                                ssl_cert* cert = sessions[user->eh.GetFd()].cert;
                                if (cert->fingerprint.empty())
-                                       user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\"", user->nick.c_str(), cipher.c_str());
+                                       user->WriteNotice("*** You are connected using SSL cipher '" + cipher + "'");
                                else
-                                       user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\""
-                                               " and your SSL fingerprint is %s", user->nick.c_str(), cipher.c_str(), cert->fingerprint.c_str());
+                                       user->WriteNotice("*** You are connected using SSL cipher '" + cipher +
+                                               "' and your SSL fingerprint is " + cert->fingerprint);
                        }
                }
        }
@@ -827,7 +860,7 @@ info_done_dealloc:
                gnutls_x509_crt_deinit(cert);
        }
 
-       void OnEvent(Event& ev)
+       void OnEvent(Event& ev) CXX11_OVERRIDE
        {
                if (starttls.enabled)
                        capHandler.HandleEvent(ev);