X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_gnutls.cpp;h=49078e262b43c0e9eb58826c7c1c856c96000b59;hb=2ca30f42a2f405cde5f9737e655afca5883c1731;hp=0ea713d00ccafcafa82cb29c86ef9673ede0c50d;hpb=0fff50fdd786eb1a3ca0ab69cbaa73dac21f385d;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 0ea713d00..49078e262 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -13,7 +13,7 @@
 
 /* $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 };
 
@@ -86,7 +86,7 @@ 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 &param)
 	{
 		if(param != "ssl")
 			return;
@@ -210,7 +210,7 @@ class ModuleSSLGnuTLS : public Module
 		}
 	}
 	
-	virtual void OnUnloadModule(Module* mod, std::string name)
+	virtual void OnUnloadModule(Module* mod, const std::string &name)
 	{
 		if(mod == this)
 		{
@@ -231,10 +231,10 @@ class ModuleSSLGnuTLS : 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];
 	
@@ -248,7 +248,14 @@ 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.
+		 */
+		
 		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);
 	}
@@ -448,13 +455,14 @@ 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") && 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")
@@ -469,7 +477,7 @@ 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"))
@@ -524,18 +532,12 @@ class ModuleSSLGnuTLS : public Module
 			
 			// 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");
+			if (extendme)
+			{
+				if (!extendme->GetExt("ssl"))
+					extendme->Extend("ssl", "ON");
+			}
 
-			// Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW.
-			std::deque<std::string>* metadata = new std::deque<std::string>;
-			metadata->push_back(extendme->nick);
-			metadata->push_back("ssl");
-			metadata->push_back("ON");
-			Event* event = new Event((char*)metadata,(Module*)this,"send_metadata");
-			event->Send();
-			delete event;
-			delete metadata;
-			
 			// Change the seesion state
 			session->status = ISSL_HANDSHAKEN;
 			
@@ -545,6 +547,24 @@ class ModuleSSLGnuTLS : public Module
 			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<std::string>* metadata = new std::deque<std::string>;
+			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)
 	{
@@ -593,4 +613,3 @@ extern "C" void * init_module( void )
 {
 	return new ModuleSSLGnuTLSFactory;
 }
-