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 2017/03/27 16:07:59 UTC
cxf-fediz git commit: FEDIZ-196 - Add support for Apache Tomcat 8.5.x
Repository: cxf-fediz
Updated Branches:
refs/heads/master 6376a2c73 -> 2e4dac9be
FEDIZ-196 - Add support for Apache Tomcat 8.5.x
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/2e4dac9b
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/2e4dac9b
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/2e4dac9b
Branch: refs/heads/master
Commit: 2e4dac9be7c077b712fa81a2c37a56caa94cd35c
Parents: 6376a2c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Mar 27 17:07:46 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Mar 27 17:07:46 2017 +0100
----------------------------------------------------------------------
.../fediz/tomcat8/FederationAuthenticator.java | 4 ++++
pom.xml | 2 +-
systests/jetty9/pom.xml | 6 ------
systests/oidc/pom.xml | 6 ------
.../AbstractClientCertTests.java | 4 +---
.../fediz/integrationtests/AbstractTests.java | 8 ++------
systests/tests/src/test/resources/server.jks | Bin 3859 -> 4755 bytes
systests/tomcat8/pom.xml | 6 ------
8 files changed, 8 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2e4dac9b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
----------------------------------------------------------------------
diff --git a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
index af70d88..e3da1db 100644
--- a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
+++ b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
@@ -226,6 +226,10 @@ public class FederationAuthenticator extends FormAuthenticator {
return false;
}
+ public boolean doAuthenticate(Request request, HttpServletResponse response) throws IOException {
+ return authenticate(request, response);
+ }
+
protected void resumeRequest(HttpServletRequest request, HttpServletResponse response) throws IOException {
String contextId = request.getParameter(FederationConstants.PARAM_CONTEXT);
if (contextId == null) {
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2e4dac9b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b6a029c..c289703 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<spring.version>4.3.5.RELEASE</spring.version>
<spring.security.version>3.2.10.RELEASE</spring.security.version>
<tomcat7.version>7.0.75</tomcat7.version>
- <tomcat8.version>8.0.41</tomcat8.version>
+ <tomcat8.version>8.5.12</tomcat8.version>
<wss4j.version>2.1.9-SNAPSHOT</wss4j.version>
<tomcat.url>http://localhost:8080/manager/text</tomcat.url>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2e4dac9b/systests/jetty9/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jetty9/pom.xml b/systests/jetty9/pom.xml
index da271c6..976897e 100644
--- a/systests/jetty9/pom.xml
+++ b/systests/jetty9/pom.xml
@@ -95,12 +95,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat8.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<version>${ecj.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2e4dac9b/systests/oidc/pom.xml
----------------------------------------------------------------------
diff --git a/systests/oidc/pom.xml b/systests/oidc/pom.xml
index 8b8d799..313b141 100644
--- a/systests/oidc/pom.xml
+++ b/systests/oidc/pom.xml
@@ -46,12 +46,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat8.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<version>${ecj.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2e4dac9b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
index 0282356..3f2e03a 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
@@ -170,9 +170,7 @@ public abstract class AbstractClientCertTests {
Assert.fail("Exception expected");
} catch (FailingHttpStatusCodeException ex) {
// expected
- Assert.assertTrue(ex.getMessage().contains("401 Unauthorized")
- || ex.getMessage().contains("401 Authentication Failed")
- || ex.getMessage().contains("403 Forbidden"));
+ Assert.assertTrue(401 == ex.getStatusCode() || 403 == ex.getStatusCode());
}
// webClient2.close();
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2e4dac9b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
index 07c5958..65dead1 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
@@ -577,9 +577,7 @@ public abstract class AbstractTests {
Assert.fail("Failure expected on a modified signature");
} catch (FailingHttpStatusCodeException ex) {
// expected
- Assert.assertTrue(ex.getMessage().contains("401 Unauthorized")
- || ex.getMessage().contains("401 Authentication Failed")
- || ex.getMessage().contains("403 Forbidden"));
+ Assert.assertTrue(401 == ex.getStatusCode() || 403 == ex.getStatusCode());
}
// webClient.close();
@@ -724,9 +722,7 @@ public abstract class AbstractTests {
Assert.fail("Failure expected on an entity expansion attack");
} catch (FailingHttpStatusCodeException ex) {
// expected
- Assert.assertTrue(ex.getMessage().contains("401 Unauthorized")
- || ex.getMessage().contains("401 Authentication Failed")
- || ex.getMessage().contains("403 Forbidden"));
+ Assert.assertTrue(401 == ex.getStatusCode() || 403 == ex.getStatusCode());
}
// webClient.close();
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2e4dac9b/systests/tests/src/test/resources/server.jks
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/resources/server.jks b/systests/tests/src/test/resources/server.jks
index c9c2ce2..613bac1 100644
Binary files a/systests/tests/src/test/resources/server.jks and b/systests/tests/src/test/resources/server.jks differ
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2e4dac9b/systests/tomcat8/pom.xml
----------------------------------------------------------------------
diff --git a/systests/tomcat8/pom.xml b/systests/tomcat8/pom.xml
index ee6fd82..3f6c58e 100644
--- a/systests/tomcat8/pom.xml
+++ b/systests/tomcat8/pom.xml
@@ -41,12 +41,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat8.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<version>${ecj.version}</version>