You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/03 16:16:08 UTC
[cxf] branch 3.2.x-fixes updated (666c966 -> fbbcd0a)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 666c966 CXF-7854: Refactor RxJava2 Flowable and Observable Rx Invokers to not… (#451)
new a1fece6 Replace RC4 CipherSuite tests as it's not supported from Java >= 8 upwards
new daea448 Upgrading Jetty + fixing systest failures
new fbbcd0a Recording .gitmergeinfo Changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 6 ++
parent/pom.xml | 2 +-
.../https/ciphersuites/CipherSuitesTest.java | 97 ++++------------------
.../https/ciphersuites/ciphersuites-client.xml | 2 +-
...null-client.xml => ciphersuites-dhe-client.xml} | 2 +-
.../ciphersuites/ciphersuites-explicit-client.xml | 2 +-
.../https/ciphersuites/ciphersuites-rc4-client.xml | 38 ---------
.../https/ciphersuites/ciphersuites-server.xml | 11 +--
8 files changed, 32 insertions(+), 128 deletions(-)
rename systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/{ciphersuites-null-client.xml => ciphersuites-dhe-client.xml} (97%)
delete mode 100644 systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-rc4-client.xml
[cxf] 01/03: Replace RC4 CipherSuite tests as it's not supported
from Java >= 8 upwards
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a1fece64750c025c2dbc37663f1f34297ca83388
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 3 12:12:47 2018 +0100
Replace RC4 CipherSuite tests as it's not supported from Java >= 8 upwards
(cherry picked from commit 05b8db050b158d82aad57081a0dbb5e7c92cc3b1)
# Conflicts:
# systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
# systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml
---
.../https/ciphersuites/CipherSuitesTest.java | 46 ++++++++--------------
.../https/ciphersuites/ciphersuites-client.xml | 2 +-
...-rc4-client.xml => ciphersuites-dhe-client.xml} | 3 +-
.../https/ciphersuites/ciphersuites-server.xml | 9 +++--
4 files changed, 23 insertions(+), 37 deletions(-)
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 d55f5f6..a6ea425 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
@@ -176,11 +176,11 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
- // Client only includes RC4, server only includes AES
+ // Client only includes DHE, server excludes it
@org.junit.Test
- public void testClientRC4ServerAESIncluded() throws Exception {
+ public void testClientDHEServerExcludesIncluded() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
- URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-client.xml");
+ URL busFile = CipherSuitesTest.class.getResource("ciphersuites-dhe-client.xml");
Bus bus = bf.createBus(busFile.toString());
BusFactory.setDefaultBus(bus);
@@ -205,11 +205,11 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
- // Client only includes RC4, server only includes AES
+ // Client only includes DHE, server excludes it
@org.junit.Test
- public void testClientRC4ServerAESIncludedAsync() throws Exception {
+ public void testClientDHEServerExcludesIncludedAsync() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
- URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-client.xml");
+ URL busFile = CipherSuitesTest.class.getResource("ciphersuites-dhe-client.xml");
Bus bus = bf.createBus(busFile.toString());
BusFactory.setDefaultBus(bus);
@@ -237,18 +237,11 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
- // Both client + server include RC4
+ // Both client + server include DHE
@org.junit.Test
- public void testRC4Included() throws Exception {
- String version = System.getProperty("java.version");
- if (JavaUtils.isJava9Compatible()
- || version.length() > 1 && 1.8D <= Double.parseDouble(version.substring(0, 3))
- ) {
- // RC4 not supported since JDK8
- return;
- }
+ public void testDHEIncluded() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
- URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-client.xml");
+ URL busFile = CipherSuitesTest.class.getResource("ciphersuites-dhe-client.xml");
Bus bus = bf.createBus(busFile.toString());
BusFactory.setDefaultBus(bus);
@@ -268,18 +261,11 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
- // Both client + server include RC4
+ // Both client + server include DHE
@org.junit.Test
- public void testRC4IncludedAsync() throws Exception {
- String version = System.getProperty("java.version");
- if (JavaUtils.isJava9Compatible()
- || version.length() > 1 && 1.8D <= Double.parseDouble(version.substring(0, 3))
- ) {
- // RC4 not supported since JDK8
- return;
- }
+ public void testDHEIncludedAsync() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
- URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-client.xml");
+ URL busFile = CipherSuitesTest.class.getResource("ciphersuites-dhe-client.xml");
Bus bus = bf.createBus(busFile.toString());
BusFactory.setDefaultBus(bus);
@@ -302,9 +288,9 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
- // Client only includes AES, server only includes RC4
+ // Client only includes ECDHE, server only includes DHE
@org.junit.Test
- public void testClientAESServerRC4Included() throws Exception {
+ public void testClientECDHEServerDHEIncluded() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client.xml");
@@ -331,9 +317,9 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
- // Client only includes AES, server only includes RC4
+ // Client only includes ECDHE, server only includes DHE
@org.junit.Test
- public void testClientAESServerRC4IncludedAsync() throws Exception {
+ public void testClientECDHEServerDHEIncludedAsync() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
URL busFile = CipherSuitesTest.class.getResource("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
index f509336..1e28bd6 100644
--- 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
@@ -30,7 +30,7 @@
<sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
</sec:trustManagers>
<sec:cipherSuitesFilter>
- <sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:include>TLS_ECDHE_.*</sec:include>
</sec:cipherSuitesFilter>
</http:tlsClientParameters>
</http:conduit>
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-dhe-client.xml
similarity index 95%
rename from systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-rc4-client.xml
rename to systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-dhe-client.xml
index 4c8323d..a5c84b5 100644
--- 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-dhe-client.xml
@@ -30,8 +30,7 @@
<sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
</sec:trustManagers>
<sec:cipherSuitesFilter>
- <sec:include>.*_WITH_RC4_.*</sec:include>
- <sec:exclude>.*_WITH_AES_.*</sec:exclude>
+ <sec:include>.*_DHE_.*</sec:include>
</sec:cipherSuitesFilter>
</http:tlsClientParameters>
</http:conduit>
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 49b1027..a1745ce 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
@@ -35,6 +35,7 @@
<sec:cipherSuitesFilter>
<sec:include>.*_WITH_AES_.*</sec:include>
<sec:exclude>SSL_RSA_WITH_DES_CBC_SHA</sec:exclude>
+ <sec:exclude>.*_DHE_.*</sec:exclude>
</sec:cipherSuitesFilter>
</httpj:tlsServerParameters>
</httpj:engine>
@@ -54,7 +55,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <httpj:engine-factory id="rc4-tls-settings">
+ <httpj:engine-factory id="dhe-tls-settings">
<httpj:engine port="${testutil.ports.CipherSuitesServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
@@ -62,8 +63,8 @@
</sec:keyManagers>
<sec:clientAuthentication want="false" required="false"/>
<sec:cipherSuitesFilter>
- <sec:include>.*_WITH_RC4_.*</sec:include>
- <sec:exclude>.*_WITH_AES_.*</sec:exclude>
+ <sec:include>.*_DHE_.*</sec:include>
+ <sec:exclude>TLS_ECDHE_.*</sec:exclude>
</sec:cipherSuitesFilter>
</httpj:tlsServerParameters>
</httpj:engine>
@@ -75,7 +76,7 @@
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"/>
+ endpointName="e:HttpsPort" depends-on="dhe-tls-settings"/>
<httpj:engine-factory id="null-tls-settings">
<httpj:engine port="${testutil.ports.CipherSuitesServer.3}">
[cxf] 02/03: Upgrading Jetty + fixing systest failures
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit daea4482ed3c06c88307d989891e61f3d465233d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 3 15:10:58 2018 +0100
Upgrading Jetty + fixing systest failures
(cherry picked from commit a444dcd6d4380cdcced010f0978c9509ee933080)
---
parent/pom.xml | 2 +-
.../https/ciphersuites/CipherSuitesTest.java | 51 ----------------------
.../ciphersuites/ciphersuites-explicit-client.xml | 2 +-
.../ciphersuites/ciphersuites-null-client.xml | 37 ----------------
.../https/ciphersuites/ciphersuites-server.xml | 2 +-
5 files changed, 3 insertions(+), 91 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d9aa752..b48309c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -125,7 +125,7 @@
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.4.0</cxf.jettison.version>
- <cxf.jetty9.version>9.4.11.v20180605</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.12.v20180830</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.undertow.version>1.4.21.Final</cxf.undertow.version>
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 a6ea425..4b63dc1 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
@@ -349,57 +349,6 @@ 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());
- BusFactory.setDefaultBus(bus);
- BusFactory.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());
- BusFactory.setDefaultBus(bus);
- BusFactory.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 {
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml
index 03e544a..76daa35 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml
@@ -30,7 +30,7 @@
<sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
</sec:trustManagers>
<sec:cipherSuites>
- <sec:cipherSuite>TLS_RSA_WITH_AES_256_CBC_SHA256</sec:cipherSuite>
+ <sec:cipherSuite>TLS_DHE_RSA_WITH_AES_128_GCM_SHA256</sec:cipherSuite>
</sec:cipherSuites>
</http:tlsClientParameters>
</http:conduit>
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
deleted file mode 100644
index e5861d9..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-null-client.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-b [...]
-
- <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>
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 a1745ce..1709595 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
@@ -108,7 +108,7 @@
</sec:keyManagers>
<sec:clientAuthentication want="false" required="false"/>
<sec:cipherSuites>
- <sec:cipherSuite>TLS_RSA_WITH_AES_256_CBC_SHA256</sec:cipherSuite>
+ <sec:cipherSuite>TLS_DHE_RSA_WITH_AES_128_GCM_SHA256</sec:cipherSuite>
</sec:cipherSuites>
</httpj:tlsServerParameters>
</httpj:engine>
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit fbbcd0afc7273c854fc699ff3809f5a98b938ecb
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 3 17:15:56 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3ff0d12..f700480 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,14 +2,18 @@ origin/master
B 01559f20020110407ceb142e4ec53eaddcaeb9d4
B 057f4dc521f02227d7b36bbb508835a9edb69e15
B 25e88017b49bde5a53bce8dab3ecc93aab6dd040
+B 26568235d6db6ef44a74dac1ea1746319913c354
+B 37e9a9b3ed51cb9042fd288ab5f9b847e96bff1d
B 384a11f419c06c52ec07d9f7114bb2134c18ba3c
B 4104641a4b731c72d66b1dace3d9ed4290226694
B 468cf8f3cfe9ef8285cd2ae66caddf666b7aaf13
B 4b7ede2d6cda7651b686653e0645c40b6684b81f
+B 4da42032f95e667a402b113d6daf4bd0514c6d60
B 58e72337226f4e963abfc6f1a65625d86b7003b5
B 9db243c1aa44732996514200b490eb63683540b4
B a3295e61bcf8c00c13a79707841a58131fd9c97d
B acc697f1c88f392bd952e07d50a9ae2ce0b76411
+B ae994168f50894010f1f148ec3b6f35b17e4b63b
B b8236c923ba409087e8db6132963924151918efc
B b8fc2da105029c10cf24ed344198fbefdd190648
B bb098089d18825ddc850fa82f4acee45e2b6ee7a
@@ -19,7 +23,9 @@ B d873c8b623ed10464c1f1bae44a31fc725307676
B da5b01b32a59867b48e2b35a9281b3625f58d514
B e000e8c0b8ed82533cbeb4e3a39dd9fbf128383c
B e9261069513b1947e16bf485182c328c07160e1c
+B f652464526edb0cb7eac277ff64c9f2d02e2b920
B fc656dc1311963f5fc833856984b36b7ccd26042
+M 05b8db050b158d82aad57081a0dbb5e7c92cc3b1
M 0b920d7275800e651b2c48c982b1977249516ddf
M 1449f125586deaf6f5d87e282f0e1502eef4b6b4
M 3904a477e70fe6385777120bfe4820ff9a7713f3