[java-identity-provider COMMIT] in /trunk: idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FilterFlowsByAt...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 21 13:53:06 2014
New Revision: 6322

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6322&view=rev
Log:
IDP-433: action to filter authn flows based on resolved attribute

Added:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FilterFlowsByAttribute.java   (with props)
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByAttributeTest.java   (with props)
Modified:
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContextTest.java
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml

Modified: trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContextTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContextTest.java?rev=6322&r1=6321&r2=6322&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContextTest.java (original)
+++ trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContextTest.java Mon Jul 21 13:53:06 2014
@@ -65,5 +65,7 @@
 
         Assert.assertEquals(authCtx.getPotentialFlows().size(), 3);
         Assert.assertNotNull(authCtx.getPotentialFlows().get("test1"));
+        Assert.assertNotNull(authCtx.getPotentialFlows().get("test2"));
+        Assert.assertNotNull(authCtx.getPotentialFlows().get("test3"));
     }
 }

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml?rev=6322&r1=6321&r2=6322&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml Mon Jul 21 13:53:06 2014
@@ -50,6 +50,11 @@
         </property>
     </bean>
 
+    <bean id="FilterFlowsByAttribute"
+            class="net.shibboleth.idp.authn.impl.FilterFlowsByAttribute" scope="prototype"
+            p:activationCondition="#{ %{idp.authn.resolveAttribute:null} != null }"
+            p:attributeId="#{ { %{idp.authn.resolveAttribute:null} }.get(0) }" />
+
     <bean id="FilterFlowsByForcedAuthn"
         class="net.shibboleth.idp.authn.impl.FilterFlowsByForcedAuthn" scope="prototype" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml?rev=6322&r1=6321&r2=6322&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml Mon Jul 21 13:53:06 2014
@@ -28,6 +28,7 @@
    
     <action-state id="ResolveAttributes">
         <evaluate expression="ResolveAttributes" />
+        <evaluate expression="FilterFlowsByAttribute" />
         <evaluate expression="'proceed'" />
 
         <transition on="proceed" to="FilterFlows" />