Attachment 252494 Details for Bug 464737 – updated patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] updated patch

org.eclipse.tm.patch (text/plain), 3.13 KB, created by David McKnight

on 2015-04-17 11:07:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2015-04-17 11:07:06 EDT

Size: 3.13 KB

patch

obsolete

>diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
>index ea0144a..78b18e3 100644
>--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
>+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
>@@ -281,6 +281,8 @@
> 					// for security, enable only ciphers and protocols that are common
> 					enableCiphers(sslServerSocket);
> 					enableProtocols(sslServerSocket);
>+					
>+					logAvailableCiphersAndProtocols(sslServerSocket);
> 				}
> 				
> 				Socket newSocket = _serverSocket.accept();
>@@ -612,6 +614,19 @@
> 	   		}
> 			writer.println(version);
> 			writer.flush();
>+			
>+		   if (socket instanceof SSLSocket){ // log the protocol and cipher suite used
>+			   SSLSocket sslSocket = (SSLSocket)socket;
>+			   SSLSession session = sslSocket.getSession();
>+			   String protocol = session.getProtocol();		   
>+			   String cipherSuite = session.getCipherSuite();
>+			   IServerLogger logger = _dataStore.getClient().getLogger();
>+
>+			   String cn = getClass().toString();
>+			   
>+			   logger.logInfo(cn, "SSL/TLS Protocol: "+protocol); //$NON-NLS-1$
>+			   logger.logInfo(cn, "SSL/TLS Cipher Suite: " + cipherSuite); //$NON-NLS-1$
>+		   }			
> 	   	}
> 	   	catch (IOException e)
> 	   	{
>@@ -623,6 +638,42 @@
> 
> 	}
> 	
>+	
>+	
>+	private void logAvailableCiphersAndProtocols(SSLServerSocket sslSocket){
>+	   IServerLogger logger = _dataStore.getClient().getLogger();
>+
>+	   String cn = getClass().toString();
>+	   // list the supported and available ciphers and protocols
>+	   logger.logDebugMessage(cn, "SSL/TLS Enabled Cipher Suites:"); //$NON-NLS-1$
>+	   String[] enabledSuites = sslSocket.getEnabledCipherSuites();			   
>+	   for (int i = 0; i < enabledSuites.length; i++){
>+		   String suite = enabledSuites[i];
>+		   logger.logDebugMessage(cn, '\t' + suite);
>+	   }			   			   
>+	   
>+	   String[] supportedSuites = sslSocket.getSupportedCipherSuites();
>+	   logger.logDebugMessage(cn, "SSL/TLS Supported Cipher Suites:"); //$NON-NLS-1$	   
>+	   for (int i = 0; i < supportedSuites.length; i++){
>+		   String suite = supportedSuites[i];
>+		   logger.logDebugMessage(cn, '\t' + suite);
>+	   }		
>+	   
>+	   String[] enabledProtocols = sslSocket.getEnabledProtocols();
>+	   logger.logDebugMessage(cn, "SSL/TLS Enabled Protocols:"); //$NON-NLS-1$		   
>+	   for (int i = 0; i < enabledProtocols.length; i++){
>+		   String eprotocol = enabledProtocols[i];
>+		   logger.logDebugMessage(cn, '\t' + eprotocol);
>+	   }		
>+	   
>+	   String[] supportedProtocols = sslSocket.getSupportedProtocols();
>+	   logger.logDebugMessage(cn, "SSL/TLS Supported Protocols:"); //$NON-NLS-1$		   
>+	   for (int i = 0; i < supportedProtocols.length; i++){
>+		   String sprotocol = supportedProtocols[i];
>+		   logger.logDebugMessage(cn, '\t' + sprotocol);
>+	   }		
>+	}
>+	
> 	/**
> 	 * Specify cipher patterns to be disabled when using SSL sockets
> 	 * @param cipherPatterns regex patterns of ciphers to disable

Actions: View | Diff

Attachments on bug 464737: 252434 | 252494