[java-identity-provider] branch main updated: IDP-2187 - Authn-related beans defined in global.xml not always honored

[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=c6ff89e6e9052f3e47a2d952f276fbf33772dcb7

The following commit(s) were added to refs/heads/main by this push:
     new c6ff89e6e IDP-2187 - Authn-related beans defined in global.xml not always honored
c6ff89e6e is described below

commit c6ff89e6e9052f3e47a2d952f276fbf33772dcb7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Oct 23 09:47:14 2023 -0400

    IDP-2187 - Authn-related beans defined in global.xml not always honored
    
    https://shibboleth.atlassian.net/browse/IDP-2187
    
    External interceptor also impacted.
---
 .../resources/net/shibboleth/idp/flows/intercept/external-beans.xml     | 2 +-
 .../main/resources/net/shibboleth/idp/flows/intercept/external-flow.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
index 955365847..34133201f 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
@@ -13,7 +13,7 @@
        default-destroy-method="destroy">
 
     <!-- Default strategy function to obtain the external path. -->
-    <bean id="shibboleth.intercept.externalPathStrategy" parent="shibboleth.Functions.Constant"
+    <bean id="DefaultExternalPathStrategy" parent="shibboleth.Functions.Constant"
         c:target="#{getObject('shibboleth.intercept.externalPath') ?: '%{idp.intercept.External.externalPath:contextRelative:intercept.jsp}'.trim()}" />
 
     <!-- Legacy compatibility. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-flow.xml
index 5c9608020..891028ed3 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-flow.xml
@@ -8,7 +8,7 @@
 
     <!-- This is an interceptor flow handled outside the webflow engine. -->
     
-    <view-state id="ExternalTransfer" view="externalRedirect:#{T(net.shibboleth.idp.profile.interceptor.ExternalInterceptor).getExternalRedirect(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.intercept.externalPathStrategy').apply(opensamlProfileRequestContext), flowExecutionContext.getKey().toString())}">
+    <view-state id="ExternalTransfer" view="externalRedirect:#{T(net.shibboleth.idp.profile.interceptor.ExternalInterceptor).getExternalRedirect((flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.intercept.externalPathStrategy') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.intercept.externalPathStrategy') : flowRequestContext.getActiveFlow().getApplicationContext().getBean('DefaultExternalPathStrategy')).apply(opensaml [...]
         <attribute name="csrf_excluded" value="true" type="boolean"/>
         <on-render>
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.profile.context.ProfileInterceptorContext)).addSubcontext(new net.shibboleth.idp.profile.context.ExternalInterceptorContext(new net.shibboleth.idp.profile.interceptor.impl.ExternalInterceptorImpl()), true).setFlowExecutionUrl(flowExecutionUrl + '&_eventId_proceed=1')" />

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