Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B567910115 for ; Fri, 19 Dec 2014 15:55:54 +0000 (UTC) Received: (qmail 14632 invoked by uid 500); 19 Dec 2014 15:55:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 14399 invoked by uid 500); 19 Dec 2014 15:55:54 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 14298 invoked by uid 99); 19 Dec 2014 15:55:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Dec 2014 15:55:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 21983A2F610; Fri, 19 Dec 2014 15:55:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Fri, 19 Dec 2014 15:55:55 -0000 Message-Id: <1f37e0b8025d493b91dc3aa5df99150b@git.apache.org> In-Reply-To: <7bbbeb8b0b894c7385ab3655a684d066@git.apache.org> References: <7bbbeb8b0b894c7385ab3655a684d066@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cxf git commit: Adding some CipherSuiteFilter system tests Adding some CipherSuiteFilter system tests Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1f53a422 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1f53a422 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1f53a422 Branch: refs/heads/3.0.x-fixes Commit: 1f53a422fff66fa4c96ab0b2ea9a942d6462763a Parents: d7a869d Author: Colm O hEigeartaigh Authored: Fri Dec 19 15:50:05 2014 +0000 Committer: Colm O hEigeartaigh Committed: Fri Dec 19 15:51:11 2014 +0000 ---------------------------------------------------------------------- .../https/ciphersuites/CipherSuitesServer.java | 47 ++++ .../https/ciphersuites/CipherSuitesTest.java | 280 +++++++++++++++++++ .../https/ciphersuites/ciphersuites-client.xml | 37 +++ .../ciphersuites/ciphersuites-rc4-client.xml | 38 +++ .../https/ciphersuites/ciphersuites-server.xml | 74 +++++ 5 files changed, 476 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1f53a422/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesServer.java ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesServer.java new file mode 100644 index 0000000..8ba2606 --- /dev/null +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesServer.java @@ -0,0 +1,47 @@ +/** + * 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 org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.testutil.common.AbstractBusTestServerBase; + +public class CipherSuitesServer extends AbstractBusTestServerBase { + + public CipherSuitesServer() { + + } + + protected void run() { + URL busFile = CipherSuitesServer.class.getResource("ciphersuites-server.xml"); + Bus busLocal = new SpringBusFactory().createBus(busFile); + BusFactory.setDefaultBus(busLocal); + setBus(busLocal); + + try { + new CipherSuitesServer(); + } catch (Exception e) { + e.printStackTrace(); + } + } +} http://git-wip-us.apache.org/repos/asf/cxf/blob/1f53a422/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 new file mode 100644 index 0000000..4f2f8c5 --- /dev/null +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java @@ -0,0 +1,280 @@ +/** + * 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.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); + + @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); + } + + // 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); + } + +} http://git-wip-us.apache.org/repos/asf/cxf/blob/1f53a422/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client.xml new file mode 100644 index 0000000..f509336 --- /dev/null +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + .*_WITH_AES_.* + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/1f53a422/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-rc4-client.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-rc4-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-rc4-client.xml new file mode 100644 index 0000000..4c8323d --- /dev/null +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-rc4-client.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + .*_WITH_RC4_.* + .*_WITH_AES_.* + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/1f53a422/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 new file mode 100644 index 0000000..13ea1c5 --- /dev/null +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + .*_WITH_AES_.* + + + + + + + + + + + + + + + + + .*_WITH_RC4_.* + .*_WITH_AES_.* + + + + + + + +