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 2016/01/19 13:47:12 UTC
[1/2] cxf-fediz git commit: Updating Spring LogoutFilter to work with
Spring 3.2
Repository: cxf-fediz
Updated Branches:
refs/heads/master 445e34089 -> c820b5a5e
Updating Spring LogoutFilter to work with Spring 3.2
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1f3ca8a9
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1f3ca8a9
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1f3ca8a9
Branch: refs/heads/master
Commit: 1f3ca8a96f6c6fb03fa3529ddaae98f86170de41
Parents: 445e340
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jan 19 12:06:43 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jan 19 12:06:43 2016 +0000
----------------------------------------------------------------------
.../apache/cxf/fediz/spring/web/FederationLogoutFilter.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1f3ca8a9/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationLogoutFilter.java
----------------------------------------------------------------------
diff --git a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationLogoutFilter.java b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationLogoutFilter.java
index 2e02460..f8f3f3a 100644
--- a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationLogoutFilter.java
+++ b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationLogoutFilter.java
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Required;
import org.springframework.security.web.authentication.logout.LogoutFilter;
import org.springframework.security.web.authentication.logout.LogoutHandler;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
public class FederationLogoutFilter extends LogoutFilter {
@@ -51,17 +52,12 @@ public class FederationLogoutFilter extends LogoutFilter {
this.logoutUrl = federationConfig.getFedizContext(contextName).getLogoutURL();
}
if (this.logoutUrl != null && !this.logoutUrl.isEmpty()) {
- super.setFilterProcessesUrl(this.logoutUrl);
+ super.setLogoutRequestMatcher(new AntPathRequestMatcher(logoutUrl));
return super.requiresLogout(request, response);
}
return false;
}
- public void setFilterProcessesUrl(String filterProcessesUrl) {
- throw new UnsupportedOperationException(
- "setFilterProcessesUrl() unsupported. Use fediz config to configure logout url");
- }
-
protected String getFilterProcessesUrl() {
return this.logoutUrl;
}
[2/2] cxf-fediz git commit: Updating Spring security plugin to Spring
3.2
Posted by co...@apache.org.
Updating Spring security plugin to Spring 3.2
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/c820b5a5
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/c820b5a5
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/c820b5a5
Branch: refs/heads/master
Commit: c820b5a5ef5a4cbd312b752bbfe2c6446f672fd9
Parents: 1f3ca8a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jan 19 12:06:58 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jan 19 12:06:58 2016 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
services/idp/pom.xml | 1 +
.../src/main/webapp/WEB-INF/applicationContext-security.xml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c820b5a5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bbba1aa..c4f5423 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.13</slf4j.version>
<spring.version>4.1.7.RELEASE</spring.version>
- <spring.security.version>3.1.7.RELEASE</spring.security.version>
+ <spring.security.version>3.2.9.RELEASE</spring.security.version>
<tomcat7.version>7.0.65</tomcat7.version>
<tomcat8.version>8.0.30</tomcat8.version>
<wss4j.version>2.1.4</wss4j.version>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c820b5a5/services/idp/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index c1fa70f..9b68184 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -31,6 +31,7 @@
<properties>
<swagger-ui.version>2.1.0</swagger-ui.version>
+ <spring.security.version>3.1.7.RELEASE</spring.security.version>
</properties>
<dependencyManagement>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c820b5a5/systests/webapps/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
----------------------------------------------------------------------
diff --git a/systests/webapps/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/systests/webapps/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index 76061a5..2f5a518 100644
--- a/systests/webapps/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/systests/webapps/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -23,7 +23,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">