[java-identity-provider] branch main updated: Fix build

[Rod Widdowson]

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

rdw 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=4f24c945f7729a4faebd4649f9e1e59d09b6216d

The following commit(s) were added to refs/heads/main by this push:
     new 4f24c945f Fix build
4f24c945f is described below

commit 4f24c945f7729a4faebd4649f9e1e59d09b6216d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Apr 22 14:04:45 2025 +0100

    Fix build
---
 .../shibboleth/idp/authn/impl/ValidateExternalAuthentication.java   | 6 +++---
 .../main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java | 6 ++++--
 .../idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java     | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
index 9001c0556..7de0c6c74 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
@@ -373,7 +373,7 @@ public class ValidateExternalAuthentication extends AbstractAuditingValidationAc
 
         if (attributeFilterService == null) {
             log.warn("{} No AttributeFilter service provided, clearing inbound attributes", getLogPrefix());
-            ac.setIdPAttributes(null);
+            ac.setIdPAttributes((Map<String, IdPAttribute>)null);
             return;
         }
         final AttributeFilterContext filterContext = localExtContext.ensureSubcontext(AttributeFilterContext.class);
@@ -388,10 +388,10 @@ public class ValidateExternalAuthentication extends AbstractAuditingValidationAc
             ac.setIdPAttributes(filterContext.getFilteredIdPAttributes().values());
         } catch (final AttributeFilterException e) {
             log.error("{} Error while filtering inbound attributes", getLogPrefix(), e);
-            ac.setIdPAttributes(null);
+            ac.setIdPAttributes((Map<String, IdPAttribute>)null);
         } catch (final ServiceException e) {
             log.error("{} Invalid AttributeFilter configuration", getLogPrefix(), e);
-            ac.setIdPAttributes(null);
+            ac.setIdPAttributes((Map<String, IdPAttribute>)null);
         }
     }
     
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
index e43b6dc39..14e6c725d 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
@@ -14,6 +14,7 @@
 
 package net.shibboleth.idp.profile.impl;
 
+import java.util.Map;
 import java.util.function.Function;
 
 import javax.annotation.Nonnull;
@@ -30,6 +31,7 @@ import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.slf4j.Logger;
 
+import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.context.AttributeContext;
 import net.shibboleth.idp.attribute.filter.AttributeFilter;
 import net.shibboleth.idp.attribute.filter.AttributeFilterException;
@@ -377,7 +379,7 @@ public class FilterAttributes extends AbstractProfileAction {
             log.error("{} Unable to locate or create AttributeFilterContext", getLogPrefix());
             if (maskFailures) {
                 log.warn("Filter error masked, clearing resolved attributes");
-                attributeContext.setIdPAttributes(null);
+                attributeContext.setIdPAttributes((Map<String, IdPAttribute>)null);
             } else {
                 ActionSupport.buildEvent(profileRequestContext, IdPEventIds.UNABLE_FILTER_ATTRIBS);
             }
@@ -403,7 +405,7 @@ public class FilterAttributes extends AbstractProfileAction {
             log.error("{} Invalid Attribute Filter service configuration", getLogPrefix(), e);
             if (maskFailures) {
                 log.warn("Filter error masked, clearing resolved attributes");
-                attributeContext.setIdPAttributes(null);
+                attributeContext.setIdPAttributes((Map<String, IdPAttribute>)null);
             } else {
                 ActionSupport.buildEvent(profileRequestContext, IdPEventIds.UNABLE_FILTER_ATTRIBS);
             }
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
index 5e05de843..0b3377d5a 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
@@ -19,6 +19,7 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -515,7 +516,7 @@ public class ValidateSAMLAuthentication extends AbstractValidationAction {
             assert rpCtx != null;
             final AttributeContext ac = attributeContext = rpCtx.ensureSubcontext(AttributeContext.class);
             ac.setUnfilteredIdPAttributes(mapped.values());
-            ac.setIdPAttributes(null);
+            ac.setIdPAttributes((Map<String, IdPAttribute>)null);
             filterAttributes(profileRequestContext);
         }
     }

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