[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/utilities.xml idp-conf/src/main/re...

[noreply at shibboleth.net]

Author: putmanb
Date: Sat Oct 24 22:49:57 2015
New Revision: 7874

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

Add action which evals the 2 policy controls we have:
1) Liberty config predicate and 2) max token delegation chain length.
Add relevant wiring for Liberty profile.
Add an allowed presenters predicate and utility abstract bean to use in profile config wiring. 

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/AllowedSAMLPresentersPredicate.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/EvaluateDelegationPolicy.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=7874&r1=7873&r2=7874&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml	Sat Oct 24 22:49:57 2015
@@ -50,6 +50,8 @@
     
     <bean id="shibboleth.Conditions.IssuingDelegatedAssertion"
         class="net.shibboleth.idp.saml.saml2.profile.delegation.IssuingDelegatedAssertionPredicate" />
+    <bean id="shibboleth.Conditions.AllowedSAMLPresenters" abstract="true"
+        class="net.shibboleth.idp.saml.profile.config.logic.AllowedSAMLPresentersPredicate" />
 
     <bean id="shibboleth.MessageContextLookup.Inbound"
         class="org.opensaml.profile.context.navigate.InboundMessageContextLookup" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml?rev=7874&r1=7873&r2=7874&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml	Sat Oct 24 22:49:57 2015
@@ -161,6 +161,8 @@
     
     <bean id="PopulateLibertyContext" class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.PopulateLibertyContext" scope="prototype" />
     
+    <bean id="EvaluateDelegationPolicy" class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.EvaluateDelegationPolicy" scope="prototype" />
+    
     <bean id="DecryptDelegatedAssertionNameID" class="org.opensaml.saml.saml2.profile.impl.DecryptNameIDs" scope="prototype">
         <property name="messageLookupStrategy">
             <bean class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.DelegatedAssertionLookupStrategy" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml?rev=7874&r1=7873&r2=7874&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml	Sat Oct 24 22:49:57 2015
@@ -58,6 +58,7 @@
     
     <action-state id="ProcessSAMLToken">
         <evaluate expression="PopulateLibertyContext" />
+        <evaluate expression="EvaluateDelegationPolicy" />
         <evaluate expression="DecryptDelegatedAssertionNameID" />
         <evaluate expression="ProcessDelegatedAssertion" />