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:15 UTC
[cxf] branch master updated (70ccfac -> af6a95f)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 70ccfac Fixing build for JDK11
new 7a4335c Making an STS unit test less likely to fail
new af6a95f Upgrading Jetty to latest release
The 2 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:
parent/pom.xml | 2 +-
.../http_jetty/JettyHTTPServerEngine.java | 4 ++-
.../sts/token/provider/SAMLProviderRealmTest.java | 36 +++++++++++-----------
3 files changed, 22 insertions(+), 20 deletions(-)
[cxf] 01/02: 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 master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7a4335c3c205632ec2b6a08372b878a4356ab9ad
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
---
.../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 74d5010..b063ace 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
@@ -78,9 +78,9 @@ public class SAMLProviderRealmTest {
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");
@@ -92,9 +92,9 @@ public class SAMLProviderRealmTest {
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);
@@ -106,9 +106,9 @@ public class SAMLProviderRealmTest {
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")
@@ -139,9 +139,9 @@ public class SAMLProviderRealmTest {
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");
@@ -153,9 +153,9 @@ public class SAMLProviderRealmTest {
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);
@@ -167,9 +167,9 @@ public class SAMLProviderRealmTest {
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] 02/02: 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 master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit af6a95f5b7efc141cc55792e10d05d471905cf32
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu May 2 15:22:02 2019 +0100
Upgrading Jetty to latest release
---
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 7601f6e..84d602e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -129,7 +129,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>2.0.19.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 08dfe20..565a8be 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();
}