allow % character in tag value

Signed-off-by: craman <[email protected]>
AthenZ · Oct 24, 2024 · 0472409 · 0472409
1 parent 349dea9
commit 0472409
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/clients/go/zms/zms_schema.go b/clients/go/zms/zms_schema.go
diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/ZMSSchema.java b/core/zms/src/main/java/com/yahoo/athenz/zms/ZMSSchema.java
@@ -94,11 +94,11 @@ private static Schema build() {
 
         sb.stringType("TagValue")
             .comment("TagValue to contain generic string patterns")
-            .pattern("[a-zA-Z0-9_:,\\/][a-zA-Z0-9_:,\\/-]*");
+            .pattern("[a-zA-Z0-9_:,\\/][a-zA-Z0-9_:%,\\/-]*");
 
         sb.stringType("TagCompoundValue")
             .comment("A compound value of TagValue")
-            .pattern("([a-zA-Z0-9_:,\\/][a-zA-Z0-9_:,\\/-]*\\.)*[a-zA-Z0-9_:,\\/][a-zA-Z0-9_:,\\/-]*");
+            .pattern("([a-zA-Z0-9_:,\\/][a-zA-Z0-9_:%,\\/-]*\\.)*[a-zA-Z0-9_:,\\/][a-zA-Z0-9_:%,\\/-]*");
 
         sb.structType("TagValueList")
             .arrayField("list", "TagCompoundValue", false, "list of tag values");

diff --git a/core/zms/src/main/rdl/Names.tdl b/core/zms/src/main/rdl/Names.tdl
@@ -73,7 +73,7 @@ type AuthorityKeywords String (pattern="({AuthorityKeyword},)*{AuthorityKeyword}
 type TagKey String (pattern="({SimpleName}[:\\.])*{SimpleName}");
 
 //TagValue to contain generic string patterns
-type TagValue String (pattern="[a-zA-Z0-9_:,\\/][a-zA-Z0-9_:,\\/-]*");
+type TagValue String (pattern="[a-zA-Z0-9_:,\\/][a-zA-Z0-9_:%,\\/-]*");
 
 //A compound value of TagValue
 type TagCompoundValue String (pattern="({TagValue}\\.)*{TagValue}");

diff --git a/core/zms/src/test/java/com/yahoo/athenz/zms/ZMSCoreTest.java b/core/zms/src/test/java/com/yahoo/athenz/zms/ZMSCoreTest.java
@@ -2707,6 +2707,10 @@ public void testTagValueList() {
         tvl = new TagValueList().setList(Collections.singletonList("/homes/home/"));
         resultTvl = validator.validate(tvl, "TagValueList");
         assertTrue(resultTvl.valid);
+
+        tvl = new TagValueList().setList(Collections.singletonList("/home%test"));
+        resultTvl = validator.validate(tvl, "TagValueList");
+        assertTrue(resultTvl.valid);
     }
 
     private UserAuthorityAttributeMap getUserAuthorityAttributeMapForTest() {