X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_gnutls.cpp;h=49078e262b43c0e9eb58826c7c1c856c96000b59;hb=2ca30f42a2f405cde5f9737e655afca5883c1731;hp=64940cc95102b1818c07542088a5208fda07e914;hpb=fecd6851e063d091cf57acc069d69ddb8a1beb04;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 64940cc95..49078e262 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1,16 +1,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include "inspircd_config.h" @@ -23,11 +13,11 @@ /* $ModDesc: Provides SSL support for clients */ /* $CompileFlags: `libgnutls-config --cflags` */ -/* $LinkerFlags: `libgnutls-config --libs` */ +/* $LinkerFlags: `libgnutls-config --libs` `perl ../gnutls_rpath.pl` */ enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED }; -bool isin(int port, std::vector portlist) +bool isin(int port, const std::vector &portlist) { for(unsigned int i = 0; i < portlist.size(); i++) if(portlist[i] == port) @@ -47,7 +37,7 @@ public: int fd; }; -class ModuleSSL : public Module +class ModuleSSLGnuTLS : public Module { Server* Srv; ServerConfig* SrvConf; @@ -71,12 +61,11 @@ class ModuleSSL : public Module public: - ModuleSSL(Server* Me) + ModuleSSLGnuTLS(Server* Me) : Module::Module(Me) { Srv = Me; SrvConf = Srv->GetConfig(); - Conf = new ConfigReader; // Not rehashable...because I cba to reduce all the sizes of existing buffers. inbufsize = SrvConf->NetBufferSize; @@ -97,12 +86,11 @@ class ModuleSSL : public Module gnutls_certificate_set_dh_params(x509_cred, dh_params); } - virtual void OnRehash(std::string param) + virtual void OnRehash(const std::string ¶m) { if(param != "ssl") return; - delete Conf; Conf = new ConfigReader; for(unsigned int i = 0; i < listenports.size(); i++) @@ -119,12 +107,17 @@ class ModuleSSL : public Module { // Get the port we're meant to be listening on with SSL unsigned int port = Conf->ReadInteger("bind", "port", i, true); - SrvConf->AddIOHook(port, this); - - // We keep a record of which ports we're listening on with SSL - listenports.push_back(port); + if(SrvConf->AddIOHook(port, this)) + { + // We keep a record of which ports we're listening on with SSL + listenports.push_back(port); - log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", port); + log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", port); + } + else + { + log(DEFAULT, "m_ssl_gnutls.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", port); + } } } @@ -179,6 +172,8 @@ class ModuleSSL : public Module // This may be on a large (once a day or week) timer eventually. GenerateDHParams(); + + delete Conf; } void GenerateDHParams() @@ -192,9 +187,8 @@ class ModuleSSL : public Module log(DEFAULT, "m_ssl_gnutls.so: Failed to generate DH parameters (%d bits)", dh_bits); } - virtual ~ModuleSSL() + virtual ~ModuleSSLGnuTLS() { - delete Conf; gnutls_dh_params_deinit(dh_params); gnutls_certificate_free_credentials(x509_cred); gnutls_global_deinit(); @@ -216,7 +210,7 @@ class ModuleSSL : public Module } } - virtual void OnUnloadModule(Module* mod, std::string name) + virtual void OnUnloadModule(Module* mod, const std::string &name) { if(mod == this) { @@ -237,10 +231,10 @@ class ModuleSSL : public Module 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] = 1; + List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnGlobalConnect] = 1; } - virtual void OnRawSocketAccept(int fd, std::string ip, int localport) + virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport) { issl_session* session = &sessions[fd]; @@ -254,7 +248,14 @@ class ModuleSSL : public Module 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. + */ + gnutls_transport_set_ptr(session->sess, (gnutls_transport_ptr_t) fd); // Give gnutls the fd for the socket. + // gnutls_transport_set_ptr(session->sess, &fd); // Give gnutls the fd for the socket. Handshake(session); } @@ -454,13 +455,14 @@ class ModuleSSL : public Module // :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection virtual void OnWhois(userrec* source, userrec* dest) { - if(dest->GetExt("ssl")) + // Bugfix, only send this numeric for *our* SSL users + if(dest->GetExt("ssl") && isin(dest->port, listenports)) { - WriteServ(source->fd, "320 %s %s :is a Secure Connection", source->nick, dest->nick); + WriteServ(source->fd, "320 %s %s :is using a secure connection", source->nick, dest->nick); } } - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, std::string extname) + 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") @@ -475,7 +477,7 @@ class ModuleSSL : public Module } } - virtual void OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata) + 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")) @@ -529,15 +531,40 @@ class ModuleSSL : public Module log(DEBUG, "m_ssl_gnutls.so: Handshake completed"); // This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater. - Srv->FindDescriptor(session->fd)->Extend("ssl", "ON"); - + userrec* extendme = Srv->FindDescriptor(session->fd); + if (extendme) + { + if (!extendme->GetExt("ssl")) + extendme->Extend("ssl", "ON"); + } + + // Change the seesion state session->status = ISSL_HANDSHAKEN; + // Finish writing, if any left MakePollWrite(session); return true; } } + + virtual void OnGlobalConnect(userrec* user) + { + // This occurs AFTER OnUserConnect so we can be sure the + // protocol module has propogated the NICK message. + if ((user->GetExt("ssl")) && (IS_LOCAL(user))) + { + // Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW. + std::deque* metadata = new std::deque; + metadata->push_back(user->nick); + metadata->push_back("ssl"); // The metadata id + metadata->push_back("ON"); // The value to send + Event* event = new Event((char*)metadata,(Module*)this,"send_metadata"); + event->Send(); // Trigger the event. We don't care what module picks it up. + delete event; + delete metadata; + } + } void MakePollWrite(issl_session* session) { @@ -564,26 +591,25 @@ class ModuleSSL : public Module } }; -class ModuleSSLFactory : public ModuleFactory +class ModuleSSLGnuTLSFactory : public ModuleFactory { public: - ModuleSSLFactory() + ModuleSSLGnuTLSFactory() { } - ~ModuleSSLFactory() + ~ModuleSSLGnuTLSFactory() { } virtual Module * CreateModule(Server* Me) { - return new ModuleSSL(Me); + return new ModuleSSLGnuTLS(Me); } }; extern "C" void * init_module( void ) { - return new ModuleSSLFactory; + return new ModuleSSLGnuTLSFactory; } -