Repository: cxf Updated Branches: refs/heads/master 8ea1ea3f8 -> a97f886f3
Explicitly "include" ciphersuites for the Jetty Server + some tests for NULL ciphersuites Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a97f886f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a97f886f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a97f886f Branch: refs/heads/master Commit: a97f886f36c8aea2a49860ec8cd33b0021b7b9e2 Parents: 8ea1ea3 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Jan 5 16:13:04 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Jan 5 16:13:44 2015 +0000 ---------------------------------------------------------------------- .../http_jetty/JettyHTTPServerEngine.java | 20 +++- .../https/ciphersuites/CipherSuitesTest.java | 113 +++++++++++++++++++ .../ciphersuites/ciphersuites-null-client.xml | 37 ++++++ .../https/ciphersuites/ciphersuites-server.xml | 24 +++- 4 files changed, 189 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a97f886f/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java index 405e81a..ad21c55 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java @@ -696,14 +696,26 @@ public class JettyHTTPServerEngine implements ServerEngine { tlsServerParameters.getTrustManagers(), tlsServerParameters.getSecureRandom()); - String[] cs = + // Set the CipherSuites + final String[] supportedCipherSuites = + SSLUtils.getServerSupportedCipherSuites(context); + + String[] excludedCipherSuites = SSLUtils.getCiphersuites( tlsServerParameters.getCipherSuites(), - SSLUtils.getServerSupportedCipherSuites(context), + supportedCipherSuites, tlsServerParameters.getCipherSuitesFilter(), LOG, true); - - scf.setExcludeCipherSuites(cs); + scf.setExcludeCipherSuites(excludedCipherSuites); + + String[] includedCipherSuites = + SSLUtils.getCiphersuites( + tlsServerParameters.getCipherSuites(), + supportedCipherSuites, + tlsServerParameters.getCipherSuitesFilter(), + LOG, false); + scf.setIncludeCipherSuites(includedCipherSuites); + return context; } protected KeyManager[] getKeyManagersWithCertAlias(KeyManager keyManagers[]) throws Exception { http://git-wip-us.apache.org/repos/asf/cxf/blob/a97f886f/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java index 4f2f8c5..f37b1f9 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java @@ -37,6 +37,7 @@ import org.junit.BeforeClass; public class CipherSuitesTest extends AbstractBusClientServerTestBase { static final String PORT = allocatePort(CipherSuitesServer.class); static final String PORT2 = allocatePort(CipherSuitesServer.class, 2); + static final String PORT3 = allocatePort(CipherSuitesServer.class, 3); @BeforeClass public static void startServers() throws Exception { @@ -277,4 +278,116 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase { bus.shutdown(true); } + // Both client + server include NULL + @org.junit.Test + public void testNULLIncluded() throws Exception { + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = CipherSuitesTest.class.getResource("ciphersuites-null-client.xml"); + + Bus bus = bf.createBus(busFile.toString()); + SpringBusFactory.setDefaultBus(bus); + SpringBusFactory.setThreadDefaultBus(bus); + + URL url = SOAPService.WSDL_LOCATION; + SOAPService service = new SOAPService(url, SOAPService.SERVICE); + assertNotNull("Service is null", service); + final Greeter port = service.getHttpsPort(); + assertNotNull("Port is null", port); + + updateAddressPort(port, PORT3); + + assertEquals(port.greetMe("Kitty"), "Hello Kitty"); + + ((java.io.Closeable)port).close(); + bus.shutdown(true); + } + + // Both client + server include NULL + @org.junit.Test + public void testNULLIncludedAsync() throws Exception { + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = CipherSuitesTest.class.getResource("ciphersuites-null-client.xml"); + + Bus bus = bf.createBus(busFile.toString()); + SpringBusFactory.setDefaultBus(bus); + SpringBusFactory.setThreadDefaultBus(bus); + + URL url = SOAPService.WSDL_LOCATION; + SOAPService service = new SOAPService(url, SOAPService.SERVICE); + assertNotNull("Service is null", service); + final Greeter port = service.getHttpsPort(); + assertNotNull("Port is null", port); + + // Enable Async + ((BindingProvider)port).getRequestContext().put("use.async.http.conduit", true); + + updateAddressPort(port, PORT3); + + assertEquals(port.greetMe("Kitty"), "Hello Kitty"); + + ((java.io.Closeable)port).close(); + bus.shutdown(true); + } + + // Client does not allow NULL + @org.junit.Test + public void testClientAESServerNULL() throws Exception { + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client.xml"); + + Bus bus = bf.createBus(busFile.toString()); + SpringBusFactory.setDefaultBus(bus); + SpringBusFactory.setThreadDefaultBus(bus); + + URL url = SOAPService.WSDL_LOCATION; + SOAPService service = new SOAPService(url, SOAPService.SERVICE); + assertNotNull("Service is null", service); + final Greeter port = service.getHttpsPort(); + assertNotNull("Port is null", port); + + updateAddressPort(port, PORT3); + + try { + port.greetMe("Kitty"); + fail("Failure expected on not being able to negotiate a cipher suite"); + } catch (Exception ex) { + // expected + } + + ((java.io.Closeable)port).close(); + bus.shutdown(true); + } + + // Client does not allow NULL + @org.junit.Test + public void testClientAESServerNULLAsync() throws Exception { + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client.xml"); + + Bus bus = bf.createBus(busFile.toString()); + SpringBusFactory.setDefaultBus(bus); + SpringBusFactory.setThreadDefaultBus(bus); + + URL url = SOAPService.WSDL_LOCATION; + SOAPService service = new SOAPService(url, SOAPService.SERVICE); + assertNotNull("Service is null", service); + final Greeter port = service.getHttpsPort(); + assertNotNull("Port is null", port); + + // Enable Async + ((BindingProvider)port).getRequestContext().put("use.async.http.conduit", true); + + updateAddressPort(port, PORT3); + + try { + port.greetMe("Kitty"); + fail("Failure expected on not being able to negotiate a cipher suite"); + } catch (Exception ex) { + // expected + } + + ((java.io.Closeable)port).close(); + bus.shutdown(true); + } + } http://git-wip-us.apache.org/repos/asf/cxf/blob/a97f886f/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-null-client.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-null-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-null-client.xml new file mode 100644 index 0000000..e5861d9 --- /dev/null +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-null-client.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:http="http://cxf.apache.org/transports/http/configuration"; xmlns:jaxws="http://cxf.apache.org/jaxws"; xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli cy.xsd"> + + <cxf:bus> + <cxf:features> + <cxf:logging/> + </cxf:features> + </cxf:bus> + <http:conduit name="https://localhost:.*";> + <http:tlsClientParameters disableCNCheck="true"> + <sec:trustManagers> + <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/> + </sec:trustManagers> + <sec:cipherSuitesFilter> + <sec:include>.*_WITH_NULL_.*</sec:include> + </sec:cipherSuitesFilter> + </http:tlsClientParameters> + </http:conduit> +</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/a97f886f/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml index 13ea1c5..d65371e 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml @@ -65,10 +65,32 @@ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services"; xmlns:s="http://apache.org/hello_world/services"; - id="DESTLSServer" + id="RC4TLSServer" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.CipherSuitesServer.2}/SoapContext/HttpsPort"; serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="rc4-tls-settings"/> + + <httpj:engine-factory id="null-tls-settings"> + <httpj:engine port="${testutil.ports.CipherSuitesServer.3}"> + <httpj:tlsServerParameters> + <sec:keyManagers keyPassword="password"> + <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/> + </sec:keyManagers> + <sec:clientAuthentication want="false" required="false"/> + <sec:cipherSuitesFilter> + <sec:include>.*_WITH_NULL_.*</sec:include> + </sec:cipherSuitesFilter> + </httpj:tlsServerParameters> + </httpj:engine> + </httpj:engine-factory> + + <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services"; + xmlns:s="http://apache.org/hello_world/services"; + id="NULLTLSServer" + implementor="org.apache.cxf.systest.http.GreeterImpl" + address="https://localhost:${testutil.ports.CipherSuitesServer.3}/SoapContext/HttpsPort"; + serviceName="s:SOAPService" + endpointName="e:HttpsPort" depends-on="null-tls-settings"/> </beans>
