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-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new 8ba3f86 Fixing springWebapp demo
8ba3f86 is described below
commit 8ba3f86c079b1c71b3f04fa1f086833742605782
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Tue Apr 30 12:22:46 2019 +0100
Fixing springWebapp demo
---
.../main/webapp/WEB-INF/applicationContext-security.xml | 17 +++++++++--------
.../test/resources/oidc/spring/applicationContext.xml | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 ++--
.../cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml | 2 +-
.../main/webapp/WEB-INF/applicationContext-security.xml | 4 ++--
.../main/webapp/WEB-INF/applicationContext-security.xml | 10 +++++-----
6 files changed, 20 insertions(+), 19 deletions(-)
diff --git
a/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
b/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index 56c2ccd..3b6e8db 100644
---
a/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++
b/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -25,15 +25,15 @@
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.2.xsd
+ http://www.springframework.org/schema/security/spring-security.xsd
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd";>
+ http://www.springframework.org/schema/context/spring-context.xsd";>
- <!-- DIABLE in production as it might log confidential information about
+ <!-- DISABLE in production as it might log confidential information about
the user -->
<sec:debug />
@@ -48,6 +48,7 @@
<sec:intercept-url pattern="/secure/user/**"
access="hasAnyRole('ROLE_USER','ROLE_ADMIN','ROLE_MANAGER')" />
<sec:custom-filter ref="federationFilter" after="BASIC_AUTH_FILTER" />
<sec:session-management session-authentication-strategy-ref="sas" />
+ <sec:csrf disabled="true"/>
</sec:http>
@@ -64,11 +65,11 @@
<bean id="federationFilter"
class="org.apache.cxf.fediz.spring.web.FederationAuthenticationFilter"
- p:authenticationManager-ref="authManager">
+ p:authenticationManager-ref="authManager"
+ p:federationConfig-ref="fedizConfig">
<property name="authenticationFailureHandler">
- <bean
-
class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler"
/>
+ <bean
class="org.apache.cxf.fediz.spring.web.FederationAuthenticationFailureHandler"
p:federationConfig-ref="fedizConfig" />
</property>
</bean>
diff --git
a/systests/oidc/src/test/resources/oidc/spring/applicationContext.xml
b/systests/oidc/src/test/resources/oidc/spring/applicationContext.xml
index 0dc4aba..2eabd28 100644
--- a/systests/oidc/src/test/resources/oidc/spring/applicationContext.xml
+++ b/systests/oidc/src/test/resources/oidc/spring/applicationContext.xml
@@ -50,7 +50,7 @@
<import resource="data-manager.xml" />
-<!-- DIABLE in production as it might log confidential information about the
user -->
+<!-- DISABLE in production as it might log confidential information about the
user -->
<springsec:debug />
<springsec:http entry-point-ref="federationEntryPoint"
use-expressions="true">
diff --git
a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml
b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml
index ce7d570..279046d 100644
--- a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -28,11 +28,11 @@
http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.xsd
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
+ http://www.springframework.org/schema/util/spring-util.xsd";>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="cxf-service.xml"/>
diff --git a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml
b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml
index 8682111..036ba24 100644
--- a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml
+++ b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml
@@ -36,7 +36,7 @@
http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
+ http://www.springframework.org/schema/beans/spring-beans.xsd";>
<import resource="classpath:META-INF/cxf/cxf.xml" />
diff --git
a/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
b/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index b7b3ec5..b55f3e9 100644
---
a/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++
b/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -25,8 +25,8 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:sec="http://www.springframework.org/schema/security";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
- http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-4.2.xsd";>
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd";>
<bean id="filterChainProxy"
class="org.springframework.security.web.FilterChainProxy">
<sec:filter-chain-map request-matcher="ant">
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 c6ad4a3..d904fd3 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,12 +23,12 @@
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-4.2.xsd
-http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-4.3.xsd
-http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.3.xsd";>
+ xsi:schemaLocation="http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.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";>
- <!-- DIABLE in production as it might log confidential information about
the user -->
+ <!-- DISABLE in production as it might log confidential information about
the user -->
<sec:debug />
<sec:http entry-point-ref="federationEntryPoint" use-expressions="true">
