[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 <[email protected]> Authored: Tue Jan 13 17:31:45 2015 +0100 Committer: Jan Bernhardt <[email protected]> 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>
