X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=5355e18557135f4b6b9f0a2899e02776f5dd6819;hb=2e1f86fd0c9911210b79e6ac346672441eef18c4;hp=2f36d20ee6fb944284e8162ed9304eb63c85f163;hpb=2feb4f5ad4a86014b744fce09fff3340d1b4fe20;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 2f36d20ee..5355e1855 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -74,7 +74,7 @@ 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; @@ -103,9 +103,6 @@ static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx) class ModuleSSLOpenSSL : public Module { - - ConfigReader* Conf; - std::vector listenports; int inbufsize; @@ -131,9 +128,9 @@ class ModuleSSLOpenSSL : public Module InspIRCd* PublicInstance; ModuleSSLOpenSSL(InspIRCd* Me) - : Module(Me), PublicInstance(Me) + : Module(Me), PublicInstance(Me) { - ServerInstance->PublishInterface("InspSocketHook", this); + ServerInstance->Modules->PublishInterface("BufferedSocketHook", this); // Not rehashable...because I cba to reduce all the sizes of existing buffers. inbufsize = ServerInstance->Config->NetBufferSize; @@ -155,12 +152,12 @@ class ModuleSSLOpenSSL : public Module 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++) { @@ -171,14 +168,14 @@ class ModuleSSLOpenSSL : public Module clientactive = 0; sslports.clear(); - for (int i = 0; i < Conf->Enumerate("bind"); i++) + for (int i = 0; i < Conf.Enumerate("bind"); i++) { // For each tag - std::string x = Conf->ReadValue("bind", "type", i); - if (((x.empty()) || (x == "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())) @@ -215,10 +212,10 @@ class ModuleSSLOpenSSL : public Module // +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.empty()) @@ -287,8 +284,6 @@ class ModuleSSLOpenSSL : public Module } fclose(dhpfile); - - DELETE(Conf); } virtual void On005Numeric(std::string &output) @@ -306,13 +301,13 @@ class ModuleSSLOpenSSL : public Module { 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. - userrec::QuitUser(ServerInstance, user, "SSL module unloading"); + User::QuitUser(ServerInstance, user, "SSL module unloading"); } if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports)) { @@ -346,7 +341,7 @@ 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] = List[I_On005Numeric] = 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_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) @@ -361,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) { @@ -372,11 +367,10 @@ 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) { - ServerInstance->Log(DEBUG,"Module checking if handshake is done"); if (ISR->Sock->GetFd() < 0) return (char*)"OK"; @@ -388,7 +382,7 @@ class ModuleSSLOpenSSL : public Module issl_session* session = &sessions[ISR->Sock->GetFd()]; if (session->sess) { - VerifyCertificate(session, (InspSocket*)ISR->Sock); + VerifyCertificate(session, (BufferedSocket*)ISR->Sock); return "OK"; } } @@ -398,6 +392,10 @@ 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; @@ -421,7 +419,10 @@ class ModuleSSLOpenSSL : public Module virtual void OnRawSocketConnect(int fd) { - ServerInstance->Log(DEBUG,"OnRawSocketConnect connecting"); + /* 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; @@ -441,11 +442,14 @@ class ModuleSSLOpenSSL : public Module } Handshake(session); - ServerInstance->Log(DEBUG,"Exiting OnRawSocketConnect"); } 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); @@ -461,13 +465,14 @@ class ModuleSSLOpenSSL : public Module virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { - issl_session* session = &sessions[fd]; + /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */ + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return 0; - ServerInstance->Log(DEBUG,"OnRawSocketRead"); + issl_session* session = &sessions[fd]; if (!session->sess) { - ServerInstance->Log(DEBUG,"OnRawSocketRead has no session"); readresult = 0; CloseSession(session); return 1; @@ -477,11 +482,9 @@ class ModuleSSLOpenSSL : public Module { if (session->rstat == ISSL_READ || session->wstat == ISSL_READ) { - ServerInstance->Log(DEBUG,"Resume handshake in read"); // The handshake isn't finished and it wants to read, try to finish it. if (!Handshake(session)) { - ServerInstance->Log(DEBUG,"Cant resume handshake in read"); // Couldn't resume handshake. return -1; } @@ -509,7 +512,7 @@ class ModuleSSLOpenSSL : public Module 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 @@ -528,13 +531,9 @@ class ModuleSSLOpenSSL : public Module // Zero the offset, as there's nothing there.. session->inbufoffset = 0; } - return 1; } - else - { - return ret; - } + return ret; } } @@ -543,23 +542,26 @@ class ModuleSSLOpenSSL : public Module 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) { - ServerInstance->Log(DEBUG,"Close session missing sess"); CloseSession(session); return -1; } 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) { - ServerInstance->Log(DEBUG,"Handshake resume"); Handshake(session); } } @@ -568,13 +570,11 @@ class ModuleSSLOpenSSL : public Module { if (session->rstat == ISSL_WRITE) { - ServerInstance->Log(DEBUG,"DoRead"); DoRead(session); } if (session->wstat == ISSL_WRITE) { - ServerInstance->Log(DEBUG,"DoWrite"); return DoWrite(session); } } @@ -591,7 +591,6 @@ class ModuleSSLOpenSSL : public Module if (ret == 0) { - ServerInstance->Log(DEBUG,"Oops, got 0 from SSL_write"); CloseSession(session); return 0; } @@ -602,7 +601,6 @@ class ModuleSSLOpenSSL : public Module if (err == SSL_ERROR_WANT_WRITE) { session->wstat = ISSL_WRITE; - MakePollWrite(session); return -1; } else if (err == SSL_ERROR_WANT_READ) @@ -612,7 +610,6 @@ class ModuleSSLOpenSSL : public Module } else { - ServerInstance->Log(DEBUG,"Close due to returned -1 in SSL_Write"); CloseSession(session); return 0; } @@ -629,14 +626,11 @@ class ModuleSSLOpenSSL : public Module // 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. - ServerInstance->Log(DEBUG,"DoRead"); - int ret = SSL_read(session->sess, session->inbuf + session->inbufoffset, inbufsize - session->inbufoffset); if (ret == 0) { // Client closed connection. - ServerInstance->Log(DEBUG,"Oops, got 0 from SSL_read"); CloseSession(session); return 0; } @@ -647,19 +641,16 @@ class ModuleSSLOpenSSL : public Module if (err == SSL_ERROR_WANT_READ) { session->rstat = ISSL_READ; - ServerInstance->Log(DEBUG,"Setting want_read"); return -1; } else if (err == SSL_ERROR_WANT_WRITE) { session->rstat = ISSL_WRITE; MakePollWrite(session); - ServerInstance->Log(DEBUG,"Setting want_write"); return -1; } else { - ServerInstance->Log(DEBUG,"Closed due to returned -1 in SSL_Read"); CloseSession(session); return 0; } @@ -677,7 +668,7 @@ class ModuleSSLOpenSSL : public Module } // :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; @@ -689,7 +680,7 @@ class ModuleSSLOpenSSL : public Module } } - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable) + 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") @@ -709,7 +700,7 @@ class ModuleSSLOpenSSL : public Module // 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)) { @@ -720,14 +711,10 @@ class ModuleSSLOpenSSL : public Module bool Handshake(issl_session* session) { - ServerInstance->Log(DEBUG,"Handshake"); int ret; if (session->outbound) - { - ServerInstance->Log(DEBUG,"SSL_connect"); ret = SSL_connect(session->sess); - } else ret = SSL_accept(session->sess); @@ -737,14 +724,12 @@ class ModuleSSLOpenSSL : public Module if (err == SSL_ERROR_WANT_READ) { - ServerInstance->Log(DEBUG,"Want read, handshaking"); session->rstat = ISSL_READ; session->status = ISSL_HANDSHAKING; return true; } else if (err == SSL_ERROR_WANT_WRITE) { - ServerInstance->Log(DEBUG,"Want write, handshaking"); session->wstat = ISSL_WRITE; session->status = ISSL_HANDSHAKING; MakePollWrite(session); @@ -752,7 +737,6 @@ class ModuleSSLOpenSSL : public Module } else { - ServerInstance->Log(DEBUG,"Handshake failed"); CloseSession(session); } @@ -762,7 +746,7 @@ 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)) @@ -777,10 +761,6 @@ class ModuleSSLOpenSSL : public Module } else if (ret == 0) { - int ssl_err = SSL_get_error(session->sess, ret); - char buf[1024]; - ERR_print_errors_fp(stderr); - ServerInstance->Log(DEBUG,"Handshake fail 2: %d: %s", ssl_err, ERR_error_string(ssl_err,buf)); CloseSession(session); return true; } @@ -788,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. @@ -815,7 +795,19 @@ class ModuleSSLOpenSSL : public Module //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) @@ -899,5 +891,4 @@ static int error_callback(const char *str, size_t len, void *u) return 0; } -MODULE_INIT(ModuleSSLOpenSSL); - +MODULE_INIT(ModuleSSLOpenSSL)