X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_gnutls.cpp;h=fd18f51f149a2c91f3d8e621e7a614b1ea3777b5;hb=0b29e01eb5169f5e547b87c32de8e452ba3eff17;hp=ea7aa7f7efd0eea2ea307e2fe24453f479a21f00;hpb=0b4dd1b4b804e734ff11c5ea580413af1305bd77;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 ea7aa7f7e..fd18f51f1 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -4,16 +4,20 @@ #include #include "inspircd_config.h" +#include "configreader.h" #include "users.h" #include "channels.h" #include "modules.h" #include "helperfuncs.h" #include "socket.h" #include "hashcomp.h" +#include "inspircd.h" /* $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 }; @@ -26,7 +30,7 @@ bool isin(int port, const std::vector &portlist) return false; } -class issl_session +class issl_session : public classbase { public: gnutls_session_t sess; @@ -39,11 +43,12 @@ public: class ModuleSSLGnuTLS : public Module { - Server* Srv; - ServerConfig* SrvConf; + ConfigReader* Conf; + + char* dummy; - CullList culllist; + CullList* culllist; std::vector listenports; @@ -61,14 +66,15 @@ class ModuleSSLGnuTLS : public Module public: - ModuleSSLGnuTLS(Server* Me) + ModuleSSLGnuTLS(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - SrvConf = Srv->GetConfig(); + + + culllist = new CullList(ServerInstance); // Not rehashable...because I cba to reduce all the sizes of existing buffers. - inbufsize = SrvConf->NetBufferSize; + inbufsize = ServerInstance->Config->NetBufferSize; gnutls_global_init(); // This must be called once in the program @@ -86,16 +92,16 @@ class ModuleSSLGnuTLS : 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; - Conf = new ConfigReader; + Conf = new ConfigReader(ServerInstance); for(unsigned int i = 0; i < listenports.size(); i++) { - SrvConf->DelIOHook(listenports[i]); + ServerInstance->Config->DelIOHook(listenports[i]); } listenports.clear(); @@ -107,7 +113,7 @@ class ModuleSSLGnuTLS : public Module { // Get the port we're meant to be listening on with SSL unsigned int port = Conf->ReadInteger("bind", "port", i, true); - if(SrvConf->AddIOHook(port, this)) + if (ServerInstance->Config->AddIOHook(port, this)) { // We keep a record of which ports we're listening on with SSL listenports.push_back(port); @@ -173,7 +179,7 @@ class ModuleSSLGnuTLS : public Module // This may be on a large (once a day or week) timer eventually. GenerateDHParams(); - delete Conf; + DELETE(Conf); } void GenerateDHParams() @@ -192,6 +198,7 @@ class ModuleSSLGnuTLS : public Module 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) @@ -200,26 +207,26 @@ class ModuleSSLGnuTLS : public Module { userrec* user = (userrec*)item; - if(user->GetExt("ssl") && IS_LOCAL(user) && isin(user->port, listenports)) + 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. log(DEBUG, "m_ssl_gnutls.so: Adding user %s to cull list", user->nick); - culllist.AddItem(user, "SSL module unloading"); + culllist->AddItem(user, "SSL module unloading"); } } } - virtual void OnUnloadModule(Module* mod, std::string name) + 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 - int numusers = culllist.Apply(); + int numusers = culllist->Apply(); log(DEBUG, "m_ssl_gnutls.so: Killed %d users for unload of GnuTLS SSL module", numusers); for(unsigned int i = 0; i < listenports.size(); i++) - SrvConf->DelIOHook(listenports[i]); + ServerInstance->Config->DelIOHook(listenports[i]); } } @@ -234,7 +241,7 @@ class ModuleSSLGnuTLS : public Module 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]; @@ -248,6 +255,15 @@ class ModuleSSLGnuTLS : 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. + * New: gnutls_transport_set_ptr(session->sess, &fd); // Give gnutls the fd for the socket. + * + * 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. Handshake(session); @@ -356,9 +372,6 @@ class ModuleSSLGnuTLS : public Module // As above readresult = length; } - - log(DEBUG, "m_ssl_gnutls.so: OnRawSocketRead: Passing %d bytes up to insp:"); - Srv->Log(DEBUG, std::string(buffer, readresult)); } } else if(session->status == ISSL_CLOSING) @@ -370,7 +383,7 @@ class ModuleSSLGnuTLS : public Module return 1; } - virtual int OnRawSocketWrite(int fd, char* buffer, int count) + virtual int OnRawSocketWrite(int fd, const char* buffer, int count) { issl_session* session = &sessions[fd]; const char* sendbuffer = buffer; @@ -408,10 +421,7 @@ class ModuleSSLGnuTLS : public Module count = session->outbuf.size(); if(session->status == ISSL_HANDSHAKEN) - { - log(DEBUG, "m_ssl_gnutls.so: OnRawSocketWrite: Trying to write %d bytes:", count); - Srv->Log(DEBUG, session->outbuf); - + { int ret = gnutls_record_send(session->sess, sendbuffer, count); if(ret == 0) @@ -448,19 +458,20 @@ class ModuleSSLGnuTLS : 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", dummy) || (IS_LOCAL(dest) && isin(dest->GetPort(), listenports))) { - WriteServ(source->fd, "320 %s %s :is a secure connection", source->nick, dest->nick); + source->WriteServ("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") { // check if this user has an swhois field to send - if(user->GetExt(extname)) + if(user->GetExt(extname, dummy)) { // 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. @@ -469,14 +480,14 @@ class ModuleSSLGnuTLS : 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")) { userrec* dest = (userrec*)target; // if they dont already have an ssl flag, accept the remote server's - if (!dest->GetExt(extname)) + if (!dest->GetExt(extname, dummy)) { dest->Extend(extname, "ON"); } @@ -523,8 +534,12 @@ class ModuleSSLGnuTLS : 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. - userrec* extendme = Srv->FindDescriptor(session->fd); - extendme->Extend("ssl", "ON"); + userrec* extendme = ServerInstance->FindDescriptor(session->fd); + if (extendme) + { + if (!extendme->GetExt("ssl", dummy)) + extendme->Extend("ssl", "ON"); + } // Change the seesion state session->status = ISSL_HANDSHAKEN; @@ -540,7 +555,7 @@ class ModuleSSLGnuTLS : public Module { // This occurs AFTER OnUserConnect so we can be sure the // protocol module has propogated the NICK message. - if ((user->GetExt("ssl")) && (IS_LOCAL(user))) + 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. std::deque* metadata = new std::deque; @@ -548,9 +563,9 @@ class ModuleSSLGnuTLS : public Module 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; + event->Send(ServerInstance); // Trigger the event. We don't care what module picks it up. + DELETE(event); + DELETE(metadata); } } @@ -590,7 +605,7 @@ class ModuleSSLGnuTLSFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleSSLGnuTLS(Me); } @@ -601,4 +616,3 @@ extern "C" void * init_module( void ) { return new ModuleSSLGnuTLSFactory; } -