[java-identity-provider] branch main updated: IDP-1887 - Repurpose authn flow for alternative uses

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b2959bb5e13dfd95b26bf9073132c6e5cb5a5833

The following commit(s) were added to refs/heads/main by this push:
     new b2959bb5e IDP-1887 - Repurpose authn flow for alternative uses
b2959bb5e is described below

commit b2959bb5e13dfd95b26bf9073132c6e5cb5a5833
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Dec 13 17:11:55 2021 -0500

    IDP-1887 - Repurpose authn flow for alternative uses
    
    https://shibboleth.atlassian.net/browse/IDP-1887
---
 .../resources/net/shibboleth/idp/flows/authn/authn-beans.xml     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
index 8bc728f50..c6329a9cf 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
@@ -18,10 +18,16 @@
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     
+    <bean id="PotentialFlowsLookup" parent="shibboleth.ContextFunctions.Expression"
+        p:customObject-ref="shibboleth.AuthenticationFlowDescriptorManager"
+        c:outputType="#{T(java.util.Collection)}"
+        c:expression="#input.getSubcontext(T(net.shibboleth.idp.profile.context.SpringRequestContext)).getRequestContext().getFlowScope().get('potentialFlows') ?:
+            #custom.getComponents().?[id matches 'authn/(' + '%{idp.authn.flows:Password}'.trim() + ')']" />
+    
     <bean id="PopulateAuthenticationContext"
         class="net.shibboleth.idp.authn.impl.PopulateAuthenticationContext" scope="prototype"
         p:availableFlows="#{@'shibboleth.AuthenticationFlowDescriptorManager'.getComponents()}"
-        p:potentialFlows="#{@'shibboleth.AuthenticationFlowDescriptorManager'.getComponents().?[id matches 'authn/(' + '%{idp.authn.flows:Password}'.trim() + ')']}"
+        p:potentialFlowsLookupStrategy-ref="PotentialFlowsLookup"
         p:principalEvalPredicateFactoryRegistry-ref="shibboleth.AuthnComparisonRegistry"
         p:fixedEventLookupStrategy="#{getObject('shibboleth.FixedAuthenticationEventStrategy')}" />
 
@@ -65,6 +71,7 @@
     
     <bean id="DetectIdentitySwitch"
         class="net.shibboleth.idp.session.impl.DetectIdentitySwitch" scope="prototype"
+        p:activationCondition="%{idp.session.enabled:true}"
         p:sessionManager-ref="shibboleth.SessionManager" />
     
     <bean id="IdentitySwitchIsError" class="java.lang.Boolean">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.