[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/flows/authn/authn-b...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jul 30 16:00:41 2014
New Revision: 6364

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6364&view=rev
Log:
IDP-455: generalize initial authn to multiple flows

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6364&r1=6363&r2=6364&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Jul 30 16:00:41 2014
@@ -102,6 +102,14 @@
 # Regular expression matching login flows to enable 
 idp.authn.flows = IPAddress|Password
 
+# Regular expression of forced "initial" methods when no session exists,
+# usually in conjunction with the idp.authn.resolveAttribute property below.
+#idp.authn.flows.initial = Password
+
+# Set to a quoted attribute ID to resolve prior to selecting authentication flows;
+# its values are used to filter the flows to allow.
+#idp.authn.resolveAttribute = 'eduPersonAssurance'
+
 # Default lifetime and timeout of various authentication methods
 #idp.authn.defaultLifetime = PT60M
 #idp.authn.defaultTimeout = PT30M
@@ -109,14 +117,6 @@
 # Whether to prioritize "active" results when an SP requests more than
 # one possible matching login method (V2 behavior was to favor them)
 #idp.authn.favorSSO = true
-
-# Uncomment to activate a forced "initial" method when no session exists,
-# usually in conjunction with the idp.authn.resolveAttribute property below.
-#idp.authn.initialFlow = Password
-
-# Set to a quoted attribute ID to resolve prior to selecting
-# authentication flows, making more data available to flow selection
-#idp.authn.resolveAttribute = 'eduPersonAssurance'
 
 # Reload "failfast" (stop the IdP if a configuration is bad)
 # and reload check interval (0 == never reload).

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=6364&r1=6363&r2=6364&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 Wed Jul 30 16:00:41 2014
@@ -25,7 +25,7 @@
 
     <bean id="PopulateAuthenticationContextWithInitialFlow"
         class="net.shibboleth.idp.authn.impl.PopulateAuthenticationContext" scope="prototype"
-        p:availableFlows="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'authn/%{idp.authn.initialFlow:}']}"
+        p:availableFlows="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'authn/(%{idp.authn.flows.initial:})']}"
         p:principalEvalPredicateFactoryRegistry-ref="shibboleth.AuthnComparisonRegistry" />
 
     <bean id="PopulateSessionContext"

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=6364&r1=6363&r2=6364&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 Wed Jul 30 16:00:41 2014
@@ -171,7 +171,7 @@
         class="net.shibboleth.idp.saml.profile.impl.InitializeAuthenticationContext" scope="prototype" />
 
     <bean id="InitialAuthenticationFlag" class="java.lang.Boolean">
-        <constructor-arg value="#{ '%{idp.authn.initialFlow:}'.length() gt 0 }" type="boolean" />
+        <constructor-arg value="#{ '%{idp.authn.flows.initial:}'.length() gt 0 }" type="boolean" />
     </bean>
 
     <bean id="InitializeRequestedPrincipalContext"