[java-identity-provider] branch maint-4 updated: IDP-1995 - Add support for DateTimeAttributeValue to supporting classes

[Scott Cantor]

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

scantor pushed a commit to branch maint-4
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=9d0e586fa88376b80004351377f98baacf2e116d

The following commit(s) were added to refs/heads/maint-4 by this push:
     new 9d0e586fa IDP-1995 - Add support for DateTimeAttributeValue to supporting classes
9d0e586fa is described below

commit 9d0e586fa88376b80004351377f98baacf2e116d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Aug 18 09:14:51 2022 -0400

    IDP-1995 - Add support for DateTimeAttributeValue to supporting classes
    
    https://shibboleth.atlassian.net/browse/IDP-1995
    
    Revocation condition.
---
 .../java/net/shibboleth/idp/attribute/DateTimeAttributeValue.java    | 2 +-
 .../idp/authn/revocation/impl/AttributeRevocationCondition.java      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/DateTimeAttributeValue.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/DateTimeAttributeValue.java
index d0c509eae..55a05ccb6 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/DateTimeAttributeValue.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/DateTimeAttributeValue.java
@@ -68,7 +68,7 @@ public class DateTimeAttributeValue implements IdPAttributeValue {
     /** Return the value.
      * @return the value
      */
-    @Nonnull @NotEmpty public final Instant getValue() {
+    @Nonnull public final Instant getValue() {
         return value;
     }
 
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java
index 311cd28e4..e4cfa00bc 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java
@@ -33,6 +33,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.idp.attribute.DateTimeAttributeValue;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -185,7 +186,9 @@ public class AttributeRevocationCondition extends AbstractInitializableComponent
             if (resolutionContext.getResolvedIdPAttributes().containsKey(attributeId)) {
                 for (final IdPAttributeValue value :
                         resolutionContext.getResolvedIdPAttributes().get(attributeId).getValues()) {
-                    if (value instanceof StringAttributeValue) {
+                    if (value instanceof DateTimeAttributeValue) {
+                        records.add(((DateTimeAttributeValue) value).getValue());
+                    } else if (value instanceof StringAttributeValue) {
                         try {
                             records.add(Instant.ofEpochSecond(Long.valueOf(((StringAttributeValue) value).getValue())));
                             

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