[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/saml/saml2: sso-abstract-beans.xml...

[noreply at shibboleth.net]

Author: putmanb
Date: Mon Jun 22 20:40:50 2015
New Revision: 7595

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7595&view=rev
Log:
Go ahead and provisionally add DecorateDelegationAssertion into the SAML 2 SSO abstract flow.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=7595&r1=7594&r2=7595&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml	Mon Jun 22 20:40:50 2015
@@ -101,6 +101,16 @@
             <bean class="net.shibboleth.idp.saml.profile.config.navigate.ProxyCountLookupFunction" />
         </property>
     </bean>
+    
+    <bean id="DecorateDelegatedAssertion"
+            class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.DecorateDelegatedAssertion" scope="prototype"
+            p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+            p:libertySSOSEndpointURL="%{idp.delegation.saml2.libertySSOSEndpointURL:#{null}}">
+        <property name="keyInfoGeneratorManager">
+            <bean factory-method="buildBasicKeyInfoGeneratorManager" class="org.opensaml.xmlsec.config.DefaultSecurityConfigurationBootstrap" />
+        </property>
+        <property name="credentialResolver" ref="shibboleth.MetadataCredentialResolver" />
+    </bean>
 
     <bean id="AddChannelBindingsToAssertions"
         class="org.opensaml.saml.saml2.profile.impl.AddChannelBindingsToAssertions" scope="prototype" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml?rev=7595&r1=7594&r2=7595&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml	Mon Jun 22 20:40:50 2015
@@ -89,6 +89,7 @@
         <evaluate expression="AddProxyRestrictionToAssertions" />
         <evaluate expression="AddChannelBindingsToAssertions" />
         <evaluate expression="AddGeneratedKeyToAssertions" />
+        <evaluate expression="DecorateDelegatedAssertion" />
 
         <!-- Need access to unencrypted NameID and Assertion. -->
         <evaluate expression="PostAssertionPopulateAuditContext" />