X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=5355e18557135f4b6b9f0a2899e02776f5dd6819;hb=2e1f86fd0c9911210b79e6ac346672441eef18c4;hp=768973d0af187053186bdf8a660fbfe560f21a2a;hpb=b9de69b2dfff8796614e0ff9a2b49612989f73a3;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 768973d0a..5355e1855 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -11,13 +11,15 @@ * --------------------------------------------------- */ -#include -#include +#include "inspircd.h" #include #include -#include "inspircd_config.h" +#ifdef WINDOWS +#include +#endif + #include "configreader.h" #include "users.h" #include "channels.h" @@ -25,13 +27,19 @@ #include "socket.h" #include "hashcomp.h" -#include "inspircd.h" #include "transport.h" +#ifdef WINDOWS +#pragma comment(lib, "libeay32MTd") +#pragma comment(lib, "ssleay32MTd") +#undef MAX_DESCRIPTORS +#define MAX_DESCRIPTORS 10000 +#endif + /* $ModDesc: Provides SSL support for clients */ /* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */ -/* $LinkerFlags: pkgconflibs("openssl","/libssl.so","-lssl -lcrypto") */ +/* $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 }; @@ -44,7 +52,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; } @@ -53,6 +61,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 @@ -64,11 +74,11 @@ public: issl_io_status wstat; unsigned int inbufoffset; - char* inbuf; // Buffer OpenSSL reads into. + 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; @@ -90,46 +100,45 @@ 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; - + 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::Module(Me) + : Module(Me), PublicInstance(Me) { - culllist = new CullList(ServerInstance); + ServerInstance->Modules->PublishInterface("BufferedSocketHook", this); - 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 contexts: * NOTE: OpenSSL makes us have two contexts, one for servers and one for clients. ICK. */ @@ -142,101 +151,118 @@ class ModuleSSLOpenSSL : public Module // Needs the flag as it ignores a plain /rehash OnRehash(NULL,"ssl"); } - - virtual void OnRehash(userrec* user, const std::string ¶m) + + virtual void OnRehash(User* user, const std::string ¶m) { if (param != "ssl") return; - - Conf = new ConfigReader(ServerInstance); - + + ConfigReader Conf(ServerInstance); + 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++) + clientactive = 0; + sslports.clear(); + + 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")) + std::string x = Conf.ReadValue("bind", "type", i); + if (((x.empty()) || (x == "clients")) && (Conf.ReadValue("bind", "ssl", i) == "openssl")) { // Get the port we're meant to be listening on with SSL - std::string port = Conf->ReadValue("bind", "port", i); + std::string port = Conf.ReadValue("bind", "port", i); irc::portparser portrange(port, false); long portno = -1; while ((portno = portrange.GetToken())) { - if (ServerInstance->Config->AddIOHook(portno, this)) + clientactive++; + try { - 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); + if (ServerInstance->Config->AddIOHook(portno, this)) + { + listenports.push_back(portno); + for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++) + if (ServerInstance->Config->ports[i]->GetPort() == portno) + ServerInstance->Config->ports[i]->SetDescription("ssl"); + ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", portno); + sslports.append("*:").append(ConvToStr(portno)).append(";"); + } + 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); + } } - else + catch (ModuleException &e) { - ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", portno); + 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); + + if (!sslports.empty()) + sslports.erase(sslports.end() - 1); + + 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); - + + 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.empty()) cafile = "ca.pem"; - - if (certfile == "") + + if (certfile.empty()) certfile = "cert.pem"; - - if (keyfile == "") + + if (keyfile.empty()) keyfile = "key.pem"; - - if (dhfile == "") + + if (dhfile.empty()) dhfile = "dhparams.pem"; - - // Prepend relative paths with the path to the config directory. + + // 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] != '/') certfile = confdir + certfile; - + if (keyfile[0] != '/') keyfile = confdir + keyfile; - + if (dhfile[0] != '/') dhfile = confdir + dhfile; - /* Load our keys and certificates*/ + /* 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)) || (!SSL_CTX_use_PrivateKey_file(clictx, 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)) || (!SSL_CTX_load_verify_locations(clictx, 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"); @@ -250,36 +276,38 @@ class ModuleSSLOpenSSL : public Module 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->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); + virtual void On005Numeric(std::string &output) + { + output.append(" SSL=" + sslports); } virtual ~ModuleSSLOpenSSL() { SSL_CTX_free(ctx); SSL_CTX_free(clictx); - delete culllist; } - + virtual void OnCleanup(int target_type, void* item) { if (target_type == TYPE_USER) { - userrec* user = (userrec*)item; - + User* user = (User*)item; + 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. - culllist->AddItem(user, "SSL module unloading"); + User::QuitUser(ServerInstance, user, "SSL module unloading"); } if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports)) { @@ -290,25 +318,21 @@ class ModuleSSLOpenSSL : public Module } } } - + virtual void OnUnloadModule(Module* mod, const std::string &name) { if (mod == this) { - // We're being unloaded, kill all the users added to the cull list in OnCleanup - culllist->Apply(); - 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"); + for (size_t j = 0; j < ServerInstance->Config->ports.size(); j++) + if (ServerInstance->Config->ports[j]->GetPort() == listenports[i]) + ServerInstance->Config->ports[j]->SetDescription("plaintext"); } } } - + virtual Version GetVersion() { return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); @@ -316,8 +340,8 @@ class ModuleSSLOpenSSL : public Module void Implements(char* List) { - 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; + List[I_OnRawSocketConnect] = List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = List[I_On005Numeric] = 1; + List[I_OnBufferFlushed] = 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) @@ -332,7 +356,7 @@ class ModuleSSLOpenSSL : public Module char* ret = "OK"; try { - ret = ServerInstance->Config->AddIOHook((Module*)this, (InspSocket*)ISR->Sock) ? (char*)"OK" : NULL; + ret = ServerInstance->Config->AddIOHook((Module*)this, (BufferedSocket*)ISR->Sock) ? (char*)"OK" : NULL; } catch (ModuleException &e) { @@ -343,19 +367,22 @@ class ModuleSSLOpenSSL : public Module } else if (strcmp("IS_UNHOOK", request->GetId()) == 0) { - return ServerInstance->Config->DelIOHook((InspSocket*)ISR->Sock) ? (char*)"OK" : NULL; + return ServerInstance->Config->DelIOHook((BufferedSocket*)ISR->Sock) ? (char*)"OK" : NULL; } else if (strcmp("IS_HSDONE", request->GetId()) == 0) { + if (ISR->Sock->GetFd() < 0) + return (char*)"OK"; + 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) + if (session->sess) { - VerifyCertificate(session, (InspSocket*)ISR->Sock); + VerifyCertificate(session, (BufferedSocket*)ISR->Sock); return "OK"; } } @@ -365,18 +392,22 @@ class ModuleSSLOpenSSL : public Module virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport) { + /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */ + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return; + 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; session->outbound = false; - + if (session->sess == NULL) return; - + if (SSL_set_fd(session->sess, fd) == 0) { ServerInstance->Log(DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd); @@ -388,6 +419,10 @@ class ModuleSSLOpenSSL : public Module virtual void OnRawSocketConnect(int fd) { + /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */ + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return; + issl_session* session = &sessions[fd]; session->fd = fd; @@ -411,6 +446,10 @@ class ModuleSSLOpenSSL : public Module virtual void OnRawSocketClose(int fd) { + /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */ + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return; + CloseSession(&sessions[fd]); EventHandler* user = ServerInstance->SE->GetRef(fd); @@ -426,15 +465,19 @@ class ModuleSSLOpenSSL : public Module virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { + /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */ + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return 0; + issl_session* session = &sessions[fd]; - + if (!session->sess) { readresult = 0; CloseSession(session); return 1; } - + if (session->status == ISSL_HANDSHAKING) { if (session->rstat == ISSL_READ || session->wstat == ISSL_READ) @@ -442,18 +485,19 @@ class ModuleSSLOpenSSL : public Module // 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. return -1; } } else { - return -1; + errno = EAGAIN; + return -1; } } // If we resumed the handshake then session->status will be ISSL_OPEN - + if (session->status == ISSL_OPEN) { if (session->wstat == ISSL_READ) @@ -461,11 +505,11 @@ class ModuleSSLOpenSSL : public Module if(DoWrite(session) == 0) return 0; } - + if (session->rstat == ISSL_READ) { int ret = DoRead(session); - + if (ret > 0) { if (count <= session->inbufoffset) @@ -482,26 +526,26 @@ 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 - { - return ret; - } + return ret; } } - + return -1; } - + virtual int OnRawSocketWrite(int fd, const char* buffer, int count) { + /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */ + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return 0; + issl_session* session = &sessions[fd]; if (!session->sess) @@ -511,33 +555,40 @@ class ModuleSSLOpenSSL : public Module } session->outbuf.append(buffer, count); - + MakePollWrite(session); + if (session->status == ISSL_HANDSHAKING) { // The handshake isn't finished, try to finish it. if (session->rstat == ISSL_WRITE || session->wstat == ISSL_WRITE) + { Handshake(session); + } } - + if (session->status == ISSL_OPEN) { if (session->rstat == ISSL_WRITE) + { DoRead(session); - + } + 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) { CloseSession(session); @@ -546,7 +597,7 @@ class ModuleSSLOpenSSL : public Module else if (ret < 0) { int err = SSL_get_error(session->sess, ret); - + if (err == SSL_ERROR_WANT_WRITE) { session->wstat = ISSL_WRITE; @@ -569,12 +620,12 @@ 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) @@ -586,7 +637,7 @@ class ModuleSSLOpenSSL : public Module else if (ret < 0) { int err = SSL_get_error(session->sess, ret); - + if (err == SSL_ERROR_WANT_READ) { session->rstat = ISSL_READ; @@ -595,6 +646,7 @@ class ModuleSSLOpenSSL : public Module else if (err == SSL_ERROR_WANT_WRITE) { session->rstat = ISSL_WRITE; + MakePollWrite(session); return -1; } else @@ -614,18 +666,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) + virtual void OnWhois(User* source, User* dest) { + if (!clientactive) + return; + // Bugfix, only send this numeric for *our* SSL users if (dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) && isin(dest->GetPort(), listenports))) { 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) + + virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable) { // check if the linking module wants to know about OUR metadata if (extname == "ssl") @@ -635,17 +690,17 @@ class ModuleSSLOpenSSL : public Module { // 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, "ON"); + proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, displayable ? "Enabled" : "ON"); } } } - + 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 if ((target_type == TYPE_USER) && (extname == "ssl")) { - userrec* dest = (userrec*)target; + User* dest = (User*)target; // if they dont already have an ssl flag, accept the remote server's if (!dest->GetExt(extname, dummy)) { @@ -653,7 +708,7 @@ class ModuleSSLOpenSSL : public Module } } } - + bool Handshake(issl_session* session) { int ret; @@ -662,21 +717,23 @@ class ModuleSSLOpenSSL : public Module 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) { 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 { @@ -689,13 +746,13 @@ class ModuleSSLOpenSSL : public Module { // Handshake complete. // 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); + User* u = ServerInstance->FindDescriptor(session->fd); if (u) { if (!u->GetExt("ssl", dummy)) u->Extend("ssl", "ON"); } - + session->status = ISSL_OPEN; MakePollWrite(session); @@ -711,10 +768,10 @@ class ModuleSSLOpenSSL : public Module return true; } - virtual void OnPostConnect(userrec* user) + virtual void OnPostConnect(User* user) { // This occurs AFTER OnUserConnect so we can be sure the - // protocol module has propogated the NICK message. + // protocol module has propagated the NICK message. if ((user->GetExt("ssl", dummy)) && (IS_LOCAL(user))) { // Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW. @@ -728,14 +785,31 @@ class ModuleSSLOpenSSL : public Module DELETE(metadata); VerifyCertificate(&sessions[user->GetFd()], user); + if (sessions[user->GetFd()].sess) + user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\"", user->nick, SSL_get_cipher(sessions[user->GetFd()].sess)); } } - + void MakePollWrite(issl_session* session) { - OnRawSocketWrite(session->fd, NULL, 0); + //OnRawSocketWrite(session->fd, NULL, 0); + EventHandler* eh = ServerInstance->FindDescriptor(session->fd); + if (eh) + { + ServerInstance->SE->WantWrite(eh); + } } - + + virtual void OnBufferFlushed(User* user) + { + if (user->GetExt("ssl")) + { + issl_session* session = &sessions[user->GetFd()]; + if (session && session->outbuf.size()) + OnRawSocketWrite(user->GetFd(), NULL, 0); + } + } + void CloseSession(issl_session* session) { if (session->sess) @@ -743,12 +817,12 @@ class ModuleSSLOpenSSL : public Module SSL_shutdown(session->sess); SSL_free(session->sess); } - + if (session->inbuf) { delete[] session->inbuf; } - + session->outbuf.clear(); session->inbuf = NULL; session->sess = NULL; @@ -757,6 +831,9 @@ class ModuleSSLOpenSSL : public Module void VerifyCertificate(issl_session* session, Extensible* user) { + if (!session->sess || !user) + return; + X509* cert; ssl_cert* certinfo = new ssl_cert; unsigned int n; @@ -807,25 +884,11 @@ class ModuleSSLOpenSSL : public Module } }; -class ModuleSSLOpenSSLFactory : public ModuleFactory +static int error_callback(const char *str, size_t len, void *u) { - public: - ModuleSSLOpenSSLFactory() - { - } - - ~ModuleSSLOpenSSLFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSSLOpenSSL(Me); - } -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleSSLOpenSSLFactory; + ModuleSSLOpenSSL* mssl = (ModuleSSLOpenSSL*)u; + mssl->PublicInstance->Log(DEFAULT, "SSL error: " + std::string(str, len - 1)); + return 0; } + +MODULE_INIT(ModuleSSLOpenSSL)