You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by jb...@apache.org on 2015/01/29 10:38:56 UTC
[1/3] cxf-fediz git commit: Fixing log4j.properties for IDP (double
entries)
Repository: cxf-fediz
Updated Branches:
refs/heads/master bf7fca89f -> d16365db1
Fixing log4j.properties for IDP (double entries)
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/ea8c7c2b
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ea8c7c2b
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ea8c7c2b
Branch: refs/heads/master
Commit: ea8c7c2b81591951663a713cb9875679169c684e
Parents: 9ec7440
Author: Jan Bernhardt <jb...@talend.com>
Authored: Fri Jan 16 12:59:37 2015 +0100
Committer: Jan Bernhardt <jb...@talend.com>
Committed: Thu Jan 29 10:10:00 2015 +0100
----------------------------------------------------------------------
services/idp/src/main/resources/log4j.properties | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ea8c7c2b/services/idp/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/log4j.properties b/services/idp/src/main/resources/log4j.properties
index c576710..6b5731b 100644
--- a/services/idp/src/main/resources/log4j.properties
+++ b/services/idp/src/main/resources/log4j.properties
@@ -1,8 +1,10 @@
# Set root category priority to INFO and its only appender to CONSOLE.
#log4j.rootCategory=FATAL, CONSOLE
log4j.rootCategory=INFO, CONSOLE, LOGFILE
-log4j.logger.org.springframework.webflow=DEBUG,LOGFILE
-log4j.logger.org.springframework.security=DEBUG,LOGFILE
+log4j.logger.org.springframework.webflow=DEBUG, LOGFILE
+log4j.additivity.org.springframework.webflow = false
+log4j.logger.org.springframework.security=DEBUG, LOGFILE
+log4j.additivity.org.springframework.security = false
# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
[2/3] cxf-fediz git commit: [FEDIZ-93] Setting the correct requested
ClaimTypes in fediz_config.xml
Posted by jb...@apache.org.
[FEDIZ-93] Setting the correct requested ClaimTypes in fediz_config.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/9ec74406
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/9ec74406
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/9ec74406
Branch: refs/heads/master
Commit: 9ec744067d0b68e02497bd46a9e638b5bb94cb55
Parents: bf7fca8
Author: Jan Bernhardt <jb...@talend.com>
Authored: Tue Jan 13 17:31:45 2015 +0100
Committer: Jan Bernhardt <jb...@talend.com>
Committed: Thu Jan 29 10:10:00 2015 +0100
----------------------------------------------------------------------
examples/simpleWebapp/src/main/config/fediz_config.xml | 5 ++++-
.../src/main/webapp/WEB-INF/fediz_config.xml | 6 ++++--
.../src/main/config/fediz_config.xml | 5 ++++-
.../src/main/webapp/WEB-INF/fediz_config.xml | 6 ++++--
.../webapp/src/main/config/fediz_config.xml | 5 ++++-
systests/cxf/src/test/resources/fediz_config.xml | 6 ++++--
systests/cxfWebapp/src/main/resources/fediz_config.xml | 6 ++++--
systests/jetty8/src/test/resources/fediz_config.xml | 12 ++++++++----
systests/spring/src/test/resources/fediz_config.xml | 10 ++++++++--
systests/tomcat7/src/test/resources/fediz_config.xml | 6 ++++--
10 files changed, 48 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9ec74406/examples/simpleWebapp/src/main/config/fediz_config.xml
----------------------------------------------------------------------
diff --git a/examples/simpleWebapp/src/main/config/fediz_config.xml b/examples/simpleWebapp/src/main/config/fediz_config.xml
index 432aa2c..b52f302 100644
--- a/examples/simpleWebapp/src/main/config/fediz_config.xml
+++ b/examples/simpleWebapp/src/main/config/fediz_config.xml
@@ -25,7 +25,10 @@
<roleDelimiter>,</roleDelimiter>
<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
<claimTypesRequested>
- <claimType type="a particular claim type" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
</contextConfig>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9ec74406/examples/spring2Webapp/src/main/webapp/WEB-INF/fediz_config.xml
----------------------------------------------------------------------
diff --git a/examples/spring2Webapp/src/main/webapp/WEB-INF/fediz_config.xml b/examples/spring2Webapp/src/main/webapp/WEB-INF/fediz_config.xml
index c68bc57..7d9f994 100644
--- a/examples/spring2Webapp/src/main/webapp/WEB-INF/fediz_config.xml
+++ b/examples/spring2Webapp/src/main/webapp/WEB-INF/fediz_config.xml
@@ -26,8 +26,10 @@
<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
<reply>/j_spring_fediz_security_check</reply>
<claimTypesRequested>
- <claimType type="a particular claim type"
- optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
</contextConfig>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9ec74406/examples/springPreauthWebapp/src/main/config/fediz_config.xml
----------------------------------------------------------------------
diff --git a/examples/springPreauthWebapp/src/main/config/fediz_config.xml b/examples/springPreauthWebapp/src/main/config/fediz_config.xml
index 432aa2c..b52f302 100644
--- a/examples/springPreauthWebapp/src/main/config/fediz_config.xml
+++ b/examples/springPreauthWebapp/src/main/config/fediz_config.xml
@@ -25,7 +25,10 @@
<roleDelimiter>,</roleDelimiter>
<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
<claimTypesRequested>
- <claimType type="a particular claim type" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
</contextConfig>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9ec74406/examples/springWebapp/src/main/webapp/WEB-INF/fediz_config.xml
----------------------------------------------------------------------
diff --git a/examples/springWebapp/src/main/webapp/WEB-INF/fediz_config.xml b/examples/springWebapp/src/main/webapp/WEB-INF/fediz_config.xml
index 4ba3935..b210635 100644
--- a/examples/springWebapp/src/main/webapp/WEB-INF/fediz_config.xml
+++ b/examples/springWebapp/src/main/webapp/WEB-INF/fediz_config.xml
@@ -27,8 +27,10 @@
<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
<reply>/j_spring_fediz_security_check</reply>
<claimTypesRequested>
- <claimType type="a particular claim type"
- optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
</contextConfig>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9ec74406/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
----------------------------------------------------------------------
diff --git a/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml b/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
index 432aa2c..b52f302 100644
--- a/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
+++ b/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
@@ -25,7 +25,10 @@
<roleDelimiter>,</roleDelimiter>
<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
<claimTypesRequested>
- <claimType type="a particular claim type" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
</contextConfig>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9ec74406/systests/cxf/src/test/resources/fediz_config.xml
----------------------------------------------------------------------
diff --git a/systests/cxf/src/test/resources/fediz_config.xml b/systests/cxf/src/test/resources/fediz_config.xml
index 9f0209b..1f20ab6 100644
--- a/systests/cxf/src/test/resources/fediz_config.xml
+++ b/systests/cxf/src/test/resources/fediz_config.xml
@@ -30,8 +30,10 @@
<freshness>10</freshness>
<homeRealm type="String">urn:org:apache:cxf:fediz:idp:realm-A</homeRealm>
<claimTypesRequested>
- <claimType type="a particular claim type"
- optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
<logoutURL>/secure/logout</logoutURL>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9ec74406/systests/cxfWebapp/src/main/resources/fediz_config.xml
----------------------------------------------------------------------
diff --git a/systests/cxfWebapp/src/main/resources/fediz_config.xml b/systests/cxfWebapp/src/main/resources/fediz_config.xml
index 32fc21d..8d0f0a5 100644
--- a/systests/cxfWebapp/src/main/resources/fediz_config.xml
+++ b/systests/cxfWebapp/src/main/resources/fediz_config.xml
@@ -27,8 +27,10 @@
<freshness>10</freshness>
<homeRealm type="String">urn:org:apache:cxf:fediz:idp:realm-A</homeRealm>
<claimTypesRequested>
- <claimType type="a particular claim type"
- optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
<logoutURL>/secure/logout</logoutURL>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9ec74406/systests/jetty8/src/test/resources/fediz_config.xml
----------------------------------------------------------------------
diff --git a/systests/jetty8/src/test/resources/fediz_config.xml b/systests/jetty8/src/test/resources/fediz_config.xml
index 49460dd..28e0d95 100644
--- a/systests/jetty8/src/test/resources/fediz_config.xml
+++ b/systests/jetty8/src/test/resources/fediz_config.xml
@@ -30,8 +30,10 @@
<freshness>10</freshness>
<homeRealm type="String">urn:org:apache:cxf:fediz:idp:realm-A</homeRealm>
<claimTypesRequested>
- <claimType type="a particular claim type"
- optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
<logoutURL>/secure/logout</logoutURL>
@@ -59,8 +61,10 @@
<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
<homeRealm type="String">urn:org:apache:cxf:fediz:idp:realm-A</homeRealm>
<claimTypesRequested>
- <claimType type="a particular claim type"
- optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
<logoutURL>/secure/logout</logoutURL>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9ec74406/systests/spring/src/test/resources/fediz_config.xml
----------------------------------------------------------------------
diff --git a/systests/spring/src/test/resources/fediz_config.xml b/systests/spring/src/test/resources/fediz_config.xml
index 53b0392..0f83b8d 100644
--- a/systests/spring/src/test/resources/fediz_config.xml
+++ b/systests/spring/src/test/resources/fediz_config.xml
@@ -34,7 +34,10 @@
<!--<request>REQUEST</request>-->
<homeRealm type="String">urn:org:apache:cxf:fediz:idp:realm-A</homeRealm>
<claimTypesRequested>
- <claimType type="a particular claim type" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
<logoutURL>/secure/logout</logoutURL>
@@ -67,7 +70,10 @@
<!--<request>REQUEST</request>-->
<homeRealm type="String">urn:org:apache:cxf:fediz:idp:realm-A</homeRealm>
<claimTypesRequested>
- <claimType type="a particular claim type" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
<logoutURL>/secure/logout</logoutURL>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9ec74406/systests/tomcat7/src/test/resources/fediz_config.xml
----------------------------------------------------------------------
diff --git a/systests/tomcat7/src/test/resources/fediz_config.xml b/systests/tomcat7/src/test/resources/fediz_config.xml
index 9f0209b..1f20ab6 100644
--- a/systests/tomcat7/src/test/resources/fediz_config.xml
+++ b/systests/tomcat7/src/test/resources/fediz_config.xml
@@ -30,8 +30,10 @@
<freshness>10</freshness>
<homeRealm type="String">urn:org:apache:cxf:fediz:idp:realm-A</homeRealm>
<claimTypesRequested>
- <claimType type="a particular claim type"
- optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true" />
+ <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
<logoutURL>/secure/logout</logoutURL>
[3/3] cxf-fediz git commit: [Fediz-95] Moving Spring Security
Configuration to central location
Posted by jb...@apache.org.
[Fediz-95] Moving Spring Security Configuration to central location
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d16365db
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d16365db
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d16365db
Branch: refs/heads/master
Commit: d16365db1bc03bc7a2d55185949315e4cf2a58d0
Parents: ea8c7c2
Author: Jan Bernhardt <jb...@talend.com>
Authored: Wed Jan 21 12:33:40 2015 +0100
Committer: Jan Bernhardt <jb...@talend.com>
Committed: Thu Jan 29 10:10:01 2015 +0100
----------------------------------------------------------------------
.gitignore | 1 +
.../test/resources/fediz_test_config_saml.xml | 2 +-
.../cxf/fediz/service/idp/util/WebUtils.java | 1 +
services/idp/src/main/resources/restContext.xml | 61 +------
.../src/main/resources/restContextKerberos.xml | 169 -------------------
.../main/webapp/WEB-INF/applicationContext.xml | 26 +--
.../main/webapp/WEB-INF/idp-config-realma.xml | 5 +-
.../main/webapp/WEB-INF/idp-config-realmb.xml | 4 +-
.../idp/src/main/webapp/WEB-INF/idp-servlet.xml | 17 +-
.../webapp/WEB-INF/security-config-kerberos.xml | 54 +++++-
.../src/main/webapp/WEB-INF/security-config.xml | 44 ++++-
services/idp/src/test/resources/idp-config.xml | 29 +---
12 files changed, 124 insertions(+), 289 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f5f8e88..1e8a4b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ target/
velocity.log
.externalToolBuilders/
+.idea
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/plugins/core/src/test/resources/fediz_test_config_saml.xml
----------------------------------------------------------------------
diff --git a/plugins/core/src/test/resources/fediz_test_config_saml.xml b/plugins/core/src/test/resources/fediz_test_config_saml.xml
index 125bccd..81973c3 100644
--- a/plugins/core/src/test/resources/fediz_test_config_saml.xml
+++ b/plugins/core/src/test/resources/fediz_test_config_saml.xml
@@ -200,7 +200,7 @@
</audienceUris>
<certificateStores>
<trustManager>
- <keyStore file="clientonly.jks" password="storepass"
+ <keyStore file="clientonly.jks" password="cspass"
type="JKS" />
</trustManager>
</certificateStores>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/util/WebUtils.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/util/WebUtils.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/util/WebUtils.java
index 89543dc..284fd40 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/util/WebUtils.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/util/WebUtils.java
@@ -202,6 +202,7 @@ public final class WebUtils {
Cookie cookie = readCookie(context, cookieName);
if (cookie != null) {
cookie.setMaxAge(0);
+ cookie.setValue("");
httpServletResponse.addCookie(cookie);
}
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/services/idp/src/main/resources/restContext.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/restContext.xml b/services/idp/src/main/resources/restContext.xml
index 24a4f1a..ce58024 100644
--- a/services/idp/src/main/resources/restContext.xml
+++ b/services/idp/src/main/resources/restContext.xml
@@ -18,19 +18,15 @@
under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xmlns:security="http://www.springframework.org/schema/security"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://cxf.apache.org/jaxrs
- http://cxf.apache.org/schemas/jaxrs.xsd
- http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+ http://cxf.apache.org/schemas/jaxrs.xsd">
<!--
<context:component-scan base-package="org.apache.cxf.fediz.service.idp.protocols" />
@@ -43,8 +39,7 @@
<bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider">
<property name="depthProperties">
- <bean id="depthProperties"
- class="org.apache.cxf.staxutils.DocumentDepthProperties">
+ <bean class="org.apache.cxf.staxutils.DocumentDepthProperties">
<property name="innerElementCountThreshold" value="500" />
</bean>
</property>
@@ -102,48 +97,6 @@
<bean id="roleServiceImpl"
class="org.apache.cxf.fediz.service.idp.rest.RoleServiceImpl" />
-
-
- <!-- If enabled, you can't access the Service layer within the Spring Webflow -->
- <!-- The user has no role during the login phase of WS-Federation -->
- <security:global-method-security pre-post-annotations="enabled"/>
-
- <security:http pattern="/services/rs/**" auto-config="false" use-expressions="true">
- <security:custom-filter after="CHANNEL_FILTER" ref="stsPortFilter" />
- <security:custom-filter after="SERVLET_API_SUPPORT_FILTER" ref="entitlementsEnricher" />
- <security:intercept-url pattern="/**" access="isAuthenticated()"/>
- <security:http-basic />
- </security:http>
-
- <bean id="bCryptPasswordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" />
-
- <bean id="defaultPasswordEncoder" class="org.springframework.security.crypto.password.StandardPasswordEncoder" />
-
- <security:authentication-manager>
- <security:authentication-provider>
- <!-- <security:password-encoder ref="defaultPasswordEncoder"/>-->
- <!-- <security:password-encoder hash="sha-256" base64="true" />-->
- <!--
- <security:password-encoder hash="sha-256" base64="true">
- <security:salt-source user-property="username"/>
- </security:password-encoder>
- -->
- <security:user-service properties="classpath:/users.properties" />
- </security:authentication-provider>
- <security:authentication-provider ref="stsAuthProvider" />
- </security:authentication-manager>
-
- <bean id="entitlementsEnricher" class="org.apache.cxf.fediz.service.idp.service.security.GrantedAuthorityEntitlements" />
-
- <bean id="stsPortFilter" class="org.apache.cxf.fediz.service.idp.STSPortFilter" />
-
- <bean id="stsAuthProvider" class="org.apache.cxf.fediz.service.idp.STSAuthenticationProvider">
- <property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts/${realm.STS_URI}/STSServiceTransportUT?wsdl"/>
- <property name="wsdlEndpoint" value="TransportUT_Port"/>
- <property name="wsdlService" value="SecurityTokenService"/>
- <property name="appliesTo" value="urn:fediz:idp"/>
- <property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"/>
- </bean>
</beans>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/services/idp/src/main/resources/restContextKerberos.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/restContextKerberos.xml b/services/idp/src/main/resources/restContextKerberos.xml
deleted file mode 100644
index 4fa2060..0000000
--- a/services/idp/src/main/resources/restContextKerberos.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xmlns:security="http://www.springframework.org/schema/security"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
- http://cxf.apache.org/jaxrs
- http://cxf.apache.org/schemas/jaxrs.xsd
- http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security-3.1.xsd">
-
-<!--
-<context:component-scan base-package="org.apache.cxf.fediz.service.idp.protocols" />
-
-
- <bean
- class="org.apache.cxf.fediz.service.idp.protocols.TrustedIdpProtocolHandlerImpl" />
- -->
- <context:property-placeholder location="classpath:realm.properties"/>
-
- <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider">
- <property name="depthProperties">
- <bean id="depthProperties"
- class="org.apache.cxf.staxutils.DocumentDepthProperties">
- <property name="innerElementCountThreshold" value="500" />
- </bean>
- </property>
- <property name="marshallerProperties">
- <map>
- <entry key="jaxb.formatted.output">
- <value type="java.lang.Boolean">true</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="exceptionMapper"
- class="org.apache.cxf.fediz.service.idp.rest.RestServiceExceptionMapper" />
-
- <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider" />
-
- <jaxrs:server id="idpService" address="/rs">
- <jaxrs:serviceBeans>
- <ref bean="idpServiceImpl" />
- <ref bean="claimServiceImpl" />
- <ref bean="applicationServiceImpl" />
- <ref bean="trustedIdpServiceImpl" />
- <ref bean="entitlementServiceImpl" />
- <ref bean="roleServiceImpl" />
- <ref bean="rootServiceImpl" />
- </jaxrs:serviceBeans>
- <jaxrs:providers>
- <ref bean="jaxbProvider" />
- <ref bean="jsonProvider" />
- <ref bean="exceptionMapper" />
- </jaxrs:providers>
- <jaxrs:extensionMappings>
- <entry key="json" value="application/json;charset=UTF-8" />
- <entry key="xml" value="application/xml;charset=UTF-8" />
- </jaxrs:extensionMappings>
- </jaxrs:server>
-
- <bean id="rootServiceImpl"
- class="org.apache.cxf.fediz.service.idp.rest.RootServiceImpl" />
-
- <bean id="idpServiceImpl" class="org.apache.cxf.fediz.service.idp.rest.IdpServiceImpl" />
-
- <bean id="claimServiceImpl"
- class="org.apache.cxf.fediz.service.idp.rest.ClaimServiceImpl" />
-
- <bean id="applicationServiceImpl"
- class="org.apache.cxf.fediz.service.idp.rest.ApplicationServiceImpl" />
-
- <bean id="trustedIdpServiceImpl"
- class="org.apache.cxf.fediz.service.idp.rest.TrustedIdpServiceImpl" />
-
- <bean id="entitlementServiceImpl"
- class="org.apache.cxf.fediz.service.idp.rest.EntitlementServiceImpl" />
-
- <bean id="roleServiceImpl"
- class="org.apache.cxf.fediz.service.idp.rest.RoleServiceImpl" />
-
-
- <!-- If enabled, you can't access the Service layer within the Spring Webflow -->
- <!-- The user has no role during the login phase of WS-Federation -->
- <security:global-method-security pre-post-annotations="enabled"/>
-
- <security:http pattern="/services/rs/**" auto-config="false" use-expressions="true"
- entry-point-ref="kerberosEntryPoint">
- <security:custom-filter after="CHANNEL_FILTER" ref="stsPortFilter" />
- <security:custom-filter after="SERVLET_API_SUPPORT_FILTER" ref="entitlementsEnricher" />
- <security:intercept-url pattern="/**" access="isAuthenticated()"/>
- <!--<security:http-basic />-->
- <security:custom-filter ref="kerberosAuthenticationProcessingFilter" position="BASIC_AUTH_FILTER" />
- </security:http>
-
- <bean id="bCryptPasswordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" />
-
- <bean id="defaultPasswordEncoder" class="org.springframework.security.crypto.password.StandardPasswordEncoder" />
-
- <bean id="kerberosEntryPoint"
- class="org.apache.cxf.fediz.service.idp.kerberos.KerberosEntryPoint" />
-
- <bean id="spnegoAuthenticationProcessingFilter"
- class="org.apache.cxf.fediz.service.idp.kerberos.KerberosAuthenticationProcessingFilter">
- <property name="authenticationManager" ref="authenticationManager" />
- </bean>
-
- <security:authentication-manager alias="authenticationManager">
- <security:authentication-provider>
- <!-- <security:password-encoder ref="defaultPasswordEncoder"/>-->
- <!-- <security:password-encoder hash="sha-256" base64="true" />-->
- <!--
- <security:password-encoder hash="sha-256" base64="true">
- <security:salt-source user-property="username"/>
- </security:password-encoder>
- -->
- <security:user-service properties="classpath:/users.properties" />
- </security:authentication-provider>
- <security:authentication-provider ref="stsAuthProvider" />
- </security:authentication-manager>
-
- <bean id="entitlementsEnricher" class="org.apache.cxf.fediz.service.idp.service.security.GrantedAuthorityEntitlements" />
-
- <bean id="stsPortFilter" class="org.apache.cxf.fediz.service.idp.STSPortFilter" />
- <!--
- <bean id="kerberosTokenValidator" class="org.apache.cxf.fediz.service.idp.kerberos.KerberosTokenValidator">
- <property name="contextName" value="bob"/>
- <property name="serviceName" value="bob@service.ws.apache.org"/>
- </bean>
- -->
-
- <bean id="stsAuthProvider" class="org.apache.cxf.fediz.service.idp.STSAuthenticationProvider">
- <!--<property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts/${realm.STS_URI}/STSServiceTransportUT?wsdl"/>
- <property name="wsdlEndpoint" value="TransportUT_Port"/>-->
- <property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts/${realm.STS_URI}/STSServiceTransportKerberos?wsdl"/>
- <property name="wsdlEndpoint" value="TransportKerberos_Port"/>
- <property name="wsdlService" value="SecurityTokenService"/>
- <property name="appliesTo" value="urn:fediz:idp"/>
- <property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"/>
- <!--<property name="kerberosTokenValidator" ref="kerberosTokenValidator"/>
- <property name="requireDelegation" value="true"/>-->
- </bean>
-
-</beans>
-
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/applicationContext.xml b/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
index afe5003..a858236 100644
--- a/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -18,31 +18,21 @@
under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xsi:schemaLocation="
- http://cxf.apache.org/core
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="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-3.1.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-2.0.xsd
http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/jaxrs
- http://cxf.apache.org/schemas/jaxrs.xsd">
+ http://cxf.apache.org/schemas/configuration/security.xsd">
<context:component-scan base-package="org.apache.cxf.fediz.service.idp.protocols" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml b/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
index 883859e..c5e0a4a 100644
--- a/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
+++ b/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
@@ -25,9 +25,10 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util-3.1.xsd
+ ">
<context:property-placeholder location="classpath:realm.properties" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml b/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
index f5ab043..a8c8a3b 100644
--- a/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
+++ b/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
@@ -25,9 +25,9 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util-3.1.xsd">
<context:property-placeholder location="classpath:realm.properties" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml b/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
index ada6250..ccc2146 100644
--- a/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
+++ b/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
@@ -18,17 +18,14 @@
under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:webflow="http://www.springframework.org/schema/webflow-config"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:webflow="http://www.springframework.org/schema/webflow-config"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/webflow-config
http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/services/idp/src/main/webapp/WEB-INF/security-config-kerberos.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/security-config-kerberos.xml b/services/idp/src/main/webapp/WEB-INF/security-config-kerberos.xml
index 0d17349..49049ab 100644
--- a/services/idp/src/main/webapp/WEB-INF/security-config-kerberos.xml
+++ b/services/idp/src/main/webapp/WEB-INF/security-config-kerberos.xml
@@ -23,9 +23,9 @@
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.1.xsd">
@@ -35,18 +35,54 @@
<!-- <security:debug /> -->
<!-- Configure Spring Security -->
- <security:http pattern="/federation/**" auto-config="false" use-expressions="true"
- entry-point-ref="kerberosEntryPoint">
+ <!-- If enabled, you can't access the Service layer within the Spring Webflow -->
+ <!-- The user has no role during the login phase of WS-Federation -->
+ <security:global-method-security pre-post-annotations="enabled"/>
+
+ <security:http pattern="/services/rs/**" auto-config="false" use-expressions="true" entry-point-ref="kerberosEntryPoint">
<security:custom-filter after="CHANNEL_FILTER" ref="stsPortFilter" />
<security:custom-filter after="SERVLET_API_SUPPORT_FILTER" ref="entitlementsEnricher" />
- <security:intercept-url pattern="/FederationMetadata/2007-06/FederationMetadata.xml" access="isAnonymous() or isAuthenticated()" />
-
- <!-- MUST be http-basic thus systests run fine -->
+ <security:intercept-url pattern="/**" access="isAuthenticated()"/>
<!--<security:http-basic />-->
- <!--<security:form-login />-->
<security:custom-filter ref="kerberosAuthenticationProcessingFilter" position="BASIC_AUTH_FILTER" />
</security:http>
+
+ <bean id="bCryptPasswordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" />
+
+ <bean id="defaultPasswordEncoder" class="org.springframework.security.crypto.password.StandardPasswordEncoder" />
+
+ <bean id="kerberosEntryPoint"
+ class="org.apache.cxf.fediz.service.idp.kerberos.KerberosEntryPoint" />
+
+ <bean id="spnegoAuthenticationProcessingFilter"
+ class="org.apache.cxf.fediz.service.idp.kerberos.KerberosAuthenticationProcessingFilter">
+ <property name="authenticationManager" ref="restAuthenticationManager" />
+ </bean>
+ <security:authentication-manager id="restAuthenticationManager">
+ <security:authentication-provider>
+ <!-- <security:password-encoder ref="defaultPasswordEncoder"/>-->
+ <!-- <security:password-encoder hash="sha-256" base64="true" />-->
+ <!--
+ <security:password-encoder hash="sha-256" base64="true">
+ <security:salt-source user-property="username"/>
+ </security:password-encoder>
+ -->
+ <security:user-service properties="classpath:/users.properties" />
+ </security:authentication-provider>
+ <security:authentication-provider ref="stsAuthProvider" />
+ </security:authentication-manager>
+
+ <security:http use-expressions="true" entry-point-ref="kerberosEntryPoint">
+ <security:custom-filter after="CHANNEL_FILTER" ref="stsPortFilter" />
+ <security:custom-filter after="SERVLET_API_SUPPORT_FILTER" ref="entitlementsEnricher" />
+ <security:intercept-url pattern="/FederationMetadata/2007-06/FederationMetadata.xml" access="isAnonymous() or isAuthenticated()" />
+
+ <security:form-login login-page="/federation/login"/>
+ <security:http-basic />
+ <security:custom-filter ref="kerberosAuthenticationProcessingFilter" position="BASIC_AUTH_FILTER" />
+ </security:http>
+
<bean id="kerberosEntryPoint"
class="org.apache.cxf.fediz.service.idp.kerberos.KerberosEntryPoint" />
@@ -61,6 +97,8 @@
<bean id="stsPortFilter" class="org.apache.cxf.fediz.service.idp.STSPortFilter" />
+ <bean id="entitlementsEnricher" class="org.apache.cxf.fediz.service.idp.service.security.GrantedAuthorityEntitlements" />
+
<!--<bean id="kerberosTokenValidator" class="org.apache.cxf.fediz.service.idp.kerberos.KerberosTokenValidator">
<property name="contextName" value="bob"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/services/idp/src/main/webapp/WEB-INF/security-config.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/security-config.xml b/services/idp/src/main/webapp/WEB-INF/security-config.xml
index 847b07a..ab0eada 100644
--- a/services/idp/src/main/webapp/WEB-INF/security-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/security-config.xml
@@ -23,11 +23,12 @@
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+ http://www.springframework.org/schema/security/spring-security-3.1.xsd
+ ">
<context:property-placeholder location="classpath:realm.properties"/>
@@ -35,14 +36,45 @@
<!-- <security:debug /> -->
<!-- Configure Spring Security -->
- <security:http pattern="/federation/**" auto-config="false" use-expressions="true">
+
+ <!-- If enabled, you can't access the Service layer within the Spring Webflow -->
+ <!-- The user has no role during the login phase of WS-Federation -->
+ <security:global-method-security pre-post-annotations="enabled"/>
+
+ <security:http pattern="/services/rs/**" use-expressions="true" authentication-manager-ref="restAuthenticationManager">
+ <security:custom-filter after="CHANNEL_FILTER" ref="stsPortFilter" />
+ <security:custom-filter after="SERVLET_API_SUPPORT_FILTER" ref="entitlementsEnricher" />
+ <security:intercept-url pattern="/services/rs/**" access="isAuthenticated()"/>
+ <security:http-basic />
+ </security:http>
+
+ <bean id="bCryptPasswordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" />
+
+ <bean id="defaultPasswordEncoder" class="org.springframework.security.crypto.password.StandardPasswordEncoder" />
+
+ <security:authentication-manager id="restAuthenticationManager">
+ <security:authentication-provider>
+ <!-- <security:password-encoder ref="defaultPasswordEncoder"/>-->
+ <!-- <security:password-encoder hash="sha-256" base64="true" />-->
+ <!--
+ <security:password-encoder hash="sha-256" base64="true">
+ <security:salt-source user-property="username"/>
+ </security:password-encoder>
+ -->
+ <security:user-service properties="classpath:/users.properties" />
+ </security:authentication-provider>
+ <security:authentication-provider ref="stsAuthProvider" />
+ </security:authentication-manager>
+
+ <security:http use-expressions="true">
<security:custom-filter after="CHANNEL_FILTER" ref="stsPortFilter" />
<security:custom-filter after="SERVLET_API_SUPPORT_FILTER" ref="entitlementsEnricher" />
<security:intercept-url pattern="/FederationMetadata/2007-06/FederationMetadata.xml" access="isAnonymous() or isAuthenticated()" />
<!-- MUST be http-basic thus systests run fine -->
- <security:http-basic />
<!--<security:form-login />-->
+ <security:http-basic />
+ <security:logout delete-cookies="FEDIZ_HOME_REALM" invalidate-session="true" />
</security:http>
<security:authentication-manager>
@@ -50,6 +82,8 @@
</security:authentication-manager>
<bean id="stsPortFilter" class="org.apache.cxf.fediz.service.idp.STSPortFilter" />
+
+ <bean id="entitlementsEnricher" class="org.apache.cxf.fediz.service.idp.service.security.GrantedAuthorityEntitlements" />
<bean id="stsAuthProvider" class="org.apache.cxf.fediz.service.idp.STSAuthenticationProvider">
<property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts/${realm.STS_URI}/STSServiceTransportUT?wsdl"/>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d16365db/services/idp/src/test/resources/idp-config.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/test/resources/idp-config.xml b/services/idp/src/test/resources/idp-config.xml
index 6c8fdb5..ce3f60b 100644
--- a/services/idp/src/test/resources/idp-config.xml
+++ b/services/idp/src/test/resources/idp-config.xml
@@ -18,29 +18,18 @@
under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:test="http://apache.org/hello_world_soap_http"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="
- 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-2.0.xsd
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
- http://cxf.apache.org/jaxws
- http://cxf.apache.org/schemas/jaxws.xsd
+ http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util-3.1.xsd
http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd">
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd">
<context:property-placeholder location="classpath:realm.properties" />