X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_gnutls.cpp;h=c8cff3a21ef590f3b324d1ac63ecf330910b6719;hb=d556a4f8740b65e635ff7d2b976faaedbdac51d4;hp=04153dc3c3d3514934c3df452f7d926008ed65dd;hpb=0373c41ebd98c29ccaf71564c6ad23000189230d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 04153dc3c..c8cff3a21 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -11,8 +11,7 @@ * --------------------------------------------------- */ -#include -#include +#include "inspircd.h" #include #include @@ -22,13 +21,16 @@ #include "users.h" #include "channels.h" #include "modules.h" - #include "socket.h" #include "hashcomp.h" -#include "inspircd.h" - #include "transport.h" +#ifdef WINDOWS +#pragma comment(lib, "libgnutls-13.lib") +#undef MAX_DESCRIPTORS +#define MAX_DESCRIPTORS 10000 +#endif + /* $ModDesc: Provides SSL support for clients */ /* $CompileFlags: exec("libgnutls-config --cflags") */ /* $LinkerFlags: rpath("libgnutls-config --libs") exec("libgnutls-config --libs") */ @@ -42,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; } @@ -61,41 +63,38 @@ public: class ModuleSSLGnuTLS : public Module { - + ConfigReader* Conf; char* dummy; - - CullList* culllist; - + std::vector listenports; - + int inbufsize; issl_session sessions[MAX_DESCRIPTORS]; - + gnutls_certificate_credentials x509_cred; gnutls_dh_params dh_params; - + std::string keyfile; std::string certfile; std::string cafile; std::string crlfile; + std::string sslports; int dh_bits; - + + int clientactive; + public: - + ModuleSSLGnuTLS(InspIRCd* Me) - : Module::Module(Me) + : Module(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; - + gnutls_global_init(); // This must be called once in the program if(gnutls_certificate_allocate_credentials(&x509_cred) != 0) @@ -107,29 +106,32 @@ class ModuleSSLGnuTLS : public Module // Needs the flag as it ignores a plain /rehash OnRehash(NULL,"ssl"); - + // Void return, guess we assume success gnutls_certificate_set_dh_params(x509_cred, dh_params); } - + virtual void OnRehash(userrec* user, const std::string ¶m) { if(param != "ssl") return; - + Conf = new ConfigReader(ServerInstance); - + for(unsigned int i = 0; i < listenports.size(); i++) { ServerInstance->Config->DelIOHook(listenports[i]); } - + listenports.clear(); - + 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) == "gnutls")) + std::string x = Conf->ReadValue("bind", "type", i); + if(((x.empty()) || (x == "clients")) && (Conf->ReadValue("bind", "ssl", i) == "gnutls")) { // Get the port we're meant to be listening on with SSL std::string port = Conf->ReadValue("bind", "port", i); @@ -137,61 +139,70 @@ class ModuleSSLGnuTLS : public Module 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_gnutls.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_gnutls.so: Enabling SSL for port %d", portno); + sslports.append("*:").append(ConvToStr(portno)).append(";"); + } + else + { + ServerInstance->Log(DEFAULT, "m_ssl_gnutls.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_gnutls.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", portno); + ServerInstance->Log(DEFAULT, "m_ssl_gnutls.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 an other SSL or similar module loaded?", portno, e.GetReason()); } } } } - - std::string confdir(CONFIG_FILE); + + 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("gnutls", "cafile", 0); crlfile = Conf->ReadValue("gnutls", "crlfile", 0); certfile = Conf->ReadValue("gnutls", "certfile", 0); keyfile = Conf->ReadValue("gnutls", "keyfile", 0); dh_bits = Conf->ReadInteger("gnutls", "dhbits", 0, false); - + // Set all the default values needed. - if(cafile == "") + if (cafile.empty()) cafile = "ca.pem"; - - if(crlfile == "") + + if (crlfile.empty()) crlfile = "crl.pem"; - - if(certfile == "") + + if (certfile.empty()) certfile = "cert.pem"; - - if(keyfile == "") + + if (keyfile.empty()) keyfile = "key.pem"; - + if((dh_bits != 768) && (dh_bits != 1024) && (dh_bits != 2048) && (dh_bits != 3072) && (dh_bits != 4096)) dh_bits = 1024; - - // 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; - + int ret; if((ret =gnutls_certificate_set_x509_trust_file(x509_cred, cafile.c_str(), GNUTLS_X509_FMT_PEM)) < 0) @@ -200,48 +211,49 @@ class ModuleSSLGnuTLS : public Module if((ret = gnutls_certificate_set_x509_crl_file (x509_cred, crlfile.c_str(), GNUTLS_X509_FMT_PEM)) < 0) ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: Failed to set X.509 CRL file '%s': %s", crlfile.c_str(), gnutls_strerror(ret)); - // Guessing on the return value of this, manual doesn't say :| if((ret = gnutls_certificate_set_x509_key_file (x509_cred, certfile.c_str(), keyfile.c_str(), GNUTLS_X509_FMT_PEM)) < 0) - ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: Failed to set X.509 certificate and key files '%s' and '%s': %s", certfile.c_str(), keyfile.c_str(), gnutls_strerror(ret)); - + { + // If this fails, no SSL port will work. At all. So, do the smart thing - throw a ModuleException + throw ModuleException("Unable to load GnuTLS server certificate: " + std::string(gnutls_strerror(ret))); + } + // This may be on a large (once a day or week) timer eventually. GenerateDHParams(); - + DELETE(Conf); } - + void GenerateDHParams() { // Generate Diffie Hellman parameters - for use with DHE // kx algorithms. These should be discarded and regenerated // once a day, once a week or once a month. Depending on the // security requirements. - + int ret; if((ret = gnutls_dh_params_generate2(dh_params, dh_bits)) < 0) ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: Failed to generate DH parameters (%d bits): %s", dh_bits, gnutls_strerror(ret)); } - + virtual ~ModuleSSLGnuTLS() { gnutls_dh_params_deinit(dh_params); gnutls_certificate_free_credentials(x509_cred); gnutls_global_deinit(); - delete culllist; } - + virtual void OnCleanup(int target_type, void* item) { if(target_type == TYPE_USER) { userrec* user = (userrec*)item; - + if(user->GetExt("ssl", dummy) && 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"); + userrec::QuitUser(ServerInstance, user, "SSL module unloading"); } if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports)) { @@ -252,25 +264,21 @@ class ModuleSSLGnuTLS : 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); @@ -278,11 +286,16 @@ class ModuleSSLGnuTLS : 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_On005Numeric] = 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) + virtual void On005Numeric(std::string &output) + { + output.append(" SSL=" + sslports); + } + + virtual char* OnRequest(Request* request) { ISHRequest* ISR = (ISHRequest*)request; if (strcmp("IS_NAME", request->GetId()) == 0) @@ -308,16 +321,25 @@ class ModuleSSLGnuTLS : public Module } 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_READ || session->status == ISSL_HANDSHAKING_WRITE) ? NULL : (char*)"OK"; } else if (strcmp("IS_ATTACH", request->GetId()) == 0) { - issl_session* session = &sessions[ISR->Sock->GetFd()]; - if (session) + if (ISR->Sock->GetFd() > -1) { - VerifyCertificate(session, (InspSocket*)ISR->Sock); - return "OK"; + issl_session* session = &sessions[ISR->Sock->GetFd()]; + if (session->sess) + { + if ((Extensible*)ServerInstance->FindDescriptor(ISR->Sock->GetFd()) == (Extensible*)(ISR->Sock)) + { + VerifyCertificate(session, (InspSocket*)ISR->Sock); + return "OK"; + } + } } } return NULL; @@ -327,18 +349,17 @@ class ModuleSSLGnuTLS : public Module 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; - + gnutls_init(&session->sess, GNUTLS_SERVER); gnutls_set_default_priority(session->sess); // Avoid calling all the priority functions, defaults are adequate. gnutls_credentials_set(session->sess, GNUTLS_CRD_CERTIFICATE, x509_cred); - gnutls_certificate_server_set_request(session->sess, GNUTLS_CERT_REQUEST); // Request client certificate if any. gnutls_dh_set_prime_bits(session->sess, dh_bits); - + /* This is an experimental change to avoid a warning on 64bit systems about casting between integer and pointer of different sizes * This needs testing, but it's easy enough to rollback if need be * Old: gnutls_transport_set_ptr(session->sess, (gnutls_transport_ptr_t) fd); // Give gnutls the fd for the socket. @@ -346,9 +367,11 @@ class ModuleSSLGnuTLS : public Module * * With testing this seems to...not work :/ */ - + gnutls_transport_set_ptr(session->sess, (gnutls_transport_ptr_t) fd); // Give gnutls the fd for the socket. + gnutls_certificate_server_set_request(session->sess, GNUTLS_CERT_REQUEST); // Request client certificate if any. + Handshake(session); } @@ -364,10 +387,7 @@ class ModuleSSLGnuTLS : public Module gnutls_set_default_priority(session->sess); // Avoid calling all the priority functions, defaults are adequate. gnutls_credentials_set(session->sess, GNUTLS_CRD_CERTIFICATE, x509_cred); - //TODO: Request server cert here. - //gnutls_certificate_request(session->sess, GNUTLS_CERT_REQUEST); // Request server certificate if any. gnutls_dh_set_prime_bits(session->sess, dh_bits); - gnutls_transport_set_ptr(session->sess, (gnutls_transport_ptr_t) fd); // Give gnutls the fd for the socket. Handshake(session); @@ -387,11 +407,11 @@ class ModuleSSLGnuTLS : public Module user->Shrink("ssl_cert"); } } - + virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { issl_session* session = &sessions[fd]; - + if (!session->sess) { readresult = 0; @@ -402,20 +422,21 @@ class ModuleSSLGnuTLS : public Module if (session->status == ISSL_HANDSHAKING_READ) { // The handshake isn't finished, try to finish it. - + if(!Handshake(session)) { - // Couldn't resume handshake. + // Couldn't resume handshake. return -1; } } else if (session->status == ISSL_HANDSHAKING_WRITE) { + errno = EAGAIN; return -1; } - + // If we resumed the handshake then session->status will be ISSL_HANDSHAKEN. - + if (session->status == ISSL_HANDSHAKEN) { // Is this right? Not sure if the unencrypted data is garaunteed to be the same length. @@ -432,7 +453,10 @@ class ModuleSSLGnuTLS : public Module else if (ret < 0) { if (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED) + { + errno = EAGAIN; return -1; + } else { readresult = 0; @@ -444,9 +468,9 @@ class ModuleSSLGnuTLS : public Module // Read successfully 'ret' bytes into inbuf + inbufoffset // There are 'ret' + 'inbufoffset' bytes of data in 'inbuf' // 'buffer' is 'count' long - + unsigned int length = ret + session->inbufoffset; - + if(count <= length) { memcpy(buffer, session->inbuf, count); @@ -470,10 +494,10 @@ class ModuleSSLGnuTLS : public Module } else if(session->status == ISSL_CLOSING) readresult = 0; - + return 1; } - + virtual int OnRawSocketWrite(int fd, const char* buffer, int count) { if (!count) @@ -484,6 +508,7 @@ class ModuleSSLGnuTLS : public Module if (!session->sess) { + ServerInstance->Log(DEBUG,"No session"); CloseSession(session); return 1; } @@ -492,50 +517,68 @@ class ModuleSSLGnuTLS : public Module sendbuffer = session->outbuf.c_str(); count = session->outbuf.size(); - if(session->status == ISSL_HANDSHAKING_WRITE) + if (session->status == ISSL_HANDSHAKING_WRITE) { // The handshake isn't finished, try to finish it. + ServerInstance->Log(DEBUG,"Finishing handshake"); Handshake(session); errno = EAGAIN; - return 0; + return -1; } int ret = 0; - if(session->status == ISSL_HANDSHAKEN) - { + if (session->status == ISSL_HANDSHAKEN) + { + ServerInstance->Log(DEBUG,"Send record"); ret = gnutls_record_send(session->sess, sendbuffer, count); - - if(ret == 0) + ServerInstance->Log(DEBUG,"Return: %d", ret); + + if (ret == 0) + { CloseSession(session); - else if(ret < 0) + } + else if (ret < 0) { if(ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) + { + ServerInstance->Log(DEBUG,"Not egain or interrupt, close session"); CloseSession(session); + } + else + { + ServerInstance->Log(DEBUG,"Again please"); + errno = EAGAIN; + return -1; + } } else { + ServerInstance->Log(DEBUG,"Trim buffer"); session->outbuf = session->outbuf.substr(ret); } } - + /* Who's smart idea was it to return 1 when we havent written anything? * This fucks the buffer up in InspSocket :p */ return ret < 1 ? 0 : ret; } - + // :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection virtual void OnWhois(userrec* source, userrec* 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(userrec* 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") @@ -545,11 +588,11 @@ class ModuleSSLGnuTLS : 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 @@ -563,17 +606,17 @@ class ModuleSSLGnuTLS : public Module } } } - + bool Handshake(issl_session* session) - { + { int ret = gnutls_handshake(session->sess); - + if (ret < 0) { if(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED) { // Handshake needs resuming later, read() or write() would have blocked. - + if(gnutls_record_get_direction(session->sess) == 0) { // gnutls_handshake() wants to read() again. @@ -583,7 +626,7 @@ class ModuleSSLGnuTLS : public Module { // gnutls_handshake() wants to write() again. session->status = ISSL_HANDSHAKING_WRITE; - MakePollWrite(session); + MakePollWrite(session); } } else @@ -592,7 +635,7 @@ class ModuleSSLGnuTLS : public Module CloseSession(session); session->status = ISSL_CLOSING; } - + return false; } else @@ -608,10 +651,10 @@ class ModuleSSLGnuTLS : public Module // Change the seesion state session->status = ISSL_HANDSHAKEN; - + // Finish writing, if any left MakePollWrite(session); - + return true; } } @@ -633,14 +676,21 @@ class ModuleSSLGnuTLS : public Module DELETE(metadata); VerifyCertificate(&sessions[user->GetFd()],user); + if (sessions[user->GetFd()].sess) + { + std::string cipher = gnutls_kx_get_name(gnutls_kx_get(sessions[user->GetFd()].sess)); + cipher.append("-").append(gnutls_cipher_get_name(gnutls_cipher_get(sessions[user->GetFd()].sess))).append("-"); + cipher.append(gnutls_mac_get_name(gnutls_mac_get(sessions[user->GetFd()].sess))); + user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\"", user->nick, cipher.c_str()); + } } } - + void MakePollWrite(issl_session* session) { OnRawSocketWrite(session->fd, NULL, 0); } - + void CloseSession(issl_session* session) { if(session->sess) @@ -648,12 +698,12 @@ class ModuleSSLGnuTLS : public Module gnutls_bye(session->sess, GNUTLS_SHUT_WR); gnutls_deinit(session->sess); } - + if(session->inbuf) { delete[] session->inbuf; } - + session->outbuf.clear(); session->inbuf = NULL; session->sess = NULL; @@ -662,6 +712,9 @@ class ModuleSSLGnuTLS : public Module void VerifyCertificate(issl_session* session, Extensible* user) { + if (!session->sess || !user) + return; + unsigned int status; const gnutls_datum_t* cert_list; int ret; @@ -718,7 +771,7 @@ class ModuleSSLGnuTLS : public Module { certinfo->data.insert(std::make_pair("trusted",ConvToStr(1))); } - + /* Up to here the process is the same for X.509 certificates and * OpenPGP keys. From now on X.509 certificates are assumed. This can * be easily extended to work with openpgp keys as well. @@ -744,7 +797,7 @@ class ModuleSSLGnuTLS : public Module return; } - /* This is not a real world example, since we only check the first + /* This is not a real world example, since we only check the first * certificate in the given chain. */ @@ -786,25 +839,5 @@ class ModuleSSLGnuTLS : public Module }; -class ModuleSSLGnuTLSFactory : public ModuleFactory -{ - public: - ModuleSSLGnuTLSFactory() - { - } - - ~ModuleSSLGnuTLSFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSSLGnuTLS(Me); - } -}; +MODULE_INIT(ModuleSSLGnuTLS); - -extern "C" void * init_module( void ) -{ - return new ModuleSSLGnuTLSFactory; -}