Removing files
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/837ed4c4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/837ed4c4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/837ed4c4 Branch: refs/heads/2.7.x-fixes Commit: 837ed4c4ac9528f4e16711f3ed4da6705ca43678 Parents: fca5dab Author: Colm O hEigeartaigh <[email protected]> Authored: Sun Apr 12 11:55:13 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Sun Apr 12 11:55:13 2015 +0100 ---------------------------------------------------------------------- .../https/ciphersuites/CipherSuitesTest.java | 469 ------------------- .../ciphersuites/ciphersuites-client-tlsv12.xml | 37 -- 2 files changed, 506 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/837ed4c4/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 deleted file mode 100644 index dd8541d..0000000 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java +++ /dev/null @@ -1,469 +0,0 @@ -/** - * 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. - */ - -package org.apache.cxf.systest.https.ciphersuites; - -import java.net.URL; - -import javax.crypto.Cipher; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; -import javax.xml.ws.BindingProvider; - -import org.apache.cxf.Bus; -import org.apache.cxf.bus.spring.SpringBusFactory; -import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; -import org.apache.hello_world.Greeter; -import org.apache.hello_world.services.SOAPService; -import org.junit.AfterClass; -import org.junit.BeforeClass; - -/** - * A set of tests for TLS ciphersuites - */ -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); - static final String PORT4 = allocatePort(CipherSuitesServer.class, 4); - - private static final boolean UNRESTRICTED_POLICIES_INSTALLED; - static { - boolean ok = false; - try { - byte[] data = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}; - - SecretKey key192 = new SecretKeySpec( - new byte[] {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17}, - "AES"); - Cipher c = Cipher.getInstance("AES"); - c.init(Cipher.ENCRYPT_MODE, key192); - c.doFinal(data); - ok = true; - } catch (Exception e) { - // - } - UNRESTRICTED_POLICIES_INSTALLED = ok; - } - - @BeforeClass - public static void startServers() throws Exception { - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(CipherSuitesServer.class, true) - ); - } - - @AfterClass - public static void cleanup() throws Exception { - stopAllServers(); - } - - // Both client + server include AES - @org.junit.Test - public void testAESIncluded() 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, PORT); - - assertEquals(port.greetMe("Kitty"), "Hello Kitty"); - - ((java.io.Closeable)port).close(); - bus.shutdown(true); - } - - // Both client + server include AES - @org.junit.Test - public void testAESIncludedAsync() 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, PORT); - - assertEquals(port.greetMe("Kitty"), "Hello Kitty"); - - ((java.io.Closeable)port).close(); - bus.shutdown(true); - } - - // Both client + server include a specific AES CipherSuite (not via a filter) - @org.junit.Test - public void testAESIncludedExplicitly() throws Exception { - - if (!UNRESTRICTED_POLICIES_INSTALLED) { - return; - } - SpringBusFactory bf = new SpringBusFactory(); - URL busFile = CipherSuitesTest.class.getResource("ciphersuites-explicit-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, PORT4); - - assertEquals(port.greetMe("Kitty"), "Hello Kitty"); - - ((java.io.Closeable)port).close(); - bus.shutdown(true); - } - - // Client only includes RC4, server only includes AES - @org.junit.Test - public void testClientRC4ServerAESIncluded() throws Exception { - SpringBusFactory bf = new SpringBusFactory(); - URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-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, PORT); - - 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 only includes RC4, server only includes AES - @org.junit.Test - public void testClientRC4ServerAESIncludedAsync() throws Exception { - SpringBusFactory bf = new SpringBusFactory(); - URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-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, PORT); - - 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); - } - - // Both client + server include RC4 - @org.junit.Test - public void testRC4Included() throws Exception { - SpringBusFactory bf = new SpringBusFactory(); - URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-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, PORT2); - - assertEquals(port.greetMe("Kitty"), "Hello Kitty"); - - ((java.io.Closeable)port).close(); - bus.shutdown(true); - } - - // Both client + server include RC4 - @org.junit.Test - public void testRC4IncludedAsync() throws Exception { - SpringBusFactory bf = new SpringBusFactory(); - URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-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, PORT2); - - assertEquals(port.greetMe("Kitty"), "Hello Kitty"); - - ((java.io.Closeable)port).close(); - bus.shutdown(true); - } - - // Client only includes AES, server only includes RC4 - @org.junit.Test - public void testClientAESServerRC4Included() 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, PORT2); - - 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 only includes AES, server only includes RC4 - @org.junit.Test - public void testClientAESServerRC4IncludedAsync() 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, PORT2); - - 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); - } - - // 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); - } - - // Both client + server include AES, client enables a TLS v1.2 CipherSuite - @org.junit.Test - public void testAESIncludedTLSv12() throws Exception { - SpringBusFactory bf = new SpringBusFactory(); - URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client-tlsv12.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, PORT); - - assertEquals(port.greetMe("Kitty"), "Hello Kitty"); - - ((java.io.Closeable)port).close(); - bus.shutdown(true); - } -} http://git-wip-us.apache.org/repos/asf/cxf/blob/837ed4c4/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv12.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv12.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv12.xml deleted file mode 100644 index b0f39ce..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv12.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?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" secureSocketProtocol="TLSv1.2"> - <sec:trustManagers> - <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/> - </sec:trustManagers> - <sec:cipherSuites> - <sec:cipherSuite>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256</sec:cipherSuite> - </sec:cipherSuites> - </http:tlsClientParameters> - </http:conduit> -</beans>
