[java-identity-provider] branch main updated: IDP-2330 - Hook for populating group ID in attribute resolution context

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

The following commit(s) were added to refs/heads/main by this push:
     new c02a1b5bb IDP-2330 - Hook for populating group ID in attribute resolution context
c02a1b5bb is described below

commit c02a1b5bbd3ac4a4dd488c05281861e69f7b3111
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jun 11 14:37:28 2025 -0400

    IDP-2330 - Hook for populating group ID in attribute resolution context
    
    https://shibboleth.atlassian.net/browse/IDP-2330
    
    Avoid stomping a null on the field if the profile setting is null.
    Addresses existing OP plugin behavior with sector_id.
---
 .../main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
index 818f5f2b7..19b6f752a 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
@@ -339,7 +339,10 @@ public final class ResolveAttributes extends AbstractProfileAction {
         // Check for profile config to drive group ID determination.
         final RelyingPartyContext rpContext = profileRequestContext.getSubcontext(RelyingPartyContext.class);
         if (rpContext != null && rpContext.getProfileConfig() instanceof AttributeResolvingProfileConfiguration arpc) {
-            resolutionContext.setAttributeRecipientGroupID(arpc.getAttributeRecipientGroupID(profileRequestContext));
+            final String groupId = arpc.getAttributeRecipientGroupID(profileRequestContext);
+            if (groupId != null) {
+                resolutionContext.setAttributeRecipientGroupID(groupId);
+            }
         }
     }
     

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