-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+ /* HACK: This prevents OpenSSL on OS X 10.7 and later from spewing deprecation
+ * warnings for every single function call. As far as I (SaberUK) know, Apple
+ * have no plans to remove OpenSSL so this warning just causes needless spam.
+ */
+#ifdef __APPLE__
+# define __AVAILABILITYMACROS__
+# define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
+#endif
+
#include "inspircd.h"
+#include "iohook.h"
#include <openssl/ssl.h>
#include <openssl/err.h>
-#include "transport.h"
-
-#ifdef WINDOWS
-#pragma comment(lib, "libeay32MTd")
-#pragma comment(lib, "ssleay32MTd")
-#undef MAX_DESCRIPTORS
-#define MAX_DESCRIPTORS 10000
+#include "modules/ssl.h"
+
+#ifdef _WIN32
+# pragma comment(lib, "libcrypto.lib")
+# pragma comment(lib, "libssl.lib")
+# pragma comment(lib, "user32.lib")
+# pragma comment(lib, "advapi32.lib")
+# pragma comment(lib, "libgcc.lib")
+# pragma comment(lib, "libmingwex.lib")
+# pragma comment(lib, "gdi32.lib")
+# undef MAX_DESCRIPTORS
+# define MAX_DESCRIPTORS 10000
#endif
-/* $ModDesc: Provides SSL support for clients */
-
-/* $LinkerFlags: if("USE_FREEBSD_BASE_SSL") -lssl -lcrypto */
-/* $CompileFlags: if(!"USE_FREEBSD_BASE_SSL") pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
-/* $LinkerFlags: if(!"USE_FREEBSD_BASE_SSL") rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
-
-/* $ModDep: transport.h */
-/* $NoPedantic */
-/* $CopyInstall: conf/key.pem $(CONPATH) */
-/* $CopyInstall: conf/cert.pem $(CONPATH) */
-
+/* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") -Wno-pedantic */
+/* $LinkerFlags: rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto") */
enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };
-enum issl_io_status { ISSL_WRITE, ISSL_READ };
static bool SelfSigned = false;
return ERR_error_string(ERR_get_error(), NULL);
}
-static int error_callback(const char *str, size_t len, void *u);
+static int OnVerify(int preverify_ok, X509_STORE_CTX* ctx);
-/** Represents an SSL user's extra data
- */
-class issl_session : public classbase
+namespace OpenSSL
{
-public:
- SSL* sess;
- issl_status status;
- issl_io_status rstat;
- issl_io_status wstat;
-
- unsigned int inbufoffset;
- char* inbuf; // Buffer OpenSSL reads into.
- std::string outbuf;
- int fd;
- bool outbound;
+ class Exception : public ModuleException
+ {
+ public:
+ Exception(const std::string& reason)
+ : ModuleException(reason) { }
+ };
- issl_session()
+ class DHParams
{
- outbound = false;
- rstat = ISSL_READ;
- wstat = ISSL_WRITE;
- }
-};
+ DH* dh;
-static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
-{
- /* XXX: This will allow self signed certificates.
- * In the future if we want an option to not allow this,
- * we can just return preverify_ok here, and openssl
- * will boot off self-signed and invalid peer certs.
- */
- int ve = X509_STORE_CTX_get_error(ctx);
+ public:
+ DHParams(const std::string& filename)
+ {
+ FILE* dhpfile = fopen(filename.c_str(), "r");
+ if (dhpfile == NULL)
+ throw Exception("Couldn't open DH file " + filename + ": " + strerror(errno));
- SelfSigned = (ve == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
+ dh = PEM_read_DHparams(dhpfile, NULL, NULL, NULL);
+ fclose(dhpfile);
+ if (!dh)
+ throw Exception("Couldn't read DH params from file " + filename);
+ }
- return 1;
-}
+ ~DHParams()
+ {
+ DH_free(dh);
+ }
-class ModuleSSLOpenSSL : public Module
-{
- std::set<ListenSocketBase*> listenports;
+ DH* get()
+ {
+ return dh;
+ }
+ };
- int inbufsize;
- issl_session* sessions;
+ class Context
+ {
+ SSL_CTX* const ctx;
- SSL_CTX* ctx;
- SSL_CTX* clictx;
+ public:
+ Context(SSL_CTX* context)
+ : ctx(context)
+ {
+ SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+ SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);
+ }
- char cipher[MAXBUF];
+ ~Context()
+ {
+ SSL_CTX_free(ctx);
+ }
- std::string keyfile;
- std::string certfile;
- std::string cafile;
- // std::string crlfile;
- std::string dhfile;
- std::string sslports;
+ bool SetDH(DHParams& dh)
+ {
+ return (SSL_CTX_set_tmp_dh(ctx, dh.get()) >= 0);
+ }
- public:
+ bool SetCiphers(const std::string& ciphers)
+ {
+ return SSL_CTX_set_cipher_list(ctx, ciphers.c_str());
+ }
- InspIRCd* PublicInstance;
+ bool SetCerts(const std::string& filename)
+ {
+ return SSL_CTX_use_certificate_chain_file(ctx, filename.c_str());
+ }
- ModuleSSLOpenSSL(InspIRCd* Me)
- : Module(Me), PublicInstance(Me)
- {
- ServerInstance->Modules->PublishInterface("BufferedSocketHook", this);
+ bool SetPrivateKey(const std::string& filename)
+ {
+ return SSL_CTX_use_PrivateKey_file(ctx, filename.c_str(), SSL_FILETYPE_PEM);
+ }
- sessions = new issl_session[ServerInstance->SE->GetMaxFds()];
+ bool SetCA(const std::string& filename)
+ {
+ return SSL_CTX_load_verify_locations(ctx, filename.c_str(), 0);
+ }
- // Not rehashable...because I cba to reduce all the sizes of existing buffers.
- inbufsize = ServerInstance->Config->NetBufferSize;
+ SSL* CreateSession()
+ {
+ return SSL_new(ctx);
+ }
+ };
- /* Global SSL library initialization*/
- SSL_library_init();
- SSL_load_error_strings();
+ class Profile : public refcountbase
+ {
+ /** Name of this profile
+ */
+ const std::string name;
- /* Build our SSL contexts:
- * NOTE: OpenSSL makes us have two contexts, one for servers and one for clients. ICK.
+ /** DH parameters in use
*/
- ctx = SSL_CTX_new( SSLv23_server_method() );
- clictx = SSL_CTX_new( SSLv23_client_method() );
+ DHParams dh;
- SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
- SSL_CTX_set_mode(clictx, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+ /** OpenSSL makes us have two contexts, one for servers and one for clients
+ */
+ Context ctx;
+ Context clictx;
- SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);
- SSL_CTX_set_verify(clictx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);
+ /** Digest to use when generating fingerprints
+ */
+ const EVP_MD* digest;
- // Needs the flag as it ignores a plain /rehash
- OnModuleRehash(NULL,"ssl");
- Implementation eventlist[] = {
- I_On005Numeric, I_OnBufferFlushed, I_OnRequest, I_OnRehash, I_OnModuleRehash, I_OnPostConnect,
- I_OnHookIO };
- ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
- }
+ /** Last error, set by error_callback()
+ */
+ std::string lasterr;
- void OnHookIO(StreamSocket* user, ListenSocketBase* lsb)
- {
- if (!user->GetIOHook() && listenports.find(lsb) != listenports.end())
+ static int error_callback(const char* str, size_t len, void* u)
{
- /* Hook the user with our module */
- user->AddIOHook(this);
+ Profile* profile = reinterpret_cast<Profile*>(u);
+ profile->lasterr = std::string(str, len - 1);
+ return 0;
}
- }
- void OnRehash(User* user)
- {
- ConfigReader Conf(ServerInstance);
-
- listenports.clear();
- sslports.clear();
-
- for (size_t i = 0; i < ServerInstance->ports.size(); i++)
+ public:
+ Profile(const std::string& profilename, ConfigTag* tag)
+ : name(profilename)
+ , dh(ServerInstance->Config->Paths.PrependConfig(tag->getString("dhfile", "dh.pem")))
+ , ctx(SSL_CTX_new(SSLv23_server_method()))
+ , clictx(SSL_CTX_new(SSLv23_client_method()))
{
- ListenSocketBase* port = ServerInstance->ports[i];
- std::string desc = port->GetDescription();
- if (desc != "openssl")
- continue;
-
- listenports.insert(port);
- std::string portid = port->GetBindDesc();
+ if ((!ctx.SetDH(dh)) || (!clictx.SetDH(dh)))
+ throw Exception("Couldn't set DH parameters");
- ServerInstance->Logs->Log("m_ssl_openssl", DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %s", portid.c_str());
- if (port->GetIP() != "127.0.0.1")
- sslports.append(portid).append(";");
- }
+ std::string hash = tag->getString("hash", "md5");
+ digest = EVP_get_digestbyname(hash.c_str());
+ if (digest == NULL)
+ throw Exception("Unknown hash type " + hash);
- if (!sslports.empty())
- sslports.erase(sslports.end() - 1);
- }
-
- void OnModuleRehash(User* user, const std::string ¶m)
- {
- if (param != "ssl")
- return;
+ std::string ciphers = tag->getString("ciphers");
+ if (!ciphers.empty())
+ {
+ if ((!ctx.SetCiphers(ciphers)) || (!clictx.SetCiphers(ciphers)))
+ {
+ ERR_print_errors_cb(error_callback, this);
+ throw Exception("Can't set cipher list to \"" + ciphers + "\" " + lasterr);
+ }
+ }
- OnRehash(user);
+ /* Load our keys and certificates
+ * NOTE: OpenSSL's error logging API sucks, don't blame us for this clusterfuck.
+ */
+ std::string filename = ServerInstance->Config->Paths.PrependConfig(tag->getString("certfile", "cert.pem"));
+ if ((!ctx.SetCerts(filename)) || (!clictx.SetCerts(filename)))
+ {
+ ERR_print_errors_cb(error_callback, this);
+ throw Exception("Can't read certificate file: " + lasterr);
+ }
- ConfigReader Conf(ServerInstance);
+ filename = ServerInstance->Config->Paths.PrependConfig(tag->getString("keyfile", "key.pem"));
+ if ((!ctx.SetPrivateKey(filename)) || (!clictx.SetPrivateKey(filename)))
+ {
+ ERR_print_errors_cb(error_callback, this);
+ throw Exception("Can't read key file: " + lasterr);
+ }
- std::string confdir(ServerInstance->ConfigFileName);
- // +1 so we the path ends with a /
- confdir = confdir.substr(0, confdir.find_last_of('/') + 1);
+ // Load the CAs we trust
+ filename = ServerInstance->Config->Paths.PrependConfig(tag->getString("cafile", "ca.pem"));
+ if ((!ctx.SetCA(filename)) || (!clictx.SetCA(filename)))
+ {
+ ERR_print_errors_cb(error_callback, this);
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Can't read CA list from %s. This is only a problem if you want to verify client certificates, otherwise it's safe to ignore this message. Error: %s", filename.c_str(), lasterr.c_str());
+ }
+ }
- cafile = Conf.ReadValue("openssl", "cafile", 0);
- certfile = Conf.ReadValue("openssl", "certfile", 0);
- keyfile = Conf.ReadValue("openssl", "keyfile", 0);
- dhfile = Conf.ReadValue("openssl", "dhfile", 0);
+ const std::string& GetName() const { return name; }
+ SSL* CreateServerSession() { return ctx.CreateSession(); }
+ SSL* CreateClientSession() { return clictx.CreateSession(); }
+ const EVP_MD* GetDigest() { return digest; }
+ };
+}
- // Set all the default values needed.
- if (cafile.empty())
- cafile = "ca.pem";
+static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
+{
+ /* XXX: This will allow self signed certificates.
+ * In the future if we want an option to not allow this,
+ * we can just return preverify_ok here, and openssl
+ * will boot off self-signed and invalid peer certs.
+ */
+ int ve = X509_STORE_CTX_get_error(ctx);
- if (certfile.empty())
- certfile = "cert.pem";
+ SelfSigned = (ve == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
- if (keyfile.empty())
- keyfile = "key.pem";
+ return 1;
+}
- if (dhfile.empty())
- dhfile = "dhparams.pem";
+class OpenSSLIOHook : public SSLIOHook
+{
+ private:
+ SSL* sess;
+ issl_status status;
+ const bool outbound;
+ bool data_to_write;
+ reference<OpenSSL::Profile> profile;
- // Prepend relative paths with the path to the config directory.
- if ((cafile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(cafile)))
- cafile = confdir + cafile;
+ bool Handshake(StreamSocket* user)
+ {
+ int ret;
- if ((certfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(certfile)))
- certfile = confdir + certfile;
+ if (outbound)
+ ret = SSL_connect(sess);
+ else
+ ret = SSL_accept(sess);
- if ((keyfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(keyfile)))
- keyfile = confdir + keyfile;
+ if (ret < 0)
+ {
+ int err = SSL_get_error(sess, ret);
- if ((dhfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(dhfile)))
- dhfile = confdir + dhfile;
+ if (err == SSL_ERROR_WANT_READ)
+ {
+ SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+ this->status = ISSL_HANDSHAKING;
+ return true;
+ }
+ else if (err == SSL_ERROR_WANT_WRITE)
+ {
+ SocketEngine::ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE);
+ this->status = ISSL_HANDSHAKING;
+ return true;
+ }
+ else
+ {
+ CloseSession();
+ }
- /* Load our keys and certificates
- * NOTE: OpenSSL's error logging API sucks, don't blame us for this clusterfuck.
- */
- if ((!SSL_CTX_use_certificate_chain_file(ctx, certfile.c_str())) || (!SSL_CTX_use_certificate_chain_file(clictx, certfile.c_str())))
- {
- ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Can't read certificate file %s. %s", certfile.c_str(), strerror(errno));
- ERR_print_errors_cb(error_callback, this);
+ return false;
}
-
- if (((!SSL_CTX_use_PrivateKey_file(ctx, keyfile.c_str(), SSL_FILETYPE_PEM))) || (!SSL_CTX_use_PrivateKey_file(clictx, keyfile.c_str(), SSL_FILETYPE_PEM)))
+ else if (ret > 0)
{
- ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Can't read key file %s. %s", keyfile.c_str(), strerror(errno));
- ERR_print_errors_cb(error_callback, this);
- }
+ // Handshake complete.
+ VerifyCertificate();
- /* Load the CAs we trust*/
- if (((!SSL_CTX_load_verify_locations(ctx, cafile.c_str(), 0))) || (!SSL_CTX_load_verify_locations(clictx, cafile.c_str(), 0)))
- {
- ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Can't read CA list from %s. %s", cafile.c_str(), strerror(errno));
- ERR_print_errors_cb(error_callback, this);
- }
+ status = ISSL_OPEN;
- FILE* dhpfile = fopen(dhfile.c_str(), "r");
- DH* ret;
+ SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE | FD_ADD_TRIAL_WRITE);
- if (dhpfile == NULL)
- {
- ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so Couldn't open DH file %s: %s", dhfile.c_str(), strerror(errno));
- throw ModuleException("Couldn't open DH file " + dhfile + ": " + strerror(errno));
+ return true;
}
- else
+ else if (ret == 0)
{
- ret = PEM_read_DHparams(dhpfile, NULL, NULL, NULL);
- if ((SSL_CTX_set_tmp_dh(ctx, ret) < 0) || (SSL_CTX_set_tmp_dh(clictx, ret) < 0))
- {
- ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Couldn't set DH parameters %s. SSL errors follow:", dhfile.c_str());
- ERR_print_errors_cb(error_callback, this);
- }
+ CloseSession();
+ return true;
}
- fclose(dhpfile);
- }
-
- void On005Numeric(std::string &output)
- {
- if (!sslports.empty())
- output.append(" SSL=" + sslports);
- }
-
- ~ModuleSSLOpenSSL()
- {
- SSL_CTX_free(ctx);
- SSL_CTX_free(clictx);
- ServerInstance->Modules->UnpublishInterface("BufferedSocketHook", this);
- delete[] sessions;
+ return true;
}
- void OnCleanup(int target_type, void* item)
+ void CloseSession()
{
- if (target_type == TYPE_USER)
+ if (sess)
{
- User* user = (User*)item;
-
- if (user->GetIOHook() == this)
- {
- // 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->Users->QuitUser(user, "SSL module unloading");
- user->DelIOHook();
- }
+ SSL_shutdown(sess);
+ SSL_free(sess);
}
+ sess = NULL;
+ certificate = NULL;
+ status = ISSL_NONE;
+ errno = EIO;
}
- Version GetVersion()
+ void VerifyCertificate()
{
- return Version("Provides SSL support for clients", VF_VENDOR, API_VERSION);
- }
+ X509* cert;
+ ssl_cert* certinfo = new ssl_cert;
+ this->certificate = certinfo;
+ unsigned int n;
+ unsigned char md[EVP_MAX_MD_SIZE];
+ cert = SSL_get_peer_certificate(sess);
- const char* OnRequest(Request* request)
- {
- ISHRequest* ISR = (ISHRequest*)request;
- if (strcmp("IS_NAME", request->GetId()) == 0)
+ if (!cert)
{
- return "openssl";
+ certinfo->error = "Could not get peer certificate: "+std::string(get_error());
+ return;
}
- else if (strcmp("IS_HOOK", request->GetId()) == 0)
+
+ certinfo->invalid = (SSL_get_verify_result(sess) != X509_V_OK);
+
+ if (!SelfSigned)
{
- ISR->Sock->AddIOHook(this);
- return "OK";
+ certinfo->unknownsigner = false;
+ certinfo->trusted = true;
}
- else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
+ else
{
- ISR->Sock->DelIOHook();
- return "OK";
+ certinfo->unknownsigner = true;
+ certinfo->trusted = false;
}
- else if (strcmp("IS_HSDONE", request->GetId()) == 0)
- {
- if (ISR->Sock->GetFd() < 0)
- return "OK";
- issl_session* session = &sessions[ISR->Sock->GetFd()];
- return (session->status == ISSL_HANDSHAKING) ? NULL : "OK";
- }
- else if (strcmp("IS_ATTACH", request->GetId()) == 0)
+ certinfo->dn = X509_NAME_oneline(X509_get_subject_name(cert),0,0);
+ certinfo->issuer = X509_NAME_oneline(X509_get_issuer_name(cert),0,0);
+
+ if (!X509_digest(cert, profile->GetDigest(), md, &n))
{
- issl_session* session = &sessions[ISR->Sock->GetFd()];
- if (session->sess)
- {
- return "OK";
- }
+ certinfo->error = "Out of memory generating fingerprint";
}
- else if (strcmp("GET_CERT", request->GetId()) == 0)
+ else
{
- Module* sslinfo = ServerInstance->Modules->Find("m_sslinfo.so");
- if (sslinfo)
- return sslinfo->OnRequest(request);
+ certinfo->fingerprint = BinToHex(md, n);
}
- return NULL;
- }
-
-
- void OnStreamSocketAccept(StreamSocket* user, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
- {
- int fd = user->GetFd();
-
- issl_session* session = &sessions[fd];
- session->fd = fd;
- session->inbuf = new char[inbufsize];
- session->inbufoffset = 0;
- session->sess = SSL_new(ctx);
- session->status = ISSL_NONE;
- session->outbound = false;
-
- if (session->sess == NULL)
- return;
-
- if (SSL_set_fd(session->sess, fd) == 0)
+ if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), ServerInstance->Time()) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), ServerInstance->Time()) == 0))
{
- ServerInstance->Logs->Log("m_ssl_openssl",DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd);
- return;
+ certinfo->error = "Not activated, or expired certificate";
}
- Handshake(user, session);
+ X509_free(cert);
}
- void OnStreamSocketConnect(StreamSocket* user)
+ public:
+ OpenSSLIOHook(IOHookProvider* hookprov, StreamSocket* sock, bool is_outbound, SSL* session, const reference<OpenSSL::Profile>& sslprofile)
+ : SSLIOHook(hookprov)
+ , sess(session)
+ , status(ISSL_NONE)
+ , outbound(is_outbound)
+ , data_to_write(false)
+ , profile(sslprofile)
{
- int fd = user->GetFd();
- /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
- if ((fd < 0) || (fd > ServerInstance->SE->GetMaxFds() -1))
- return;
-
- issl_session* session = &sessions[fd];
-
- session->fd = fd;
- session->inbuf = new char[inbufsize];
- session->inbufoffset = 0;
- session->sess = SSL_new(clictx);
- session->status = ISSL_NONE;
- session->outbound = true;
-
- if (session->sess == NULL)
+ if (sess == NULL)
return;
+ if (SSL_set_fd(sess, sock->GetFd()) == 0)
+ throw ModuleException("Can't set fd with SSL_set_fd: " + ConvToStr(sock->GetFd()));
- if (SSL_set_fd(session->sess, fd) == 0)
- {
- ServerInstance->Logs->Log("m_ssl_openssl",DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd);
- return;
- }
-
- Handshake(user, session);
+ sock->AddIOHook(this);
+ Handshake(sock);
}
- void OnStreamSocketClose(StreamSocket* user)
+ void OnStreamSocketClose(StreamSocket* user) CXX11_OVERRIDE
{
- int fd = user->GetFd();
- /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
- if ((fd < 0) || (fd > ServerInstance->SE->GetMaxFds() - 1))
- return;
-
- CloseSession(&sessions[fd]);
+ CloseSession();
}
- int OnStreamSocketRead(StreamSocket* user, std::string& recvq)
+ int OnStreamSocketRead(StreamSocket* user, std::string& recvq) CXX11_OVERRIDE
{
- int fd = user->GetFd();
- /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
- if ((fd < 0) || (fd > ServerInstance->SE->GetMaxFds() - 1))
- return -1;
-
- issl_session* session = &sessions[fd];
-
- if (!session->sess)
+ if (!sess)
{
- CloseSession(session);
+ CloseSession();
return -1;
}
- if (session->status == ISSL_HANDSHAKING)
+ if (status == ISSL_HANDSHAKING)
{
- if (session->rstat == ISSL_READ || session->wstat == ISSL_READ)
- {
- // The handshake isn't finished and it wants to read, try to finish it.
- if (!Handshake(user, session))
- {
- // Couldn't resume handshake.
- if (session->status == ISSL_NONE)
- return -1;
- return 0;
- }
- }
- else
+ // The handshake isn't finished and it wants to read, try to finish it.
+ if (!Handshake(user))
{
+ // Couldn't resume handshake.
+ if (status == ISSL_NONE)
+ return -1;
return 0;
}
}
- // If we resumed the handshake then session->status will be ISSL_OPEN
+ // If we resumed the handshake then this->status will be ISSL_OPEN
- if (session->status == ISSL_OPEN)
+ if (status == ISSL_OPEN)
{
- if (session->wstat == ISSL_READ)
+ char* buffer = ServerInstance->GetReadBuffer();
+ size_t bufsiz = ServerInstance->Config->NetBufferSize;
+ int ret = SSL_read(sess, buffer, bufsiz);
+
+ if (ret > 0)
{
- if(DoWrite(user, session) == 0)
- return 0;
+ recvq.append(buffer, ret);
+ if (data_to_write)
+ SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_SINGLE_WRITE);
+ return 1;
}
-
- if (session->rstat == ISSL_READ)
+ else if (ret == 0)
{
- int ret = DoRead(user, session);
+ // Client closed connection.
+ CloseSession();
+ user->SetError("Connection closed");
+ return -1;
+ }
+ else if (ret < 0)
+ {
+ int err = SSL_get_error(sess, ret);
- if (ret > 0)
+ if (err == SSL_ERROR_WANT_READ)
{
- recvq.append(session->inbuf, session->inbufoffset);
- session->inbufoffset = 0;
- return 1;
+ SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ);
+ return 0;
}
- else if (errno == EAGAIN || errno == EINTR)
+ else if (err == SSL_ERROR_WANT_WRITE)
+ {
+ SocketEngine::ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE);
return 0;
+ }
else
+ {
+ CloseSession();
return -1;
+ }
}
}
return 0;
}
- int OnStreamSocketWrite(StreamSocket* user, std::string& buffer)
+ int OnStreamSocketWrite(StreamSocket* user, std::string& buffer) CXX11_OVERRIDE
{
- int fd = user->GetFd();
- /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
- if ((fd < 0) || (fd > ServerInstance->SE->GetMaxFds() - 1))
+ if (!sess)
+ {
+ CloseSession();
return -1;
+ }
- issl_session* session = &sessions[fd];
+ data_to_write = true;
- if (!session->sess)
+ if (status == ISSL_HANDSHAKING)
{
- CloseSession(session);
- return -1;
+ if (!Handshake(user))
+ {
+ // Couldn't resume handshake.
+ if (status == ISSL_NONE)
+ return -1;
+ return 0;
+ }
}
- if (session->status == ISSL_HANDSHAKING)
+ if (status == ISSL_OPEN)
{
- // The handshake isn't finished, try to finish it.
- if (session->rstat == ISSL_WRITE || session->wstat == ISSL_WRITE)
+ int ret = SSL_write(sess, buffer.data(), buffer.size());
+ if (ret == (int)buffer.length())
+ {
+ data_to_write = false;
+ SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+ return 1;
+ }
+ else if (ret > 0)
+ {
+ buffer = buffer.substr(ret);
+ SocketEngine::ChangeEventMask(user, FD_WANT_SINGLE_WRITE);
+ return 0;
+ }
+ else if (ret == 0)
{
- if (!Handshake(user, session))
+ CloseSession();
+ return -1;
+ }
+ else if (ret < 0)
+ {
+ int err = SSL_get_error(sess, ret);
+
+ if (err == SSL_ERROR_WANT_WRITE)
{
- // Couldn't resume handshake.
- if (session->status == ISSL_NONE)
- return -1;
+ SocketEngine::ChangeEventMask(user, FD_WANT_SINGLE_WRITE);
return 0;
}
+ else if (err == SSL_ERROR_WANT_READ)
+ {
+ SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ);
+ return 0;
+ }
+ else
+ {
+ CloseSession();
+ return -1;
+ }
}
}
+ return 0;
+ }
- int rv = 0;
-
- // don't pull items into the output buffer until they are
- // unlikely to block; this allows sendq exceeded to continue
- // to work for SSL users.
- // TODO better signaling for I/O requests so this isn't needed
- if (session->outbuf.empty())
- {
- session->outbuf = buffer;
- rv = 1;
- }
-
- if (session->status == ISSL_OPEN)
+ void TellCiphersAndFingerprint(LocalUser* user)
+ {
+ if (sess)
{
- if (session->rstat == ISSL_WRITE)
- {
- DoRead(user, session);
- }
+ std::string text = "*** You are connected using SSL cipher '" + std::string(SSL_get_cipher(sess)) + "'";
+ const std::string& fingerprint = certificate->fingerprint;
+ if (!fingerprint.empty())
+ text += " and your SSL fingerprint is " + fingerprint;
- if (session->wstat == ISSL_WRITE)
- {
- DoWrite(user, session);
- }
+ user->WriteNotice(text);
}
+ }
+};
- if (rv == 0 || !session->outbuf.empty())
- ServerInstance->SE->WantWrite(user);
+class OpenSSLIOHookProvider : public refcountbase, public IOHookProvider
+{
+ reference<OpenSSL::Profile> profile;
- return rv;
+ public:
+ OpenSSLIOHookProvider(Module* mod, reference<OpenSSL::Profile>& prof)
+ : IOHookProvider(mod, "ssl/" + prof->GetName(), IOHookProvider::IOH_SSL)
+ , profile(prof)
+ {
+ ServerInstance->Modules->AddService(*this);
}
- int DoWrite(StreamSocket* user, issl_session* session)
+ ~OpenSSLIOHookProvider()
{
- if (!session->outbuf.size())
- return -1;
-
- int ret = SSL_write(session->sess, session->outbuf.data(), session->outbuf.size());
-
- if (ret == 0)
- {
- CloseSession(session);
- return 0;
- }
- else if (ret < 0)
- {
- int err = SSL_get_error(session->sess, ret);
+ ServerInstance->Modules->DelService(*this);
+ }
- if (err == SSL_ERROR_WANT_WRITE)
- {
- session->wstat = ISSL_WRITE;
- ServerInstance->SE->WantWrite(user);
- return -1;
- }
- else if (err == SSL_ERROR_WANT_READ)
- {
- session->wstat = ISSL_READ;
- return -1;
- }
- else
- {
- CloseSession(session);
- return 0;
- }
- }
- else
- {
- session->outbuf = session->outbuf.substr(ret);
- return ret;
- }
+ void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
+ {
+ new OpenSSLIOHook(this, sock, false, profile->CreateServerSession(), profile);
}
- int DoRead(StreamSocket* user, issl_session* session)
+ void OnConnect(StreamSocket* sock) CXX11_OVERRIDE
{
- // Is this right? Not sure if the unencrypted data is garaunteed to be the same length.
- // Read into the inbuffer, offset from the beginning by the amount of data we have that insp hasn't taken yet.
+ new OpenSSLIOHook(this, sock, true, profile->CreateClientSession(), profile);
+ }
+};
- int ret = SSL_read(session->sess, session->inbuf + session->inbufoffset, inbufsize - session->inbufoffset);
+class ModuleSSLOpenSSL : public Module
+{
+ typedef std::vector<reference<OpenSSLIOHookProvider> > ProfileList;
- if (ret == 0)
- {
- // Client closed connection.
- CloseSession(session);
- return 0;
- }
- else if (ret < 0)
+ std::string sslports;
+ ProfileList profiles;
+
+ void ReadProfiles()
+ {
+ ProfileList newprofiles;
+ ConfigTagList tags = ServerInstance->Config->ConfTags("sslprofile");
+ if (tags.first == tags.second)
{
- int err = SSL_get_error(session->sess, ret);
+ // Create a default profile named "openssl"
+ const std::string defname = "openssl";
+ ConfigTag* tag = ServerInstance->Config->ConfValue(defname);
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "No <sslprofile> tags found, using settings from the <openssl> tag");
- if (err == SSL_ERROR_WANT_READ)
- {
- session->rstat = ISSL_READ;
- return -1;
- }
- else if (err == SSL_ERROR_WANT_WRITE)
+ try
{
- session->rstat = ISSL_WRITE;
- ServerInstance->SE->WantWrite(user);
- return -1;
+ reference<OpenSSL::Profile> profile(new OpenSSL::Profile(defname, tag));
+ newprofiles.push_back(new OpenSSLIOHookProvider(this, profile));
}
- else
+ catch (OpenSSL::Exception& ex)
{
- CloseSession(session);
- return 0;
+ throw ModuleException("Error while initializing the default SSL profile - " + ex.GetReason());
}
}
- else
- {
- // Read successfully 'ret' bytes into inbuf + inbufoffset
- // There are 'ret' + 'inbufoffset' bytes of data in 'inbuf'
- // 'buffer' is 'count' long
-
- session->inbufoffset += ret;
- return ret;
- }
- }
-
- bool Handshake(EventHandler* user, issl_session* session)
- {
- int ret;
-
- if (session->outbound)
- ret = SSL_connect(session->sess);
- else
- ret = SSL_accept(session->sess);
-
- if (ret < 0)
+ for (ConfigIter i = tags.first; i != tags.second; ++i)
{
- int err = SSL_get_error(session->sess, ret);
+ ConfigTag* tag = i->second;
+ if (tag->getString("provider") != "openssl")
+ continue;
- if (err == SSL_ERROR_WANT_READ)
+ std::string name = tag->getString("name");
+ if (name.empty())
{
- session->rstat = ISSL_READ;
- session->status = ISSL_HANDSHAKING;
- return true;
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring <sslprofile> tag without name at " + tag->getTagLocation());
+ continue;
}
- else if (err == SSL_ERROR_WANT_WRITE)
+
+ reference<OpenSSL::Profile> profile;
+ try
{
- session->wstat = ISSL_WRITE;
- session->status = ISSL_HANDSHAKING;
- ServerInstance->SE->WantWrite(user);
- return true;
+ profile = new OpenSSL::Profile(name, tag);
}
- else
+ catch (CoreException& ex)
{
- CloseSession(session);
+ throw ModuleException("Error while initializing SSL profile \"" + name + "\" at " + tag->getTagLocation() + " - " + ex.GetReason());
}
- return false;
+ newprofiles.push_back(new OpenSSLIOHookProvider(this, profile));
}
- else if (ret > 0)
- {
- // Handshake complete.
- // This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater.
- EventHandler *u = ServerInstance->SE->GetRef(session->fd);
- VerifyCertificate(session, u);
- session->status = ISSL_OPEN;
-
- ServerInstance->SE->WantWrite(user);
-
- return true;
- }
- else if (ret == 0)
- {
- CloseSession(session);
- return true;
- }
-
- return true;
+ profiles.swap(newprofiles);
}
- void OnBufferFlushed(User* user)
+ public:
+ ModuleSSLOpenSSL()
{
- if (user->GetIOHook() == this)
- {
- std::string dummy;
- issl_session* session = &sessions[user->GetFd()];
- if (session && session->outbuf.size())
- OnStreamSocketWrite(user, dummy);
- }
+ // Initialize OpenSSL
+ SSL_library_init();
+ SSL_load_error_strings();
}
- void CloseSession(issl_session* session)
+ void init() CXX11_OVERRIDE
{
- if (session->sess)
- {
- SSL_shutdown(session->sess);
- SSL_free(session->sess);
- }
-
- if (session->inbuf)
- {
- delete[] session->inbuf;
- }
-
- session->outbuf.clear();
- session->inbuf = NULL;
- session->sess = NULL;
- session->status = ISSL_NONE;
- errno = EIO;
+ ReadProfiles();
}
- void VerifyCertificate(issl_session* session, Extensible* user)
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
- if (!session->sess || !user)
- return;
+ sslports.clear();
- Module* sslinfo = ServerInstance->Modules->Find("m_sslinfo.so");
- if (!sslinfo)
- return;
+ ConfigTag* Conf = ServerInstance->Config->ConfValue("openssl");
- X509* cert;
- ssl_cert* certinfo = new ssl_cert;
- unsigned int n;
- unsigned char md[EVP_MAX_MD_SIZE];
- const EVP_MD *digest = EVP_md5();
+ if (Conf->getBool("showports", true))
+ {
+ sslports = Conf->getString("advertisedports");
+ if (!sslports.empty())
+ return;
- cert = SSL_get_peer_certificate((SSL*)session->sess);
+ for (size_t i = 0; i < ServerInstance->ports.size(); i++)
+ {
+ ListenSocket* port = ServerInstance->ports[i];
+ if (port->bind_tag->getString("ssl") != "openssl")
+ continue;
- if (!cert)
- {
- certinfo->error = "Could not get peer certificate: "+std::string(get_error());
- BufferedSocketFingerprintSubmission(user, this, sslinfo, certinfo).Send();
- return;
+ const std::string& portid = port->bind_desc;
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Enabling SSL for port %s", portid.c_str());
+
+ if (port->bind_tag->getString("type", "clients") == "clients" && port->bind_addr != "127.0.0.1")
+ {
+ /*
+ * Found an SSL port for clients that is not bound to 127.0.0.1 and handled by us, display
+ * the IP:port in ISUPPORT.
+ *
+ * We used to advertise all ports seperated by a ';' char that matched the above criteria,
+ * but this resulted in too long ISUPPORT lines if there were lots of ports to be displayed.
+ * To solve this by default we now only display the first IP:port found and let the user
+ * configure the exact value for the 005 token, if necessary.
+ */
+ sslports = portid;
+ break;
+ }
+ }
}
+ }
- certinfo->invalid = (SSL_get_verify_result(session->sess) != X509_V_OK);
+ void OnModuleRehash(User* user, const std::string ¶m) CXX11_OVERRIDE
+ {
+ if (param != "ssl")
+ return;
- if (SelfSigned)
+ try
{
- certinfo->unknownsigner = false;
- certinfo->trusted = true;
+ ReadProfiles();
}
- else
+ catch (ModuleException& ex)
{
- certinfo->unknownsigner = true;
- certinfo->trusted = false;
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, ex.GetReason() + " Not applying settings.");
}
+ }
- certinfo->dn = X509_NAME_oneline(X509_get_subject_name(cert),0,0);
- certinfo->issuer = X509_NAME_oneline(X509_get_issuer_name(cert),0,0);
+ void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
+ {
+ if (!sslports.empty())
+ tokens["SSL"] = sslports;
+ }
- if (!X509_digest(cert, digest, md, &n))
- {
- certinfo->error = "Out of memory generating fingerprint";
- }
- else
- {
- certinfo->fingerprint = irc::hex(md, n);
- }
+ void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
+ {
+ IOHook* hook = user->eh.GetIOHook();
+ if (hook && hook->prov->creator == this)
+ static_cast<OpenSSLIOHook*>(hook)->TellCiphersAndFingerprint(user);
+ }
- if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), ServerInstance->Time()) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), ServerInstance->Time()) == 0))
+ void OnCleanup(int target_type, void* item) CXX11_OVERRIDE
+ {
+ if (target_type == TYPE_USER)
{
- certinfo->error = "Not activated, or expired certificate";
- }
+ LocalUser* user = IS_LOCAL((User*)item);
- X509_free(cert);
- BufferedSocketFingerprintSubmission(user, this, sslinfo, certinfo).Send();
+ if (user && user->eh.GetIOHook() && user->eh.GetIOHook()->prov->creator == this)
+ {
+ // 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->Users->QuitUser(user, "SSL module unloading");
+ }
+ }
}
- void Prioritize()
+ Version GetVersion() CXX11_OVERRIDE
{
- Module* server = ServerInstance->Modules->Find("m_spanningtree.so");
- ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_AFTER, &server);
+ return Version("Provides SSL support for clients", VF_VENDOR);
}
-
};
-static int error_callback(const char *str, size_t len, void *u)
-{
- ModuleSSLOpenSSL* mssl = (ModuleSSLOpenSSL*)u;
- mssl->PublicInstance->Logs->Log("m_ssl_openssl",DEFAULT, "SSL error: " + std::string(str, len - 1));
-
- //
- // XXX: Remove this line, it causes valgrind warnings...
- //
- // MD_update(&m, buf, j);
- //
- //
- // ... ONLY JOKING! :-)
- //
-
- return 0;
-}
-
MODULE_INIT(ModuleSSLOpenSSL)
projects / user / henk / code / inspircd.git / blobdiff