[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/conf/session-manage...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jul 30 14:34:11 2014
New Revision: 6362

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6362&view=rev
Log:
IDP-455: option to run an explicit authn flow when no session exists

Added:
    trunk/idp-conf/src/main/resources/system/flows/authn/initial-authn-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/session-manager.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.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=6362&r1=6361&r2=6362&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Jul 30 14:34:11 2014
@@ -110,6 +110,10 @@
 # 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'

Modified: trunk/idp-conf/src/main/resources/system/conf/session-manager.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/session-manager.xml?rev=6362&r1=6361&r2=6362&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/session-manager.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/session-manager.xml Wed Jul 30 14:34:11 2014
@@ -33,7 +33,7 @@
     <bean id="shibboleth.SessionManager" class="net.shibboleth.idp.session.impl.StorageBackedSessionManager"
             p:httpServletRequest-ref="shibboleth.HttpServletRequest"
             p:httpServletResponse-ref="shibboleth.HttpServletResponse"
-            p:authenticationFlowDescriptors="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'authn/(%{idp.authn.flows})']}"
+            p:authenticationFlowDescriptors="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'authn/(%{idp.authn.flows:})']}"
             p:cookieManager-ref="shibboleth.CookieManager"
             p:storageService-ref="%{idp.session.StorageService:shibboleth.ClientStorageService}"
             p:consistentAddress="%{idp.session.consistentAddress:true}"

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=6362&r1=6361&r2=6362&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Wed Jul 30 14:34:11 2014
@@ -49,6 +49,7 @@
 
         <!-- Master flow for authentication. -->
         <webflow:flow-location id="authn.abstract" path="../system/flows/authn/authn-abstract-flow.xml" />
+        <webflow:flow-location id="authn-initial" path="../system/flows/authn/initial-authn-flow.xml" />
         <webflow:flow-location id="authn" path="../system/flows/authn/authn-flow.xml" />
 
         <!-- Login methods. -->

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=6362&r1=6361&r2=6362&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 14:34:11 2014
@@ -20,12 +20,17 @@
     
     <bean id="PopulateAuthenticationContext"
         class="net.shibboleth.idp.authn.impl.PopulateAuthenticationContext" scope="prototype"
-        p:availableFlows="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'authn/(%{idp.authn.flows})']}"
+        p:availableFlows="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'authn/(%{idp.authn.flows:})']}"
+        p:principalEvalPredicateFactoryRegistry-ref="shibboleth.AuthnComparisonRegistry" />
+
+    <bean id="PopulateAuthenticationContextWithInitialFlow"

[... 129 lines stripped ...]