X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=5355e18557135f4b6b9f0a2899e02776f5dd6819;hb=2e1f86fd0c9911210b79e6ac346672441eef18c4;hp=9ced3a246ffae3a0a8a0f706d9778dbd8674269f;hpb=9769b27a2f3fcfb49bb84ff1f4a8275c8dc75a9c;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 9ced3a246..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,10 +27,16 @@ #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: rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */ @@ -66,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; @@ -95,9 +103,6 @@ static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx) class ModuleSSLOpenSSL : public Module { - - ConfigReader* Conf; - std::vector listenports; int inbufsize; @@ -107,12 +112,14 @@ class ModuleSSLOpenSSL : public Module 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; @@ -121,9 +128,9 @@ class ModuleSSLOpenSSL : public Module InspIRCd* PublicInstance; ModuleSSLOpenSSL(InspIRCd* Me) - : Module::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; @@ -145,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++) { @@ -159,14 +166,16 @@ class ModuleSSLOpenSSL : public Module listenports.clear(); 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 - 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())) @@ -177,10 +186,11 @@ class ModuleSSLOpenSSL : public Module 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"); + 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 { @@ -195,35 +205,35 @@ class ModuleSSLOpenSSL : public Module } } - 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. if (cafile[0] != '/') cafile = confdir + cafile; - //if(crlfile[0] != '/') - // crlfile = confdir + crlfile; - if (certfile[0] != '/') certfile = confdir + certfile; @@ -274,8 +284,11 @@ class ModuleSSLOpenSSL : public Module } fclose(dhpfile); + } - DELETE(Conf); + virtual void On005Numeric(std::string &output) + { + output.append(" SSL=" + sslports); } virtual ~ModuleSSLOpenSSL() @@ -288,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. - ServerInstance->GlobalCulls.AddItem(user, "SSL module unloading"); + User::QuitUser(ServerInstance, user, "SSL module unloading"); } if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports)) { @@ -313,10 +326,9 @@ class ModuleSSLOpenSSL : public Module 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"); } } } @@ -328,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) @@ -344,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) { @@ -355,7 +367,7 @@ 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) { @@ -370,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"; } } @@ -380,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; @@ -403,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; @@ -426,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); @@ -441,6 +465,10 @@ 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) @@ -463,6 +491,7 @@ class ModuleSSLOpenSSL : public Module } else { + errno = EAGAIN; return -1; } } @@ -502,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; } } @@ -517,6 +542,10 @@ 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) @@ -526,21 +555,28 @@ 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; @@ -589,7 +625,7 @@ 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. - + int ret = SSL_read(session->sess, session->inbuf + session->inbufoffset, inbufsize - session->inbufoffset); if (ret == 0) @@ -610,6 +646,7 @@ class ModuleSSLOpenSSL : public Module else if (err == SSL_ERROR_WANT_WRITE) { session->rstat = ISSL_WRITE; + MakePollWrite(session); return -1; } else @@ -631,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; @@ -643,7 +680,7 @@ class ModuleSSLOpenSSL : public Module } } - 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") @@ -653,7 +690,7 @@ 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"); } } } @@ -663,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)) { @@ -689,12 +726,14 @@ class ModuleSSLOpenSSL : public Module { 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 { @@ -707,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)) @@ -729,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. @@ -746,12 +785,29 @@ 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) @@ -835,25 +891,4 @@ static int error_callback(const char *str, size_t len, void *u) return 0; } -class ModuleSSLOpenSSLFactory : public ModuleFactory -{ - public: - ModuleSSLOpenSSLFactory() - { - } - - ~ModuleSSLOpenSSLFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSSLOpenSSL(Me); - } -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleSSLOpenSSLFactory; -} +MODULE_INIT(ModuleSSLOpenSSL)