[java-shib-profile] branch main updated: JSPROF-17 - BaseCriteriaRelyingPartyConfigurationResolver issue

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-shib-profile.

View the commit online:
https://codeberg.org/Shibboleth/java-shib-profile/commit/07eb14413c950f999496038f535bc9ede9eef0eb

The following commit(s) were added to refs/heads/main by this push:
     new 07eb144  JSPROF-17 - BaseCriteriaRelyingPartyConfigurationResolver issue
07eb144 is described below

commit 07eb14413c950f999496038f535bc9ede9eef0eb
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Mon Oct 12 13:50:11 2026 -0400

    JSPROF-17 - BaseCriteriaRelyingPartyConfigurationResolver issue
    
    https://shibboleth.atlassian.net/browse/JSPROF-17
    
    Check for an existing VPC and copy that if found.
---
 .../impl/BaseCriteriaRelyingPartyConfigurationResolver.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/BaseCriteriaRelyingPartyConfigurationResolver.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/BaseCriteriaRelyingPartyConfigurationResolver.java
index b42fc9d..e34d05a 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/BaseCriteriaRelyingPartyConfigurationResolver.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/BaseCriteriaRelyingPartyConfigurationResolver.java
@@ -124,11 +124,16 @@ public abstract class BaseCriteriaRelyingPartyConfigurationResolver<ReturnType>
         // calling "context" is that metadata is required to operate.
         
         // So we supplant what we're creating here by also adding in the expected Criterion if we spot
-        // the verified flag set in the input tree, much as happens if we created it below.
+        // the verified flag set in the input tree, much as happens if we created it below. We don't
+        // do this is there's already a VPC input, we just copy it then.
         
-        final RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class);
-        if (rpc != null && rpc.isVerified()) {
-            prcSet.add(new VerifiedProfileCriterion(true));
+        if (criteria != null && criteria.contains(VerifiedProfileCriterion.class)) {
+            prcSet.add(criteria.get(VerifiedProfileCriterion.class));
+        } else {
+            final RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class);
+            if (rpc != null && rpc.isVerified()) {
+                prcSet.add(new VerifiedProfileCriterion(true));
+            }
         }
         
         try (final ServiceableComponent<RelyingPartyConfigurationResolver> resolver =

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