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 2019/05/02 14:37:49 UTC
[cxf] branch 3.2.x-fixes updated (6f12e39 -> dfb2ab1)
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 6f12e39 Recording .gitmergeinfo Changes
new 9fdbfad Making an STS unit test less likely to fail
new 8ff596b Upgrading Jetty to latest release
new dfb2ab1 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 | 2 ++
parent/pom.xml | 2 +-
.../http_jetty/JettyHTTPServerEngine.java | 4 ++-
.../sts/token/provider/SAMLProviderRealmTest.java | 36 +++++++++++-----------
4 files changed, 24 insertions(+), 20 deletions(-)
[cxf] 01/03: Making an STS unit test less likely to fail
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 9fdbfadea75db9a9d1864fcc7189df5a725211c7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu May 2 10:54:22 2019 +0100
Making an STS unit test less likely to fail
(cherry picked from commit 7a4335c3c205632ec2b6a08372b878a4356ab9ad)
---
.../sts/token/provider/SAMLProviderRealmTest.java | 36 +++++++++++-----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
index e604a0b..c6935dd 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
@@ -74,9 +74,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
Element token = (Element)providerResponse.getToken();
String tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertTrue(tokenString.contains("A-Issuer"));
- assertFalse(tokenString.contains("B-Issuer"));
- assertFalse(tokenString.contains("STS"));
+ assertTrue(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"STS\""));
// Realm "B"
providerParameters.setRealm("B");
@@ -88,9 +88,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
token = (Element)providerResponse.getToken();
tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertFalse(tokenString.contains("A-Issuer"));
- assertTrue(tokenString.contains("B-Issuer"));
- assertFalse(tokenString.contains("STS"));
+ assertFalse(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertTrue(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"STS\""));
// Default Realm
providerParameters.setRealm(null);
@@ -102,9 +102,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
token = (Element)providerResponse.getToken();
tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertFalse(tokenString.contains("A-Issuer"));
- assertFalse(tokenString.contains("B-Issuer"));
- assertTrue(tokenString.contains("STS"));
+ assertFalse(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertTrue(tokenString.contains("Issuer=\"STS\""));
}
@SuppressWarnings("deprecation")
@@ -135,9 +135,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
Element token = (Element)providerResponse.getToken();
String tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertTrue(tokenString.contains("A-Issuer"));
- assertFalse(tokenString.contains("B-Issuer"));
- assertFalse(tokenString.contains("STS"));
+ assertTrue(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"STS\""));
// Realm "B"
providerParameters.setRealm("B");
@@ -149,9 +149,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
token = (Element)providerResponse.getToken();
tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertFalse(tokenString.contains("A-Issuer"));
- assertTrue(tokenString.contains("B-Issuer"));
- assertFalse(tokenString.contains("STS"));
+ assertFalse(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertTrue(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"STS\""));
// Default Realm
providerParameters.setRealm(null);
@@ -163,9 +163,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
token = (Element)providerResponse.getToken();
tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertFalse(tokenString.contains("A-Issuer"));
- assertFalse(tokenString.contains("B-Issuer"));
- assertTrue(tokenString.contains("STS"));
+ assertFalse(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertTrue(tokenString.contains("Issuer=\"STS\""));
}
private TokenProviderParameters createProviderParameters(
[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 dfb2ab1a7cba61216aa9dab76c5bf245135043da
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu May 2 15:37:35 2019 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f526644..b0cbf41 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -227,6 +227,7 @@ B 6e7c568c7be2a6bf20eb6af8410b42a5ed10e0e3
B 6e8816f1c443b4c331c3680be26db63b64c17250
B 70017f9262dd555e1daaf71a721e92020b3df98c
B 70346bfc37cfd4de98bafa99681fa7276379162e
+B 70ccfaca22ec7631b781cdf320b50623a9899fc5
B 7225b3a8c2a52218d2c2efdd0daa1556ffbf321b
B 731d72b5fc39bd1da6245102ae9e1105325c3612
B 7414aecb49326126b17f69b96f5a6a490f6da05c
@@ -559,6 +560,7 @@ M a3ef872d21cc20059622fab6fec4f6b9d1ac6ceb
M a8132de2a0204a1247f3e63e9140aa7a34bdf628
M ac561c4a2b27bd8b427ff1f91d19c7929a8222ab
M ad5c6ad246f9155fec7096de7701de02d757c0f2
+M af6a95f5b7efc141cc55792e10d05d471905cf32
M c13381d891b56fe5a2b56f6f9f6f6b2cc8a10d5d
M cb2a360153c6670925f91fdfa9980594715d62e2
M d1470dd0e14aa001dde1227bfb456a8b4cf0061e
[cxf] 02/03: Upgrading Jetty to latest release
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 8ff596be2ef9d43f5a3ebcaccbbf8270bf0ecfd6
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu May 2 15:22:02 2019 +0100
Upgrading Jetty to latest release
(cherry picked from commit af6a95f5b7efc141cc55792e10d05d471905cf32)
---
parent/pom.xml | 2 +-
.../org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 540dec6..2688b12 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.14.v20181114</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.18.v20190429</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.27.Final</cxf.undertow.version>
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 d15f928..631ecfd 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
@@ -780,6 +780,8 @@ public class JettyHTTPServerEngine implements ServerEngine {
setClientAuthentication(con,
tlsServerParameters.getClientAuthentication());
con.setCertAlias(tlsServerParameters.getCertAlias());
+ // TODO Once we switch to use SslContextFactory.Server instead, we can get rid of this line
+ con.setEndpointIdentificationAlgorithm(null);
}
@@ -1036,7 +1038,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
}
}
} finally {
- if (contexts != null) {
+ if (contexts != null && contexts.getHandlers() != null) {
for (Handler h : contexts.getHandlers()) {
h.stop();
}