Support glob pattern for URIs with '/' as boundary

2 files changed, 11 insertions, 15 deletions

diff --git a/security-utils/src/main/java/com/yahoo/security/tls/policy/RequiredPeerCredential.java b/security-utils/src/main/java/com/yahoo/security/tls/policy/RequiredPeerCredential.java
index 3bdc35c6a2f..4c96a2935f8 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/policy/RequiredPeerCredential.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/policy/RequiredPeerCredential.java
@@ -28,7 +28,7 @@ public class RequiredPeerCredential {
             case SAN_DNS:
                 return new HostGlobPattern(pattern);
             case SAN_URI:
-                return new UriPattern(pattern);
+                return new UriGlobPattern(pattern);
             default:
                 throw new IllegalArgumentException("Unknown field: " + field);
         }
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/policy/UriPattern.java b/security-utils/src/main/java/com/yahoo/security/tls/policy/UriGlobPattern.java
index 7c36244d781..006ca83a403 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/policy/UriPattern.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/policy/UriGlobPattern.java
@@ -8,26 +8,22 @@ import java.util.Objects;
  *
  * @author bjorncs
  */
-class UriPattern implements RequiredPeerCredential.Pattern {
+class UriGlobPattern implements RequiredPeerCredential.Pattern {
 
-    private final String pattern;
+    private final GlobPattern globPattern;
 
-    UriPattern(String pattern) {
-        this.pattern = pattern;
+    UriGlobPattern(String globPattern) {
+        this.globPattern = new GlobPattern(globPattern, new char[] {'/'});
     }
 
-    @Override public String asString() { return pattern; }
+    @Override public String asString() { return globPattern.asString(); }
 
-    @Override
-    public boolean matches(String fieldValue) {
-        // Only exact match is supported (unlike for host names)
-        return fieldValue.equals(pattern);
-    }
+    @Override public boolean matches(String fieldValue) { return globPattern.matches(fieldValue); }
 
     @Override
     public String toString() {
         return "UriPattern{" +
-                "pattern='" + pattern + '\'' +
+                "pattern='" + globPattern + '\'' +
                 '}';
     }
 
@@ -35,12 +31,12 @@ class UriPattern implements RequiredPeerCredential.Pattern {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        UriPattern that = (UriPattern) o;
-        return Objects.equals(pattern, that.pattern);
+        UriGlobPattern that = (UriGlobPattern) o;
+        return Objects.equals(globPattern, that.globPattern);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(pattern);
+        return Objects.hash(globPattern);
     }
 }