[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/reso...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jul  7 13:25:36 2016
New Revision: 8286

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8286&view=rev
Log:
Comment cleanup.

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
    trunk/idp-conf/src/main/resources/conf/authn/mfa-authn-config.xml

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java?rev=8286&r1=8285&r2=8286&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java	(original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java	Thu Jul  7 13:25:36 2016
@@ -225,6 +225,8 @@
      * Helper method to invoke an AttributeResolver service using this context.
      * 
      * @param attributeResolverService the service to invoke
+     * 
+     * @since 3.3.0
      */
     public void resolveAttributes(@Nonnull final ReloadableService<AttributeResolver> attributeResolverService) {
 

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=8286&r1=8285&r2=8286&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	Thu Jul  7 13:25:36 2016
@@ -15,24 +15,24 @@
     <!--
     This is a map of transition rules that guide the behavior of the MFA flow
     and controls how factors are sequenced, skipped, etc. The key of each entry
-    is the name of the step/flow out of which control is passing. The initial "exit"
-    point is identified with an empty key.
+    is the name of the step/flow out of which control is passing. The starting
+    rule has an empty key.
     
     Each entry is a bean inherited from "shibboleth.authn.MFA.Transition". Per
     the Javadoc for net.shibboleth.idp.authn.MultiFactorAuthenticationTransition:
             
         p:nextFlow (String)
-            - A flow to run if the previous one signaled a "proceed" event, for simple
+            - A flow to run if the previous step signaled a "proceed" event, for simple
                 transitions.
             
         p:nextFlowStrategyMap (Map<String,Object> where Object is String or Function<ProfileRequestContext,String>)
-            - A hyper-flexible way of expressing rules for flow control. 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.
+            - 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
+                return the flow to run. Returning null ends the MFA process.
                 
-    When no rule is provided, an event will be raised as the overall event result.
-    If the "proceed" event from a step is the final event, then the flow attempts to
-    complete itself successfully.
+    When no rule is provided, there's an implicit "null" that ends the MFA flow
+    with whatever event was last signaled. If the "proceed" event from a step is
+    the final event, then the MFA process attempts to complete itself successfully.
     -->
     <util:map id="shibboleth.authn.MFA.TransitionMap">
         <!-- First rule runs the IPAddress login flow. -->
@@ -57,7 +57,7 @@
         <!-- An implicit final rule will return whatever the final flow returns. -->
     </util:map>
 
-    <!-- Example script that sets up attribute resolution based on previous login results. -->
+    <!-- Example script to see if second factor is required. -->
     <bean id="checkSecondFactor" parent="shibboleth.ContextFunctions.Scripted" factory-method="inlineScript"
         p:customObject-ref="shibboleth.AttributeResolverService">
         <constructor-arg>