X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=5e6166fa49bb9deb2cb072db54b895afe3f835d5;hb=3d69896daab526d1001b271884ddbb0d49a860b9;hp=bb57a84673c5e7fad10473dca074e13d38584bfd;hpb=b45e7cfebbeaad4ecc3c55bc3060140f50f710d3;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 bb57a8467..5e6166fa4 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -1,3 +1,16 @@ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + #include #include @@ -14,13 +27,12 @@ #include "hashcomp.h" #include "inspircd.h" -#include "ssl_cert.h" +#include "transport.h" /* $ModDesc: Provides SSL support for clients */ -/* $CompileFlags: -I/usr/include -I/usr/local/include */ -/* $LinkerFlags: -L/usr/local/lib -Wl,--rpath -Wl,/usr/local/lib -L/usr/lib -Wl,--rpath -Wl,/usr/lib -lssl */ - - +/* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */ +/* $LinkerFlags: rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */ +/* $ModDep: transport.h */ enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN }; enum issl_io_status { ISSL_WRITE, ISSL_READ }; @@ -32,7 +44,7 @@ bool isin(int port, const std::vector &portlist) for(unsigned int i = 0; i < portlist.size(); i++) if(portlist[i] == port) return true; - + return false; } @@ -41,6 +53,8 @@ char* get_error() return ERR_error_string(ERR_get_error(), NULL); } +static int error_callback(const char *str, size_t len, void *u); + /** Represents an SSL user's extra data */ class issl_session : public classbase @@ -55,9 +69,11 @@ public: char* inbuf; // Buffer OpenSSL reads into. std::string outbuf; // Buffer for outgoing data that OpenSSL will not take. int fd; - + bool outbound; + issl_session() { + outbound = false; rstat = ISSL_READ; wstat = ISSL_WRITE; } @@ -76,164 +92,183 @@ static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx) return 1; } - + class ModuleSSLOpenSSL : public Module { - + ConfigReader* Conf; - - CullList* culllist; - + std::vector listenports; - + int inbufsize; issl_session sessions[MAX_DESCRIPTORS]; - + SSL_CTX* ctx; - + SSL_CTX* clictx; + char* dummy; - + std::string keyfile; std::string certfile; std::string cafile; // std::string crlfile; std::string dhfile; - + public: - + + InspIRCd* PublicInstance; + ModuleSSLOpenSSL(InspIRCd* Me) - : Module::Module(Me) + : Module::Module(Me), PublicInstance(Me) { - culllist = new CullList(ServerInstance); - + ServerInstance->PublishInterface("InspSocketHook", this); + // Not rehashable...because I cba to reduce all the sizes of existing buffers. inbufsize = ServerInstance->Config->NetBufferSize; - + /* Global SSL library initialization*/ SSL_library_init(); SSL_load_error_strings(); - - /* Build our SSL context*/ + + /* 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() ); 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); // Needs the flag as it ignores a plain /rehash - OnRehash("ssl"); + OnRehash(NULL,"ssl"); } - - virtual void OnRehash(const std::string ¶m) + + virtual void OnRehash(userrec* user, const std::string ¶m) { - if(param != "ssl") + if (param != "ssl") return; - + Conf = new ConfigReader(ServerInstance); - - for(unsigned int i = 0; i < listenports.size(); i++) + + for (unsigned int i = 0; i < listenports.size(); i++) { ServerInstance->Config->DelIOHook(listenports[i]); } - + listenports.clear(); - - for(int i = 0; i < Conf->Enumerate("bind"); i++) + + for (int i = 0; i < Conf->Enumerate("bind"); i++) { // For each tag - if(((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "clients")) && (Conf->ReadValue("bind", "ssl", i) == "openssl")) + if (((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "clients")) && (Conf->ReadValue("bind", "ssl", i) == "openssl")) { // Get the port we're meant to be listening on with SSL - unsigned int port = Conf->ReadInteger("bind", "port", i, true); - if (ServerInstance->Config->AddIOHook(port, this)) + std::string port = Conf->ReadValue("bind", "port", i); + irc::portparser portrange(port, false); + long portno = -1; + while ((portno = portrange.GetToken())) { - // We keep a record of which ports we're listening on with SSL - listenports.push_back(port); - - ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", port); - } - else - { - ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", port); + try + { + if (ServerInstance->Config->AddIOHook(portno, this)) + { + listenports.push_back(portno); + for (unsigned int i = 0; i < ServerInstance->stats->BoundPortCount; i++) + if (ServerInstance->Config->ports[i] == portno) + ServerInstance->Config->openSockfd[i]->SetDescription("ssl"); + ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", portno); + } + else + { + ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", portno); + } + } + catch (ModuleException &e) + { + ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d: %s. Maybe it's already hooked by the same port on a different IP, or you have another SSL or similar module loaded?", portno, e.GetReason()); + } } } } - + std::string confdir(CONFIG_FILE); // +1 so we the path ends with a / confdir = confdir.substr(0, confdir.find_last_of('/') + 1); - - cafile = Conf->ReadValue("openssl", "cafile", 0); - // crlfile = Conf->ReadValue("openssl", "crlfile", 0); - certfile = Conf->ReadValue("openssl", "certfile", 0); - keyfile = Conf->ReadValue("openssl", "keyfile", 0); - dhfile = Conf->ReadValue("openssl", "dhfile", 0); - + + 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 == "") + if (cafile == "") cafile = "ca.pem"; - - //if(crlfile == "") - // crlfile = "crl.pem"; - - if(certfile == "") + + if (certfile == "") certfile = "cert.pem"; - - if(keyfile == "") + + if (keyfile == "") keyfile = "key.pem"; - - if(dhfile == "") + + if (dhfile == "") dhfile = "dhparams.pem"; - - // Prepend relative paths with the path to the config directory. - if(cafile[0] != '/') + + // Prepend relative paths with the path to the config directory. + if (cafile[0] != '/') cafile = confdir + cafile; - + //if(crlfile[0] != '/') // crlfile = confdir + crlfile; - - if(certfile[0] != '/') + + if (certfile[0] != '/') certfile = confdir + certfile; - - if(keyfile[0] != '/') + + if (keyfile[0] != '/') keyfile = confdir + keyfile; - - if(dhfile[0] != '/') + + if (dhfile[0] != '/') dhfile = confdir + dhfile; - /* Load our keys and certificates*/ - if(!SSL_CTX_use_certificate_chain_file(ctx, certfile.c_str())) + /* 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->Log(DEFAULT, "m_ssl_openssl.so: Can't read certificate file %s", certfile.c_str()); + ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read certificate file %s. %s", certfile.c_str(), strerror(errno)); + ERR_print_errors_cb(error_callback, this); } - if(!SSL_CTX_use_PrivateKey_file(ctx, keyfile.c_str(), SSL_FILETYPE_PEM)) + 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))) { - ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read key file %s", keyfile.c_str()); + ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read key file %s. %s", keyfile.c_str(), strerror(errno)); + ERR_print_errors_cb(error_callback, this); } /* Load the CAs we trust*/ - if(!SSL_CTX_load_verify_locations(ctx, cafile.c_str(), 0)) + if (((!SSL_CTX_load_verify_locations(ctx, cafile.c_str(), 0))) || (!SSL_CTX_load_verify_locations(clictx, cafile.c_str(), 0))) { - ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read CA list from ", cafile.c_str()); + ServerInstance->Log(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); } FILE* dhpfile = fopen(dhfile.c_str(), "r"); DH* ret; - if(dhpfile == NULL) + if (dhpfile == NULL) { ServerInstance->Log(DEFAULT, "m_ssl_openssl.so Couldn't open DH file %s: %s", dhfile.c_str(), strerror(errno)); - throw ModuleException(); + throw ModuleException("Couldn't open DH file " + dhfile + ": " + strerror(errno)); } else { ret = PEM_read_DHparams(dhpfile, NULL, NULL, NULL); - - if(SSL_CTX_set_tmp_dh(ctx, ret) < 0) + if ((SSL_CTX_set_tmp_dh(ctx, ret) < 0) || (SSL_CTX_set_tmp_dh(clictx, ret) < 0)) { - ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Couldn't set DH parameters"); + ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Couldn't set DH parameters %s. SSL errors follow:", dhfile.c_str()); + ERR_print_errors_cb(error_callback, this); } } - + fclose(dhpfile); DELETE(Conf); @@ -242,21 +277,20 @@ class ModuleSSLOpenSSL : public Module virtual ~ModuleSSLOpenSSL() { SSL_CTX_free(ctx); - delete culllist; + SSL_CTX_free(clictx); } - + virtual void OnCleanup(int target_type, void* item) { - if(target_type == TYPE_USER) + if (target_type == TYPE_USER) { userrec* user = (userrec*)item; - - if(user->GetExt("ssl", dummy) && IS_LOCAL(user) && isin(user->GetPort(), listenports)) + + if (user->GetExt("ssl", dummy) && IS_LOCAL(user) && isin(user->GetPort(), listenports)) { // 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->Log(DEBUG, "m_ssl_openssl.so: Adding user %s to cull list", user->nick); - culllist->AddItem(user, "SSL module unloading"); + ServerInstance->GlobalCulls.AddItem(user, "SSL module unloading"); } if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports)) { @@ -267,59 +301,124 @@ class ModuleSSLOpenSSL : public Module } } } - + virtual void OnUnloadModule(Module* mod, const std::string &name) { - if(mod == this) + if (mod == this) { - // We're being unloaded, kill all the users added to the cull list in OnCleanup - int numusers = culllist->Apply(); - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Killed %d users for unload of OpenSSL SSL module", numusers); - for(unsigned int i = 0; i < listenports.size(); i++) + { ServerInstance->Config->DelIOHook(listenports[i]); + for (unsigned int j = 0; j < ServerInstance->stats->BoundPortCount; j++) + if (ServerInstance->Config->ports[j] == listenports[i]) + if (ServerInstance->Config->openSockfd[j]) + ServerInstance->Config->openSockfd[j]->SetDescription("plaintext"); + } } } - + virtual Version GetVersion() { - return Version(1, 0, 0, 0, VF_VENDOR); + return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); } void Implements(char* List) { - List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = 1; - List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnPostConnect] = 1; + 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 char* OnRequest(Request* request) + { + ISHRequest* ISR = (ISHRequest*)request; + if (strcmp("IS_NAME", request->GetId()) == 0) + { + return "openssl"; + } + else if (strcmp("IS_HOOK", request->GetId()) == 0) + { + char* ret = "OK"; + try + { + ret = ServerInstance->Config->AddIOHook((Module*)this, (InspSocket*)ISR->Sock) ? (char*)"OK" : NULL; + } + catch (ModuleException &e) + { + return NULL; + } + + return ret; + } + else if (strcmp("IS_UNHOOK", request->GetId()) == 0) + { + return ServerInstance->Config->DelIOHook((InspSocket*)ISR->Sock) ? (char*)"OK" : NULL; + } + else if (strcmp("IS_HSDONE", request->GetId()) == 0) + { + issl_session* session = &sessions[ISR->Sock->GetFd()]; + return (session->status == ISSL_HANDSHAKING) ? NULL : (char*)"OK"; + } + else if (strcmp("IS_ATTACH", request->GetId()) == 0) + { + issl_session* session = &sessions[ISR->Sock->GetFd()]; + if (session) + { + VerifyCertificate(session, (InspSocket*)ISR->Sock); + return "OK"; + } + } + return NULL; } + virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport) { issl_session* session = &sessions[fd]; - + session->fd = fd; session->inbuf = new char[inbufsize]; - session->inbufoffset = 0; + session->inbufoffset = 0; session->sess = SSL_new(ctx); session->status = ISSL_NONE; - - if(session->sess == NULL) + session->outbound = false; + + if (session->sess == NULL) + return; + + if (SSL_set_fd(session->sess, fd) == 0) { - ServerInstance->Log(DEBUG, "m_ssl.so: Couldn't create SSL object: %s", get_error()); + ServerInstance->Log(DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd); return; } - - if(SSL_set_fd(session->sess, fd) == 0) + + Handshake(session); + } + + virtual void OnRawSocketConnect(int fd) + { + 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) + return; + + if (SSL_set_fd(session->sess, fd) == 0) { - ServerInstance->Log(DEBUG, "m_ssl.so: Couldn't set fd for SSL object: %s", get_error()); + ServerInstance->Log(DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd); return; } - Handshake(session); + Handshake(session); } virtual void OnRawSocketClose(int fd) { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketClose: %d", fd); CloseSession(&sessions[fd]); EventHandler* user = ServerInstance->SE->GetRef(fd); @@ -336,56 +435,48 @@ class ModuleSSLOpenSSL : public Module virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { issl_session* session = &sessions[fd]; - - if(!session->sess) + + if (!session->sess) { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: No session to read from"); readresult = 0; CloseSession(session); return 1; } - - if(session->status == ISSL_HANDSHAKING) + + if (session->status == ISSL_HANDSHAKING) { - if(session->rstat == ISSL_READ || session->wstat == ISSL_READ) + 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(session)) - { - // Handshake successfully resumed. - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: successfully resumed handshake"); - } - else + if (!Handshake(session)) { - // Couldn't resume handshake. - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: failed to resume handshake"); + // Couldn't resume handshake. return -1; } } else { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: handshake wants to write data but we are currently reading"); - return -1; + return -1; } } // If we resumed the handshake then session->status will be ISSL_OPEN - - if(session->status == ISSL_OPEN) + + if (session->status == ISSL_OPEN) { - if(session->wstat == ISSL_READ) + if (session->wstat == ISSL_READ) { if(DoWrite(session) == 0) return 0; } - - if(session->rstat == ISSL_READ) + + if (session->rstat == ISSL_READ) { int ret = DoRead(session); - - if(ret > 0) + + if (ret > 0) { - if(count <= session->inbufoffset) + if (count <= session->inbufoffset) { memcpy(buffer, session->inbuf, count); // Move the stuff left in inbuf to the beginning of it @@ -399,12 +490,12 @@ class ModuleSSLOpenSSL : public Module { // 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; } else @@ -413,90 +504,69 @@ class ModuleSSLOpenSSL : public Module } } } - + return -1; } - + virtual int OnRawSocketWrite(int fd, const char* buffer, int count) - { + { issl_session* session = &sessions[fd]; - if(!session->sess) + if (!session->sess) { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: No session to write to"); CloseSession(session); - return 1; + return -1; } session->outbuf.append(buffer, count); - - if(session->status == ISSL_HANDSHAKING) + + 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(session)) - { - // Handshake successfully resumed. - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: successfully resumed handshake"); - } - else - { - // Couldn't resume handshake. - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: failed to resume handshake"); - } - } - else - { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: handshake wants to read data but we are currently writing"); - } + if (session->rstat == ISSL_WRITE || session->wstat == ISSL_WRITE) + Handshake(session); } - - if(session->status == ISSL_OPEN) + + if (session->status == ISSL_OPEN) { - if(session->rstat == ISSL_WRITE) - { + if (session->rstat == ISSL_WRITE) DoRead(session); - } - - if(session->wstat == ISSL_WRITE) - { + + if (session->wstat == ISSL_WRITE) return DoWrite(session); - } } - + 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) + + if (ret == 0) { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Client closed the connection"); CloseSession(session); return 0; } - else if(ret < 0) + else if (ret < 0) { int err = SSL_get_error(session->sess, ret); - - if(err == SSL_ERROR_WANT_WRITE) + + if (err == SSL_ERROR_WANT_WRITE) { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Not all SSL data written, need to retry: %s", get_error()); session->wstat = ISSL_WRITE; return -1; } - else if(err == SSL_ERROR_WANT_READ) + else if (err == SSL_ERROR_WANT_READ) { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Not all SSL data written but the damn thing wants to read instead: %s", get_error()); session->wstat = ISSL_READ; return -1; } else { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Error writing SSL data: %s", get_error()); CloseSession(session); return 0; } @@ -507,40 +577,36 @@ class ModuleSSLOpenSSL : public Module return ret; } } - + int DoRead(issl_session* session) { // 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); - if(ret == 0) + if (ret == 0) { // Client closed connection. - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Client closed the connection"); CloseSession(session); return 0; } - else if(ret < 0) + else if (ret < 0) { int err = SSL_get_error(session->sess, ret); - - if(err == SSL_ERROR_WANT_READ) + + if (err == SSL_ERROR_WANT_READ) { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Not all SSL data read, need to retry: %s", get_error()); session->rstat = ISSL_READ; return -1; } - else if(err == SSL_ERROR_WANT_WRITE) + else if (err == SSL_ERROR_WANT_WRITE) { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Not all SSL data read but the damn thing wants to write instead: %s", get_error()); session->rstat = ISSL_WRITE; return -1; } else { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Error reading SSL data: %s", get_error()); CloseSession(session); return 0; } @@ -556,21 +622,21 @@ class ModuleSSLOpenSSL : public Module return ret; } } - + // :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection virtual void OnWhois(userrec* source, userrec* dest) { // Bugfix, only send this numeric for *our* SSL users - if(dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) && isin(dest->GetPort(), listenports))) + if (dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) && isin(dest->GetPort(), listenports))) { - source->WriteServ("320 %s %s :is using a secure connection", source->nick, dest->nick); + ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick, dest->nick); } } - + virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname) { // check if the linking module wants to know about OUR metadata - if(extname == "ssl") + if (extname == "ssl") { // check if this user has an swhois field to send if(user->GetExt(extname, dummy)) @@ -581,7 +647,7 @@ class ModuleSSLOpenSSL : public Module } } } - + virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { // check if its our metadata key, and its associated with a user @@ -595,41 +661,41 @@ class ModuleSSLOpenSSL : public Module } } } - + bool Handshake(issl_session* session) - { - int ret = SSL_accept(session->sess); - - if(ret < 0) + { + int ret; + + if (session->outbound) + ret = SSL_connect(session->sess); + else + ret = SSL_accept(session->sess); + + if (ret < 0) { int err = SSL_get_error(session->sess, ret); - - if(err == SSL_ERROR_WANT_READ) + + if (err == SSL_ERROR_WANT_READ) { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Handshake: Not completed, need to read again: %s", get_error()); session->rstat = ISSL_READ; session->status = ISSL_HANDSHAKING; } - else if(err == SSL_ERROR_WANT_WRITE) + else if (err == SSL_ERROR_WANT_WRITE) { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Handshake: Not completed, need to write more data: %s", get_error()); session->wstat = ISSL_WRITE; session->status = ISSL_HANDSHAKING; MakePollWrite(session); } else { - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Handshake: Failed, bailing: %s", get_error()); CloseSession(session); } return false; } - else + else if (ret > 0) { // Handshake complete. - ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Handshake completed"); - // This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater. userrec* u = ServerInstance->FindDescriptor(session->fd); if (u) @@ -637,15 +703,22 @@ class ModuleSSLOpenSSL : public Module if (!u->GetExt("ssl", dummy)) u->Extend("ssl", "ON"); } - + session->status = ISSL_OPEN; - + MakePollWrite(session); - + + return true; + } + else if (ret == 0) + { + CloseSession(session); return true; } + + return true; } - + virtual void OnPostConnect(userrec* user) { // This occurs AFTER OnUserConnect so we can be sure the @@ -665,32 +738,32 @@ class ModuleSSLOpenSSL : public Module VerifyCertificate(&sessions[user->GetFd()], user); } } - + void MakePollWrite(issl_session* session) { OnRawSocketWrite(session->fd, NULL, 0); } - + void CloseSession(issl_session* session) { - if(session->sess) + if (session->sess) { SSL_shutdown(session->sess); SSL_free(session->sess); } - - if(session->inbuf) + + if (session->inbuf) { delete[] session->inbuf; } - + session->outbuf.clear(); session->inbuf = NULL; session->sess = NULL; session->status = ISSL_NONE; } - void VerifyCertificate(issl_session* session, userrec* user) + void VerifyCertificate(issl_session* session, Extensible* user) { X509* cert; ssl_cert* certinfo = new ssl_cert; @@ -733,8 +806,6 @@ class ModuleSSLOpenSSL : public Module certinfo->data.insert(std::make_pair("fingerprint",irc::hex(md, n))); } - user->WriteServ("NOTICE %s :*** Your SSL Certificate fingerprint is: %s", user->nick, irc::hex(md, n).c_str()); - if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), time(NULL)) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), time(NULL)) == 0)) { certinfo->data.insert(std::make_pair("error","Not activated, or expired certificate")); @@ -744,17 +815,24 @@ class ModuleSSLOpenSSL : public Module } }; +static int error_callback(const char *str, size_t len, void *u) +{ + ModuleSSLOpenSSL* mssl = (ModuleSSLOpenSSL*)u; + mssl->PublicInstance->Log(DEFAULT, "SSL error: " + std::string(str, len - 1)); + return 0; +} + class ModuleSSLOpenSSLFactory : public ModuleFactory { public: ModuleSSLOpenSSLFactory() { } - + ~ModuleSSLOpenSSLFactory() { } - + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleSSLOpenSSL(Me);