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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 25 21:20:15 2016
New Revision: 8304

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8304&view=rev
Log:
IDP-962 - Login flow or framework for combining authentication factors

Simpler syntax for proceed-triggered functions.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthenticationTransition.java
    trunk/idp-conf/src/main/resources/conf/authn/mfa-authn-config.xml

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthenticationTransition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthenticationTransition.java?rev=8304&r1=8303&r2=8304&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthenticationTransition.java	(original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthenticationTransition.java	Mon Jul 25 21:20:15 2016
@@ -135,7 +135,9 @@
 
      * @param strategy function to run
      */
-    public void setNextFlowStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
+    public void setNextFlowStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
+        Constraint.isNotNull(strategy, "Flow strategy function cannot be null");
+        
         setNextFlowStrategyMap(Collections.<String,Object>singletonMap("proceed", strategy));
     }
 

Modified: trunk/idp-conf/src/main/resources/conf/authn/mfa-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/mfa-authn-config.xml?rev=8304&r1=8303&r2=8304&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/mfa-authn-config.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/authn/mfa-authn-config.xml	Mon Jul 25 21:20:15 2016
@@ -24,10 +24,14 @@
         p:nextFlow (String)
             - A flow to run if the previous step signaled a "proceed" event, for simple
                 transitions.
+                
+        p:nextFlowStrategy (Function<ProfileRequestContext,String>)
+            - A function to run if the previous step signaled a "proceed" event, for dynamic
+                transitions. Returning null ends the MFA process.
             
         p:nextFlowStrategyMap (Map<String,Object> where Object is String or Function<ProfileRequestContext,String>)
-            - A dynamic way of expressing control paths. Map is keyed by a previously
-                signaled event and the value is a flow to run or a function bean to
+            - Fully dynamic way of expressing control paths. Map is keyed by a previously
+                signaled event and the value is a flow to run or a function to
                 return the flow to run. Returning null ends the MFA process.
                 
     When no rule is provided, there's an implicit "null" that ends the MFA flow