From 3e20f7bd2959fb1f267ba03b0387443b1c30cba1 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Thu, 16 Oct 2014 21:15:31 +0200 Subject: [PATCH] Add interface to SSL modules that allows other modules to obtain the raw SSL session of a socket --- src/modules/extra/m_ssl_gnutls.cpp | 6 ++++++ src/modules/extra/m_ssl_openssl.cpp | 6 ++++++ src/modules/ssl.h | 15 +++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 4135194c5..cdfe00b9c 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -615,6 +615,12 @@ class ModuleSSLGnuTLS : public Module req.cert = session->cert; } + else if (!strcmp("GET_RAW_SSL_SESSION", request.id)) + { + SSLRawSessionRequest& req = static_cast(request); + if ((req.fd >= 0) && (req.fd < ServerInstance->SE->GetMaxFds())) + req.data = reinterpret_cast(sessions[req.fd].sess); + } } void InitSession(StreamSocket* user, bool me_server) diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 27cd3a2ae..9ca92fe52 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -392,6 +392,12 @@ class ModuleSSLOpenSSL : public Module req.cert = session->cert; } + else if (!strcmp("GET_RAW_SSL_SESSION", request.id)) + { + SSLRawSessionRequest& req = static_cast(request); + if ((req.fd >= 0) && (req.fd < ServerInstance->SE->GetMaxFds())) + req.data = reinterpret_cast(sessions[req.fd].sess); + } } void OnStreamSocketAccept(StreamSocket* user, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) diff --git a/src/modules/ssl.h b/src/modules/ssl.h index 9deafb830..4c877551d 100644 --- a/src/modules/ssl.h +++ b/src/modules/ssl.h @@ -172,4 +172,19 @@ struct UserCertificateRequest : public Request } }; +class SSLRawSessionRequest : public Request +{ + public: + const int fd; + void* data; + + SSLRawSessionRequest(int FD, Module* srcmod, Module* destmod) + : Request(srcmod, destmod, "GET_RAW_SSL_SESSION") + , fd(FD) + , data(NULL) + { + Send(); + } +}; + #endif -- 2.39.5