[java-identity-provider] 02/03: IDP-1121 IDP-1472 Use common method for disallowed names

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-identity-provider.

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

commit 24048217cb526d2c434d313aac830c4a56fc8fd2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jun 27 10:56:10 2019 +0100

    IDP-1121 IDP-1472  Use common method for disallowed names
    
    https://issues.shibboleth.net/jira/browse/IDP-1121
    https://issues.shibboleth.net/jira/browse/IDP-1472
---
 .../java/net/shibboleth/idp/attribute/IdPAttribute.java     |  2 +-
 .../idp/attribute/resolver/AbstractAttributeDefinition.java | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java
index 8906a0b..16cc212 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java
@@ -78,7 +78,7 @@ public class IdPAttribute implements Comparable<IdPAttribute>, Cloneable {
     public IdPAttribute(@Nonnull @NotEmpty @ParameterName(name="attributeId") final String attributeId) {
 
         id = Constraint.isNotNull(StringSupport.trimOrNull(attributeId), "Attribute ID may not be null");
-        Constraint.isTrue(id.indexOf(' ') < 0, "Attribute ID must not have spaces");
+        Constraint.isFalse(isInvalidId(id), "Attribute ID must not have spaces");
         
         displayNames = Collections.emptyMap();
         displayDescriptions = Collections.emptyMap();
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
index 96e4c79..e96a120 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
@@ -17,12 +17,13 @@
 
 package net.shibboleth.idp.attribute.resolver;
 
-import java.util.regex.Pattern;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
@@ -32,9 +33,6 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /** Base class for attribute definition resolver plugins. */
 @ThreadSafe
 public abstract class AbstractAttributeDefinition extends AbstractResolverPlugin<IdPAttribute> implements
@@ -83,10 +81,9 @@ public abstract class AbstractAttributeDefinition extends AbstractResolverPlugin
         // The Id is now definitive. Just in case it was used prior to that, reset the getPrefixCache
         logPrefix = null;
         
-        if (!Pattern.matches("\\S*", getId())) {
+        if (IdPAttribute.isInvalidId(getId())) {
             throw new ComponentInitializationException(
-                    "Attributes Definitions must not have spaces in them (" + getId() + ")");
-            
+                    "Invalid Attribute Definitions name (" + getId() + ")");
         }
     }
 

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