[java-identity-provider] branch main updated: IDP-2023 - Remove extended flow feature from password login flow

[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=89e3b612a2c3f16ce76f3e4d6c3269bd20769ade

The following commit(s) were added to refs/heads/main by this push:
     new 89e3b612a IDP-2023 - Remove extended flow feature from password login flow
89e3b612a is described below

commit 89e3b612a2c3f16ce76f3e4d6c3269bd20769ade
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 13 15:57:11 2022 -0400

    IDP-2023 - Remove extended flow feature from password login flow
    
    https://shibboleth.atlassian.net/browse/IDP-2023
---
 .../idp/flows/authn/password-authn-beans.xml       |  6 -----
 .../idp/flows/authn/password-authn-flow.xml        | 31 +---------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
index 7a466ec86..4cb020d13 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
@@ -57,11 +57,6 @@
     <bean id="ExtractUsernamePasswordFromBasicAuth"
         class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromBasicAuth" scope="prototype"
         p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
-
-    <bean id="PreserveAuthenticationFlowState"
-        class="net.shibboleth.idp.authn.impl.PreserveAuthenticationFlowState" scope="prototype"
-        p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
-        p:parameterNames="#{getObject('shibboleth.authn.Password.ExtendedFlowParameters')}" />
     
     <bean id="ExtractUsernamePasswordFromFormRequest"
         class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromFormRequest" scope="prototype"
@@ -82,7 +77,6 @@
         p:requireAll="#{getObject('shibboleth.authn.Password.RequireAll') ?: %{idp.authn.Password.requireAll:false}}"
         p:validators="#{getObject('shibboleth.authn.Password.Validators') ?: getObject('ValidateUsernamePassword')}"
         p:addDefaultPrincipals-ref="shibboleth.authn.Password.addDefaultPrincipals"
-        p:supportedPrincipals="#{getObject('shibboleth.authn.Password.PrincipalOverride')}"
         p:classifiedMessages="#{getObject('shibboleth.authn.Password.ClassifiedMessageMap')}"
         p:resultCachingPredicate="#{getObject('shibboleth.authn.Password.resultCachingPredicate')}"
         p:cleanupHook="#{getObject('shibboleth.authn.Password.RemoveAfterValidation') == true ? getObject('DefaultCleanupHook') : null}"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-flow.xml
index 7fa95fff9..0d1ae192e 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-flow.xml
@@ -21,9 +21,6 @@
         
         <transition on="NoCredentials" to="DisplayUsernamePasswordPage" />
         <transition on="InvalidCredentials" to="DisplayUsernamePasswordPage" />
-        <on-exit>
-            <set name="thisFlow" value="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).getAttemptedFlow()" />
-        </on-exit>
     </action-state>
     
     <view-state id="DisplayUsernamePasswordPage" view="login">
@@ -31,8 +28,6 @@
             <evaluate expression="environment" result="viewScope.environment" />
             <evaluate expression="opensamlProfileRequestContext" result="viewScope.profileRequestContext" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext))" result="viewScope.authenticationContext" />
-            <evaluate expression="authenticationContext.getPotentialFlows().values().?[id matches 'authn/(' + (flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.authn.Password.ExtendedFlows') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.Password.ExtendedFlows').trim() : '') + ')']" result="viewScope.extendedAuthenticationFlows" />
-            <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.authn.Password.PrincipalOverride') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.Password.PrincipalOverride') : null" result="viewScope.passwordPrincipals" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.ui.context.RelyingPartyUIContext))" result="viewScope.rpUIContext" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationErrorContext))" result="viewScope.authenticationErrorContext" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationWarningContext))" result="viewScope.authenticationWarningContext" />
@@ -43,37 +38,13 @@
             <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.CustomViewContext') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext') : null" result="viewScope.custom" />
         </on-render>
 
-        <transition on="proceed" to="ExtractUsernamePasswordFromFormRequest">
-            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).setAttemptedFlow(thisFlow)" />
-        </transition>
-        <transition on="#{currentEvent.id.startsWith('authn/')}" to="PreserveAuthenticationFlowState">
-            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).setAttemptedFlow(authenticationContext.getPotentialFlows().get(currentEvent.id))" />
-        </transition>
+        <transition on="proceed" to="ExtractUsernamePasswordFromFormRequest" />
 
         <on-exit>
             <evaluate expression="opensamlProfileRequestContext.addSubcontext(new net.shibboleth.idp.consent.context.ConsentManagementContext(), true).setRevokeConsent(requestParameters._shib_idp_revokeConsent == 'true')" />
         </on-exit>
     </view-state>
     
-    <action-state id="PreserveAuthenticationFlowState">
-        <on-entry>
-            <evaluate expression="T(net.shibboleth.shared.primitive.DeprecationSupport).warnOnce(T(net.shibboleth.shared.primitive.DeprecationSupport.ObjectType).CONFIGURATION, 'Extended Flow', null, 'MFA login flow')" />
-        </on-entry>
-        <evaluate expression="PreserveAuthenticationFlowState" />
-        <evaluate expression="'proceed'" />
-        
-        <transition on="proceed" to="CallExtendedFlow" />
-    </action-state>
-    
-    <subflow-state id="CallExtendedFlow" subflow="#{opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).getAttemptedFlow().getId()}">
-        <input name="calledAsSubflow" value="true" />
-        <input name="calledAsExtendedFlow" value="true" />
-        <transition on="proceed" to="proceed" />
-        <transition to="DisplayUsernamePasswordPage">
-            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).getIntermediateFlows().put(opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).getAttemptedFlow().getId(), opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).getAttemptedFlow())" />
-        </transition>
-    </subflow-state>
-    
     <action-state id="ExtractUsernamePasswordFromFormRequest">
         <evaluate expression="ExtractUsernamePasswordFromFormRequest" />
         <evaluate expression="'proceed'" />

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