X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_gnutls.cpp;h=c8cff3a21ef590f3b324d1ac63ecf330910b6719;hb=d556a4f8740b65e635ff7d2b976faaedbdac51d4;hp=ce2239a420594ab94a819b71292f65f4ebdb9d09;hpb=52acbb466b84a1cd161b1c111f855d6f0419fff3;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 ce2239a42..c8cff3a21 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -80,6 +80,7 @@ class ModuleSSLGnuTLS : public Module
 	std::string certfile;
 	std::string cafile;
 	std::string crlfile;
+	std::string sslports;
 	int dh_bits;
 
 	int clientactive;
@@ -124,12 +125,13 @@ class ModuleSSLGnuTLS : public Module
 
 		listenports.clear();
 		clientactive = 0;
+		sslports.clear();
 
 		for(int i = 0; i < Conf->Enumerate("bind"); i++)
 		{
 			// For each <bind> tag
 			std::string x = Conf->ReadValue("bind", "type", i);
-			if(((x.empty()) || (x == "clients")) && (x == "gnutls"))
+			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);
@@ -147,6 +149,7 @@ class ModuleSSLGnuTLS : public Module
 								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
 						{
@@ -208,9 +211,11 @@ 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();
@@ -248,7 +253,7 @@ class ModuleSSLGnuTLS : public Module
 			{
 				// 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");
+				userrec::QuitUser(ServerInstance, user, "SSL module unloading");
 			}
 			if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports))
 			{
@@ -281,10 +286,15 @@ 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 void On005Numeric(std::string &output)
+	{
+		output.append(" SSL=" + sslports);
+	}
+
 	virtual char* OnRequest(Request* request)
 	{
 		ISHRequest* ISR = (ISHRequest*)request;
@@ -498,6 +508,7 @@ class ModuleSSLGnuTLS : public Module
 
 		if (!session->sess)
 		{
+			ServerInstance->Log(DEBUG,"No session");
 			CloseSession(session);
 			return 1;
 		}
@@ -506,9 +517,10 @@ 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 -1;
@@ -516,11 +528,13 @@ class ModuleSSLGnuTLS : public Module
 
 		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);
+			ServerInstance->Log(DEBUG,"Return: %d", ret);
 
-			if(ret == 0)
+			if (ret == 0)
 			{
 				CloseSession(session);
 			}
@@ -528,16 +542,19 @@ class ModuleSSLGnuTLS : public Module
 			{
 				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);
 			}
 		}
@@ -822,25 +839,5 @@ class ModuleSSLGnuTLS : public Module
 
 };
 
-class ModuleSSLGnuTLSFactory : public ModuleFactory
-{
- public:
-	ModuleSSLGnuTLSFactory()
-	{
-	}
+MODULE_INIT(ModuleSSLGnuTLS);
 
-	~ModuleSSLGnuTLSFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSSLGnuTLS(Me);
-	}
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSSLGnuTLSFactory;
-}