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

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Oct 13 21:08:56 2015
New Revision: 7818

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7818&view=rev
Log:
IDP-672: Create Action(s) and supporting code to issue SAML 2 Assertions decorated for delegation

Add predicate based on whether issuance of a delegated assertion token is active.
Make assertion signing now conditional on eval of this predicate OR-ed with existing predicate.

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/IssuingDelegatedAssertionPredicate.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=7818&r1=7817&r2=7818&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml	Tue Oct 13 21:08:56 2015
@@ -142,8 +142,15 @@
             p:configurationLookupStrategy-ref="shibboleth.SignatureSigningConfigurationLookup"
             p:signatureSigningParametersResolver-ref="shibboleth.SignatureSigningParametersResolver">
         <property name="activationCondition">
-            <bean class="net.shibboleth.idp.saml.profile.config.logic.SignAssertionsPredicate"
-                p:honorMetadata="%{idp.signing.honorWantAssertionsSigned:true}" />
+            <bean parent="shibboleth.Conditions.OR">
+                <constructor-arg>
+                    <bean class="net.shibboleth.idp.saml.profile.config.logic.SignAssertionsPredicate"
+                        p:honorMetadata="%{idp.signing.honorWantAssertionsSigned:true}" />
+                </constructor-arg>
+                <constructor-arg>
+                    <bean class="net.shibboleth.idp.saml.saml2.profile.delegation.IssuingDelegatedAssertionPredicate" />
+                </constructor-arg>
+            </bean>
         </property>
         <property name="securityParametersContextLookupStrategy">
             <bean class="com.google.common.base.Functions" factory-method="compose"