You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dh...@apache.org on 2014/10/23 06:10:07 UTC
[1/2] git commit: CAMEL-7940: polished unit test,
updated testSecureSocketProtocol to enable SSLv3 explicitly
Repository: camel
Updated Branches:
refs/heads/master 085268f55 -> aa9b1c050
CAMEL-7940: polished unit test, updated testSecureSocketProtocol to enable SSLv3 explicitly
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7b9a219
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7b9a219
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7b9a219
Branch: refs/heads/master
Commit: b7b9a2199ce5043458585b93d5b8f2adc54cc80a
Parents: 085268f
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Wed Oct 22 11:45:45 2014 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Wed Oct 22 21:09:54 2014 -0700
----------------------------------------------------------------------
.../util/jsse/SSLContextParametersTest.java | 42 ++++++++++++++++++--
1 file changed, 38 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b7b9a219/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index 99bd6fd..d62a625 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -21,7 +21,6 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.regex.Pattern;
-
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLServerSocket;
@@ -253,8 +252,8 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertFalse(Arrays.equals(controlEngine.getEnabledProtocols(), engine.getEnabledProtocols()));
- assertFalse(Arrays.equals(controlSocket.getEnabledProtocols(), socket.getEnabledProtocols()));
+ assertStartsWith(engine.getEnabledProtocols(), "TLS");
+ assertStartsWith(socket.getEnabledProtocols(), "TLS");
assertEquals(0, serverSocket.getEnabledProtocols().length);
// Secure socket protocols filter on client params
@@ -744,6 +743,15 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
SSLContext context = scp.createSSLContext();
assertEquals("TLS", context.getProtocol());
+
+ SSLEngine engine = context.createSSLEngine();
+ SSLSocket socket = (SSLSocket) context.getSocketFactory().createSocket();
+ SSLServerSocket serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
+
+ // default disable the SSL* protocols
+ assertStartsWith(engine.getEnabledProtocols(), "TLS");
+ assertStartsWith(socket.getEnabledProtocols(), "TLS");
+ assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
}
public void testSecureSocketProtocol() throws Exception {
@@ -751,8 +759,34 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
scp.setSecureSocketProtocol("SSLv3");
SSLContext context = scp.createSSLContext();
-
+
assertEquals("SSLv3", context.getProtocol());
+
+ SSLEngine engine = context.createSSLEngine();
+ SSLSocket socket = (SSLSocket) context.getSocketFactory().createSocket();
+ SSLServerSocket serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
+
+ // default disable the SSL* protocols
+ assertStartsWith(engine.getEnabledProtocols(), "TLS");
+ assertStartsWith(socket.getEnabledProtocols(), "TLS");
+ assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+
+ // allow SSL* protocols by explicitly asking for them
+ final SecureSocketProtocolsParameters protocols = new SecureSocketProtocolsParameters();
+ protocols.getSecureSocketProtocol().add("SSLv3");
+ scp.setSecureSocketProtocols(protocols);
+
+ context = scp.createSSLContext();
+ engine = context.createSSLEngine();
+ socket = (SSLSocket) context.getSocketFactory().createSocket();
+ serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
+
+ assertEquals(engine.getEnabledProtocols().length, 1);
+ assertEquals(engine.getEnabledProtocols()[0], "SSLv3");
+ assertEquals(socket.getEnabledProtocols().length, 1);
+ assertEquals(socket.getEnabledProtocols()[0], "SSLv3");
+ assertEquals(serverSocket.getEnabledProtocols().length, 1);
+ assertEquals(serverSocket.getEnabledProtocols()[0], "SSLv3");
}
public void testProvider() throws Exception {
[2/2] git commit: CAMEL-7940: updated tests for client SSP and server
SSP
Posted by dh...@apache.org.
CAMEL-7940: updated tests for client SSP and server SSP
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aa9b1c05
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aa9b1c05
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aa9b1c05
Branch: refs/heads/master
Commit: aa9b1c0505020a7323ddd3a7c2e88ebf39ec6bce
Parents: b7b9a21
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Wed Oct 22 21:08:07 2014 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Wed Oct 22 21:09:55 2014 -0700
----------------------------------------------------------------------
.../apache/camel/util/jsse/SSLContextParametersTest.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aa9b1c05/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index d62a625..a51972e 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -186,7 +186,11 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
SSLEngine engine = context.createSSLEngine();
SSLSocket socket = (SSLSocket) context.getSocketFactory().createSocket();
SSLServerSocket serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
-
+
+ assertStartsWith(engine.getEnabledProtocols(), "TLS");
+ assertStartsWith(socket.getEnabledProtocols(), "TLS");
+ assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+
assertTrue(Arrays.equals(controlEngine.getEnabledCipherSuites(), engine.getEnabledCipherSuites()));
assertTrue(Arrays.equals(controlSocket.getEnabledCipherSuites(), socket.getEnabledCipherSuites()));
assertTrue(Arrays.equals(this.getDefaultCipherSuiteIncludes(controlServerSocket.getSupportedCipherSuites()), serverSocket.getEnabledCipherSuites()));
@@ -322,6 +326,10 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
SSLSocket socket = (SSLSocket) context.getSocketFactory().createSocket();
SSLServerSocket serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
+ assertStartsWith(engine.getEnabledProtocols(), "TLS");
+ assertStartsWith(socket.getEnabledProtocols(), "TLS");
+ assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+
assertTrue(Arrays.equals(controlEngine.getEnabledCipherSuites(), engine.getEnabledCipherSuites()));
assertTrue(Arrays.equals(controlSocket.getEnabledCipherSuites(), socket.getEnabledCipherSuites()));
assertTrue(Arrays.equals(this.getDefaultCipherSuiteIncludes(controlServerSocket.getSupportedCipherSuites()), serverSocket.getEnabledCipherSuites()));