[java-identity-provider COMMIT] in /trunk: idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: putmanb
Date: Sat Oct 24 20:19:52 2015
New Revision: 7873

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7873&view=rev
Log:
IDP-676: Port delegation configuration and policy control components

Fix up erroneous ported default value for max delegation chain length.
Move max delegation chain length param from Liberty SSOS profile config to browser
SSO config.  This is needed because we will now record the value in the initial
SSO assertion based on the value configured for the initial RP.
Remove use of generics on PRC for SSOS profile config, to make consistent
with other IdP usage.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2BrowserSSOProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2SSOSProfileParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2SSOSProfileTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ssosValues.xml
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/idwsf/profile/config/SSOSProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/idwsf/profile/config/SSOSProfileConfigurationTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfigurationTest.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party-saml.xsd

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2BrowserSSOProfileParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2BrowserSSOProfileParser.java?rev=7873&r1=7872&r2=7873&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2BrowserSSOProfileParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2BrowserSSOProfileParser.java	Sat Oct 24 20:19:52 2015
@@ -157,6 +157,11 @@
                     element.getAttributeNS(null, "allowDelegationPredicateRef"));
         }
         builder.addPropertyValue("allowDelegation", allowDelegationPredicateBuilder.getBeanDefinition());
+        
+        if (element.hasAttributeNS(null, "maximumTokenDelegationChainLength")) {
+            builder.addPropertyValue("maximumTokenDelegationChainLength",
+                    StringSupport.trimOrNull(element.getAttributeNS(null, "maximumTokenDelegationChainLength")));
+        }
 
         setPropertiesFromRelyingParty(element, builder);
     }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2SSOSProfileParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2SSOSProfileParser.java?rev=7873&r1=7872&r2=7873&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2SSOSProfileParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2SSOSProfileParser.java	Sat Oct 24 20:19:52 2015
@@ -52,10 +52,6 @@
     /** {@inheritDoc} */
     @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
         super.doParse(element, parserContext, builder);
-        if (element.hasAttributeNS(null, "maximumTokenDelegationChainLength")) {
-            builder.addPropertyValue("maximumTokenDelegationChainLength",
-                    StringSupport.trimOrNull(element.getAttributeNS(null, "maximumTokenDelegationChainLength")));
-        }
         if (element.hasAttributeNS(null, "delegationPredicateRef")) {
             builder.addPropertyReference("delegationPredicate",
                     StringSupport.trimOrNull(element.getAttributeNS(null, "delegationPredicateRef")));

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java?rev=7873&r1=7872&r2=7873&view=diff

[... 401 lines stripped ...]