X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=a0043b7aa57c0e1b0465ecca0944b70a47769806;hb=36f93c0e7f8a980943237b0b28138ade86f5e573;hp=b9e23ba0b017fff8758cf123368cd4da718acaa1;hpb=8bcd42704bb3c5361a9d3eacb0c793102d4f826a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index b9e23ba0b..a0043b7aa 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -1,56 +1,64 @@ -/* +------------------------------------+ - * | 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 + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2006-2008 Craig Edwards + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Oliver Lupton * - * 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 . */ + /* 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 #include -#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) */ enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN }; -enum issl_io_status { ISSL_WRITE, ISSL_READ }; static bool SelfSigned = false; -bool isin(const std::string &host, int port, const std::vector &portlist) -{ - if (std::find(portlist.begin(), portlist.end(), "*:" + ConvToStr(port)) != portlist.end()) - return true; - - if (std::find(portlist.begin(), portlist.end(), ":" + ConvToStr(port)) != portlist.end()) - return true; - - return std::find(portlist.begin(), portlist.end(), host + ":" + ConvToStr(port)) != portlist.end(); -} - char* get_error() { return ERR_error_string(ERR_get_error(), NULL); @@ -60,25 +68,20 @@ static int error_callback(const char *str, size_t len, void *u); /** Represents an SSL user's extra data */ -class issl_session : public classbase +class issl_session { public: SSL* sess; issl_status status; - issl_io_status rstat; - issl_io_status wstat; + reference cert; - unsigned int inbufoffset; - char* inbuf; // Buffer OpenSSL reads into. - std::string outbuf; // Buffer for outgoing data that OpenSSL will not take. - int fd; bool outbound; + bool data_to_write; issl_session() { outbound = false; - rstat = ISSL_READ; - wstat = ISSL_WRITE; + data_to_write = false; } }; @@ -96,350 +99,175 @@ static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx) return 1; } -class ModuleSSLOpenSSL : public Module +class OpenSSLIOHook : public SSLIOHook { - std::vector listenports; - - int inbufsize; - issl_session* sessions; - - SSL_CTX* ctx; - SSL_CTX* clictx; - - char* dummy; - char cipher[MAXBUF]; - - std::string keyfile; - std::string certfile; - std::string cafile; - // std::string crlfile; - std::string dhfile; - std::string sslports; - - int clientactive; - - public: - - InspIRCd* PublicInstance; - - ModuleSSLOpenSSL(InspIRCd* Me) - : Module(Me), PublicInstance(Me) + private: + bool Handshake(StreamSocket* user, issl_session* session) { - ServerInstance->Modules->PublishInterface("BufferedSocketHook", this); - - sessions = new issl_session[ServerInstance->SE->GetMaxFds()]; + int ret; - // Not rehashable...because I cba to reduce all the sizes of existing buffers. - inbufsize = ServerInstance->Config->NetBufferSize; + if (session->outbound) + ret = SSL_connect(session->sess); + else + ret = SSL_accept(session->sess); - /* Global SSL library initialization*/ - SSL_library_init(); - SSL_load_error_strings(); + if (ret < 0) + { + int err = SSL_get_error(session->sess, ret); - /* Build our SSL contexts: - * NOTE: OpenSSL makes us have two contexts, one for servers and one for clients. ICK. - */ - ctx = SSL_CTX_new( SSLv23_server_method() ); - clictx = SSL_CTX_new( SSLv23_client_method() ); + if (err == SSL_ERROR_WANT_READ) + { + ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); + session->status = ISSL_HANDSHAKING; + return true; + } + else if (err == SSL_ERROR_WANT_WRITE) + { + ServerInstance->SE->ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE); + session->status = ISSL_HANDSHAKING; + return true; + } + else + { + CloseSession(session); + } - 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); + return false; + } + else if (ret > 0) + { + // Handshake complete. + VerifyCertificate(session, user); - 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); + session->status = ISSL_OPEN; - // Needs the flag as it ignores a plain /rehash - OnRehash(NULL,"ssl"); - Implementation eventlist[] = { I_OnRawSocketConnect, I_OnRawSocketAccept, I_OnRawSocketClose, I_OnRawSocketRead, I_OnRawSocketWrite, I_OnCleanup, I_On005Numeric, - I_OnBufferFlushed, I_OnRequest, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUnloadModule, I_OnRehash, I_OnWhois, I_OnPostConnect, I_OnHookUserIO }; - ServerInstance->Modules->Attach(eventlist, this, 16); - } + ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE | FD_ADD_TRIAL_WRITE); - virtual void OnHookUserIO(User* user, const std::string &targetip) - { - if (!user->GetIOHook() && isin(targetip,user->GetPort(), listenports)) + return true; + } + else if (ret == 0) { - /* Hook the user with our module */ - user->AddIOHook(this); + CloseSession(session); + return true; } + + return true; } - virtual void OnRehash(User* user, const std::string ¶m) + void CloseSession(issl_session* session) { - ConfigReader Conf(ServerInstance); - - listenports.clear(); - clientactive = 0; - sslports.clear(); - - for(int index = 0; index < Conf.Enumerate("bind"); index++) + if (session->sess) { - // For each tag - std::string x = Conf.ReadValue("bind", "type", index); - if(((x.empty()) || (x == "clients")) && (Conf.ReadValue("bind", "ssl", index) == "openssl")) - { - // Get the port we're meant to be listening on with SSL - std::string port = Conf.ReadValue("bind", "port", index); - std::string addr = Conf.ReadValue("bind", "address", index); - - if (!addr.empty()) - { - // normalize address, important for IPv6 - int portint = 0; - irc::sockets::sockaddrs bin; - if (irc::sockets::aptosa(addr.c_str(), portint, &bin)) - irc::sockets::satoap(addr, portint, &bin); - } - - irc::portparser portrange(port, false); - long portno = -1; - while ((portno = portrange.GetToken())) - { - clientactive++; - try - { - listenports.push_back(addr + ":" + ConvToStr(portno)); - - for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++) - if ((ServerInstance->Config->ports[i]->GetPort() == portno) && (ServerInstance->Config->ports[i]->GetIP() == addr)) - ServerInstance->Config->ports[i]->SetDescription("ssl"); - ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %ld", portno); - - sslports.append((addr.empty() ? "*" : addr)).append(":").append(ConvToStr(portno)).append(";"); - } - catch (ModuleException &e) - { - ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %ld: %s. Maybe it's already hooked by the same port on a different IP, or you have an other SSL or similar module loaded?", portno, e.GetReason()); - } - } - } + SSL_shutdown(session->sess); + SSL_free(session->sess); } - if (!sslports.empty()) - sslports.erase(sslports.end() - 1); + session->sess = NULL; + session->status = ISSL_NONE; + errno = EIO; + } - if (param != "ssl") - { + void VerifyCertificate(issl_session* session, StreamSocket* user) + { + if (!session->sess || !user) return; - } - std::string confdir(ServerInstance->ConfigFileName); - // +1 so we the path ends with a / - confdir = confdir.substr(0, confdir.find_last_of('/') + 1); - - cafile = Conf.ReadValue("openssl", "cafile", 0); - certfile = Conf.ReadValue("openssl", "certfile", 0); - keyfile = Conf.ReadValue("openssl", "keyfile", 0); - dhfile = Conf.ReadValue("openssl", "dhfile", 0); - - // Set all the default values needed. - if (cafile.empty()) - cafile = "ca.pem"; - - if (certfile.empty()) - certfile = "cert.pem"; - - if (keyfile.empty()) - keyfile = "key.pem"; - - if (dhfile.empty()) - dhfile = "dhparams.pem"; - - // Prepend relative paths with the path to the config directory. - if ((cafile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(cafile))) - cafile = confdir + cafile; - - if ((certfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(certfile))) - certfile = confdir + certfile; - - if ((keyfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(keyfile))) - keyfile = confdir + keyfile; + X509* cert; + ssl_cert* certinfo = new ssl_cert; + session->cert = certinfo; + unsigned int n; + unsigned char md[EVP_MAX_MD_SIZE]; - if ((dhfile[0] != '/') && (!ServerInstance->Config->StartsWithWindowsDriveLetter(dhfile))) - dhfile = confdir + dhfile; + cert = SSL_get_peer_certificate((SSL*)session->sess); - /* 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()))) + if (!cert) { - 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); + certinfo->error = "Could not get peer certificate: "+std::string(get_error()); + return; } - 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))) + certinfo->invalid = (SSL_get_verify_result(session->sess) != X509_V_OK); + + if (SelfSigned) { - 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); + certinfo->unknownsigner = false; + certinfo->trusted = true; } - - /* 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))) + else { - 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); + certinfo->unknownsigner = true; + certinfo->trusted = false; } - FILE* dhpfile = fopen(dhfile.c_str(), "r"); - DH* ret; + 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 (dhpfile == NULL) + if (!X509_digest(cert, digest, md, &n)) { - 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)); + certinfo->error = "Out of memory generating fingerprint"; } else { - 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); - } + certinfo->fingerprint = BinToHex(md, n); } - fclose(dhpfile); - } - - virtual void On005Numeric(std::string &output) - { - output.append(" SSL=" + sslports); - } - - virtual ~ModuleSSLOpenSSL() - { - SSL_CTX_free(ctx); - SSL_CTX_free(clictx); - ServerInstance->Modules->UnpublishInterface("BufferedSocketHook", this); - delete[] sessions; - } - - virtual void OnCleanup(int target_type, void* item) - { - if (target_type == TYPE_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)) { - 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(); - } - if (user->GetExt("ssl_cert", dummy)) - { - ssl_cert* tofree; - user->GetExt("ssl_cert", tofree); - delete tofree; - user->Shrink("ssl_cert"); - } + certinfo->error = "Not activated, or expired certificate"; } - } - virtual void OnUnloadModule(Module* mod, const std::string &name) - { - if (mod == this) - { - for(unsigned int i = 0; i < listenports.size(); i++) - { - for (size_t j = 0; j < ServerInstance->Config->ports.size(); j++) - if (listenports[i] == (ServerInstance->Config->ports[j]->GetIP()+":"+ConvToStr(ServerInstance->Config->ports[j]->GetPort()))) - ServerInstance->Config->ports[j]->SetDescription("plaintext"); - } - } + X509_free(cert); } - virtual Version GetVersion() + public: + issl_session* sessions; + SSL_CTX* ctx; + SSL_CTX* clictx; + const EVP_MD *digest; + + OpenSSLIOHook(Module* mod) + : SSLIOHook(mod, "ssl/openssl") { - return Version("$Id$", VF_VENDOR, API_VERSION); + sessions = new issl_session[ServerInstance->SE->GetMaxFds()]; } - - virtual const char* OnRequest(Request* request) + ~OpenSSLIOHook() { - ISHRequest* ISR = (ISHRequest*)request; - if (strcmp("IS_NAME", request->GetId()) == 0) - { - return "openssl"; - } - else if (strcmp("IS_HOOK", request->GetId()) == 0) - { - const char* ret = "OK"; - try - { - ret = ISR->Sock->AddIOHook((Module*)this) ? "OK" : NULL; - } - catch (ModuleException &e) - { - return NULL; - } - - return ret; - } - else if (strcmp("IS_UNHOOK", request->GetId()) == 0) - { - return ISR->Sock->DelIOHook() ? "OK" : NULL; - } - 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) - { - issl_session* session = &sessions[ISR->Sock->GetFd()]; - if (session->sess) - { - VerifyCertificate(session, (BufferedSocket*)ISR->Sock); - return "OK"; - } - } - return NULL; + delete[] sessions; } - - virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport) + void OnStreamSocketAccept(StreamSocket* user, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE { - /* 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; + 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; + session->cert = NULL; if (session->sess == NULL) return; 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); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "BUG: Can't set fd with SSL_set_fd: %d", fd); return; } - Handshake(session); + Handshake(user, session); } - virtual void OnRawSocketConnect(int fd) + void OnStreamSocketConnect(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; 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; @@ -449,62 +277,47 @@ class ModuleSSLOpenSSL : public Module 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); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "BUG: Can't set fd with SSL_set_fd: %d", fd); return; } - Handshake(session); + Handshake(user, session); } - virtual void OnRawSocketClose(int fd) + 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]); - - EventHandler* user = ServerInstance->SE->GetRef(fd); - - if ((user) && (user->GetExt("ssl_cert", dummy))) - { - ssl_cert* tofree; - user->GetExt("ssl_cert", tofree); - delete tofree; - user->Shrink("ssl_cert"); - } } - virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) + 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 0; + return -1; issl_session* session = &sessions[fd]; if (!session->sess) { - readresult = 0; CloseSession(session); - return 1; + return -1; } if (session->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)) { - // The handshake isn't finished and it wants to read, try to finish it. - if (!Handshake(session)) - { - // Couldn't resume handshake. + // Couldn't resume handshake. + if (session->status == ISSL_NONE) return -1; - } - } - else - { - errno = EAGAIN; - return -1; + return 0; } } @@ -512,51 +325,52 @@ class ModuleSSLOpenSSL : public Module if (session->status == ISSL_OPEN) { - if (session->wstat == ISSL_READ) + char* buffer = ServerInstance->GetReadBuffer(); + size_t bufsiz = ServerInstance->Config->NetBufferSize; + int ret = SSL_read(session->sess, buffer, bufsiz); + + if (ret > 0) { - if(DoWrite(session) == 0) - return 0; + recvq.append(buffer, ret); + if (session->data_to_write) + ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_SINGLE_WRITE); + return 1; } - - if (session->rstat == ISSL_READ) + else if (ret == 0) + { + // Client closed connection. + CloseSession(session); + user->SetError("Connection closed"); + return -1; + } + else if (ret < 0) { - int ret = DoRead(session); + int err = SSL_get_error(session->sess, ret); - if (ret > 0) + if (err == SSL_ERROR_WANT_READ) + { + ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ); + return 0; + } + else if (err == SSL_ERROR_WANT_WRITE) + { + ServerInstance->SE->ChangeEventMask(user, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE); + return 0; + } + else { - if (count <= session->inbufoffset) - { - memcpy(buffer, session->inbuf, count); - // Move the stuff left in inbuf to the beginning of it - memmove(session->inbuf, session->inbuf + count, (session->inbufoffset - count)); - // Now we need to set session->inbufoffset to the amount of data still waiting to be handed to insp. - session->inbufoffset -= count; - // Insp uses readresult as the count of how much data there is in buffer, so: - readresult = count; - } - else - { - // There's not as much in the inbuf as there is space in the buffer, so just copy the whole thing. - memcpy(buffer, session->inbuf, session->inbufoffset); - - readresult = session->inbufoffset; - // Zero the offset, as there's nothing there.. - session->inbufoffset = 0; - } - return 1; + CloseSession(session); + return -1; } - return ret; } } - return -1; + return 0; } - virtual int OnRawSocketWrite(int fd, const char* buffer, int count) + int OnStreamSocketWrite(StreamSocket* user, std::string& buffer) CXX11_OVERRIDE { - /* 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 0; + int fd = user->GetFd(); issl_session* session = &sessions[fd]; @@ -566,340 +380,289 @@ class ModuleSSLOpenSSL : public Module return -1; } - session->outbuf.append(buffer, count); - MakePollWrite(session); + session->data_to_write = true; if (session->status == ISSL_HANDSHAKING) { - // The handshake isn't finished, try to finish it. - if (session->rstat == ISSL_WRITE || session->wstat == ISSL_WRITE) + if (!Handshake(user, session)) { - Handshake(session); + // Couldn't resume handshake. + if (session->status == ISSL_NONE) + return -1; + return 0; } } if (session->status == ISSL_OPEN) { - if (session->rstat == ISSL_WRITE) - { - DoRead(session); - } - - if (session->wstat == ISSL_WRITE) + int ret = SSL_write(session->sess, buffer.data(), buffer.size()); + if (ret == (int)buffer.length()) { - return DoWrite(session); + session->data_to_write = false; + ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); + return 1; } - } - - return 1; - } - - int DoWrite(issl_session* session) - { - 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); - - if (err == SSL_ERROR_WANT_WRITE) + else if (ret > 0) { - session->wstat = ISSL_WRITE; - return -1; + buffer = buffer.substr(ret); + ServerInstance->SE->ChangeEventMask(user, FD_WANT_SINGLE_WRITE); + return 0; } - else if (err == SSL_ERROR_WANT_READ) + else if (ret == 0) { - session->wstat = ISSL_READ; + CloseSession(session); return -1; } - else + else if (ret < 0) { - CloseSession(session); - return 0; + int err = SSL_get_error(session->sess, ret); + + if (err == SSL_ERROR_WANT_WRITE) + { + ServerInstance->SE->ChangeEventMask(user, FD_WANT_SINGLE_WRITE); + return 0; + } + else if (err == SSL_ERROR_WANT_READ) + { + ServerInstance->SE->ChangeEventMask(user, FD_WANT_POLL_READ); + return 0; + } + else + { + CloseSession(session); + return -1; + } } } - else - { - session->outbuf = session->outbuf.substr(ret); - return ret; - } + return 0; } - int DoRead(issl_session* session) + ssl_cert* GetCertificate(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. - - int ret = SSL_read(session->sess, session->inbuf + session->inbufoffset, inbufsize - session->inbufoffset); + int fd = sock->GetFd(); + issl_session* session = &sessions[fd]; + return session->cert; + } - if (ret == 0) - { - // Client closed connection. - CloseSession(session); - return 0; - } - else if (ret < 0) + void TellCiphersAndFingerprint(LocalUser* user) + { + issl_session& s = sessions[user->eh.GetFd()]; + if (s.sess) { - int err = SSL_get_error(session->sess, ret); + std::string text = "*** You are connected using SSL cipher '" + std::string(SSL_get_cipher(s.sess)) + "'"; + const std::string& fingerprint = s.cert->fingerprint; + if (!fingerprint.empty()) + text += " and your SSL fingerprint is " + fingerprint; - if (err == SSL_ERROR_WANT_READ) - { - session->rstat = ISSL_READ; - return -1; - } - else if (err == SSL_ERROR_WANT_WRITE) - { - session->rstat = ISSL_WRITE; - MakePollWrite(session); - return -1; - } - else - { - CloseSession(session); - return 0; - } + user->WriteNotice(text); } - else - { - // Read successfully 'ret' bytes into inbuf + inbufoffset - // There are 'ret' + 'inbufoffset' bytes of data in 'inbuf' - // 'buffer' is 'count' long + } +}; + +class ModuleSSLOpenSSL : public Module +{ + std::string sslports; + OpenSSLIOHook iohook; - session->inbufoffset += ret; + public: + ModuleSSLOpenSSL() : iohook(this) + { + /* Global SSL library initialization*/ + SSL_library_init(); + SSL_load_error_strings(); - return ret; - } + /* Build our SSL contexts: + * NOTE: OpenSSL makes us have two contexts, one for servers and one for clients. ICK. + */ + iohook.ctx = SSL_CTX_new( SSLv23_server_method() ); + iohook.clictx = SSL_CTX_new( SSLv23_client_method() ); + + SSL_CTX_set_mode(iohook.ctx, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); + SSL_CTX_set_mode(iohook.clictx, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); + + SSL_CTX_set_verify(iohook.ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify); + SSL_CTX_set_verify(iohook.clictx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify); } - // :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection - virtual void OnWhois(User* source, User* dest) + ~ModuleSSLOpenSSL() { - if (!clientactive) - return; - - // Bugfix, only send this numeric for *our* SSL users - if (dest->GetExt("ssl", dummy)) - { - ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str()); - } + SSL_CTX_free(iohook.ctx); + SSL_CTX_free(iohook.clictx); } - virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable) + void init() CXX11_OVERRIDE { - // check if the linking module wants to know about OUR metadata - if (extname == "ssl") - { - // check if this user has an swhois field to send - if(user->GetExt(extname, dummy)) - { - // call this function in the linking module, let it format the data how it - // sees fit, and send it on its way. We dont need or want to know how. - proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, displayable ? "Enabled" : "ON"); - } - } + // Needs the flag as it ignores a plain /rehash + OnModuleRehash(NULL,"ssl"); + Implementation eventlist[] = { I_On005Numeric, I_OnRehash, I_OnModuleRehash, I_OnHookIO, I_OnUserConnect }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + ServerInstance->Modules->AddService(iohook); } - virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) + void OnHookIO(StreamSocket* user, ListenSocket* lsb) CXX11_OVERRIDE { - // check if its our metadata key, and its associated with a user - if ((target_type == TYPE_USER) && (extname == "ssl")) + if (!user->GetIOHook() && lsb->bind_tag->getString("ssl") == "openssl") { - User* dest = (User*)target; - // if they dont already have an ssl flag, accept the remote server's - if (!dest->GetExt(extname, dummy)) - { - dest->Extend(extname, "ON"); - } + /* Hook the user with our module */ + user->AddIOHook(&iohook); } } - bool Handshake(issl_session* session) + void OnRehash(User* user) CXX11_OVERRIDE { - int ret; + sslports.clear(); - if (session->outbound) - ret = SSL_connect(session->sess); - else - ret = SSL_accept(session->sess); + ConfigTag* Conf = ServerInstance->Config->ConfValue("openssl"); - if (ret < 0) + if (Conf->getBool("showports", true)) { - int err = SSL_get_error(session->sess, ret); + sslports = Conf->getString("advertisedports"); + if (!sslports.empty()) + return; - if (err == SSL_ERROR_WANT_READ) - { - session->rstat = ISSL_READ; - session->status = ISSL_HANDSHAKING; - return true; - } - else if (err == SSL_ERROR_WANT_WRITE) - { - session->wstat = ISSL_WRITE; - session->status = ISSL_HANDSHAKING; - MakePollWrite(session); - return true; - } - else + for (size_t i = 0; i < ServerInstance->ports.size(); i++) { - CloseSession(session); - } + ListenSocket* port = ServerInstance->ports[i]; + if (port->bind_tag->getString("ssl") != "openssl") + continue; - return false; - } - 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. - User* u = ServerInstance->FindDescriptor(session->fd); - if (u) - { - if (!u->GetExt("ssl", dummy)) - u->Extend("ssl", "ON"); + 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; + } } + } + } - session->status = ISSL_OPEN; + void OnModuleRehash(User* user, const std::string ¶m) CXX11_OVERRIDE + { + if (param != "ssl") + return; - MakePollWrite(session); + std::string keyfile; + std::string certfile; + std::string cafile; + std::string dhfile; + OnRehash(user); - return true; - } - else if (ret == 0) - { - CloseSession(session); - return true; - } + ConfigTag* conf = ServerInstance->Config->ConfValue("openssl"); - return true; - } + cafile = conf->getString("cafile", CONFIG_PATH "/ca.pem"); + certfile = conf->getString("certfile", CONFIG_PATH "/cert.pem"); + keyfile = conf->getString("keyfile", CONFIG_PATH "/key.pem"); + dhfile = conf->getString("dhfile", CONFIG_PATH "/dhparams.pem"); + std::string hash = conf->getString("hash", "md5"); - virtual void OnPostConnect(User* user) - { - // This occurs AFTER OnUserConnect so we can be sure the - // protocol module has propagated the NICK message. - if ((user->GetIOHook() == this) && (IS_LOCAL(user))) - { - // Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW. - ServerInstance->PI->SendMetaData(user, TYPE_USER, "ssl", "on"); + iohook.digest = EVP_get_digestbyname(hash.c_str()); + if (iohook.digest == NULL) + throw ModuleException("Unknown hash type " + hash); - VerifyCertificate(&sessions[user->GetFd()], user); - if (sessions[user->GetFd()].sess) - user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\"", user->nick.c_str(), SSL_get_cipher(sessions[user->GetFd()].sess)); - } - } + std::string ciphers = conf->getString("ciphers", ""); - void MakePollWrite(issl_session* session) - { - //OnRawSocketWrite(session->fd, NULL, 0); - EventHandler* eh = ServerInstance->FindDescriptor(session->fd); - if (eh) - { - ServerInstance->SE->WantWrite(eh); - } - } + SSL_CTX* ctx = iohook.ctx; + SSL_CTX* clictx = iohook.clictx; - virtual void OnBufferFlushed(User* user) - { - if (user->GetIOHook() == this) + if (!ciphers.empty()) { - issl_session* session = &sessions[user->GetFd()]; - if (session && session->outbuf.size()) - OnRawSocketWrite(user->GetFd(), NULL, 0); + if ((!SSL_CTX_set_cipher_list(ctx, ciphers.c_str())) || (!SSL_CTX_set_cipher_list(clictx, ciphers.c_str()))) + { + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Can't set cipher list to %s.", ciphers.c_str()); + ERR_print_errors_cb(error_callback, this); + } } - } - void CloseSession(issl_session* session) - { - if (session->sess) + /* 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()))) { - SSL_shutdown(session->sess); - SSL_free(session->sess); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Can't read certificate file %s. %s", certfile.c_str(), strerror(errno)); + ERR_print_errors_cb(error_callback, this); } - if (session->inbuf) + 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))) { - delete[] session->inbuf; + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Can't read key file %s. %s", keyfile.c_str(), strerror(errno)); + ERR_print_errors_cb(error_callback, this); } - session->outbuf.clear(); - session->inbuf = NULL; - session->sess = NULL; - session->status = ISSL_NONE; - } - - void VerifyCertificate(issl_session* session, Extensible* user) - { - if (!session->sess || !user) - return; - - X509* cert; - ssl_cert* certinfo = new ssl_cert; - unsigned int n; - unsigned char md[EVP_MAX_MD_SIZE]; - const EVP_MD *digest = EVP_md5(); - - user->Extend("ssl_cert",certinfo); - - cert = SSL_get_peer_certificate((SSL*)session->sess); - - if (!cert) + /* 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))) { - certinfo->data.insert(std::make_pair("error","Could not get peer certificate: "+std::string(get_error()))); - return; + 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", cafile.c_str(), strerror(errno)); + ERR_print_errors_cb(error_callback, this); } - certinfo->data.insert(std::make_pair("invalid", SSL_get_verify_result(session->sess) != X509_V_OK ? ConvToStr(1) : ConvToStr(0))); + FILE* dhpfile = fopen(dhfile.c_str(), "r"); + DH* ret; - if (SelfSigned) + if (dhpfile == NULL) { - certinfo->data.insert(std::make_pair("unknownsigner",ConvToStr(0))); - certinfo->data.insert(std::make_pair("trusted",ConvToStr(1))); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Couldn't open DH file %s: %s", dhfile.c_str(), strerror(errno)); + throw ModuleException("Couldn't open DH file " + dhfile + ": " + strerror(errno)); } else { - certinfo->data.insert(std::make_pair("unknownsigner",ConvToStr(1))); - certinfo->data.insert(std::make_pair("trusted",ConvToStr(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(MODNAME, LOG_DEFAULT, "Couldn't set DH parameters %s. SSL errors follow:", dhfile.c_str()); + ERR_print_errors_cb(error_callback, this); + } } - certinfo->data.insert(std::make_pair("dn",std::string(X509_NAME_oneline(X509_get_subject_name(cert),0,0)))); - certinfo->data.insert(std::make_pair("issuer",std::string(X509_NAME_oneline(X509_get_issuer_name(cert),0,0)))); + fclose(dhpfile); + } - if (!X509_digest(cert, digest, md, &n)) - { - certinfo->data.insert(std::make_pair("error","Out of memory generating fingerprint")); - } - else - { - certinfo->data.insert(std::make_pair("fingerprint",irc::hex(md, n))); - } + void On005Numeric(std::map& tokens) CXX11_OVERRIDE + { + if (!sslports.empty()) + tokens["SSL"] = sslports; + } - 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 OnUserConnect(LocalUser* user) CXX11_OVERRIDE + { + if (user->eh.GetIOHook() == &iohook) + iohook.TellCiphersAndFingerprint(user); + } + + void OnCleanup(int target_type, void* item) CXX11_OVERRIDE + { + if (target_type == TYPE_USER) { - certinfo->data.insert(std::make_pair("error","Not activated, or expired certificate")); - } + LocalUser* user = IS_LOCAL((User*)item); - X509_free(cert); + if (user && user->eh.GetIOHook() == &iohook) + { + // 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)); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "SSL error: " + std::string(str, len - 1)); // // XXX: Remove this line, it causes valgrind warnings...