[java-identity-provider] branch main updated: IDP-2358 - Consent condition on back-channel flows invoked incorrectly

[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=36a992abb8f3a7ad7bd4aa2e68f047a0e0b729d4

The following commit(s) were added to refs/heads/main by this push:
     new 36a992abb IDP-2358 - Consent condition on back-channel flows invoked incorrectly
36a992abb is described below

commit 36a992abb8f3a7ad7bd4aa2e68f047a0e0b729d4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 12 14:59:47 2025 -0500

    IDP-2358 - Consent condition on back-channel flows invoked incorrectly
    
    https://shibboleth.atlassian.net/browse/IDP-2358
---
 .../resources/net/shibboleth/idp/flows/cas/validate-abstract-flow.xml   | 2 +-
 .../net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml        | 2 +-
 .../net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-abstract-flow.xml
index 3902362f3..d4425e9d0 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-abstract-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-abstract-flow.xml
@@ -78,7 +78,7 @@
     </action-state>
 
     <decision-state id="CheckConsentCondition">
-        <if test="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.consent.AttributeQuery.Condition') and flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.consent.AttributeQuery.Condition').apply(opensamlProfileRequestContext)"
+        <if test="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.consent.AttributeQuery.Condition') and flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.consent.AttributeQuery.Condition').test(opensamlProfileRequestContext)"
             then="ConsentSetup" else="PopulateOutboundInterceptContext" />
     </decision-state>
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml
index e8ebfb9a5..93a86f2b7 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml
@@ -28,7 +28,7 @@
     </action-state>
 
     <decision-state id="CheckConsentCondition">
-        <if test="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.consent.AttributeQuery.Condition') and flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.consent.AttributeQuery.Condition').apply(opensamlProfileRequestContext)"
+        <if test="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.consent.AttributeQuery.Condition') and flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.consent.AttributeQuery.Condition').test(opensamlProfileRequestContext)"
             then="ConsentSetup" else="ContinueProfileWork" />
     </decision-state>
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml
index 0f9b1df94..93a0a14c0 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml
@@ -27,7 +27,7 @@
     </action-state>
 
     <decision-state id="CheckConsentCondition">
-        <if test="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.consent.AttributeQuery.Condition') and flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.consent.AttributeQuery.Condition').apply(opensamlProfileRequestContext)"
+        <if test="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.consent.AttributeQuery.Condition') and flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.consent.AttributeQuery.Condition').test(opensamlProfileRequestContext)"
             then="ConsentSetup" else="ContinueProfileWork" />
     </decision-state>
 

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