Updated regex in RbacKeys.java to be used for UserAdmin Permissions a…

…nd added a test pattern.
corda · Jul 4, 2024 · f2f0e82 · f2f0e82
1 parent 1b1128d
commit f2f0e82
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/data/rbac-schema/src/main/java/net/corda/rbac/schema/RbacKeys.java b/data/rbac-schema/src/main/java/net/corda/rbac/schema/RbacKeys.java
@@ -58,7 +58,7 @@ private RbacKeys() {
     /**
      * User property key and value regex.
      */
-    public static final String PROPERTY_KEY_VALUE_REGEX = "[_a-zA-Z0-9]{1,255}";
+    public static final String PROPERTY_KEY_VALUE_REGEX = "[-._a-zA-Z0-9]{1,255}";
 
     /**
      * CPI file checksum.

diff --git a/data/rbac-schema/src/test/kotlin/net/corda/rbac/schema/TestPatternsMatch.kt b/data/rbac-schema/src/test/kotlin/net/corda/rbac/schema/TestPatternsMatch.kt
@@ -1,22 +1,6 @@
 package net.corda.rbac.schema
 
-import net.corda.rbac.schema.RbacKeys.ALIAS_REGEX
-import net.corda.rbac.schema.RbacKeys.CERTIFICATE_USAGE_REGEX
-import net.corda.rbac.schema.RbacKeys.CLIENT_REQ_REGEX
-import net.corda.rbac.schema.RbacKeys.CPI_FILE_CHECKSUM_REGEX
-import net.corda.rbac.schema.RbacKeys.FLOW_NAME_REGEX
-import net.corda.rbac.schema.RbacKeys.FLOW_STATE_REGEX
-import net.corda.rbac.schema.RbacKeys.HSM_CATEGORY_REGEX
-import net.corda.rbac.schema.RbacKeys.KEY_ID_REGEX
-import net.corda.rbac.schema.RbacKeys.KEY_SCHEME_REGEX
-import net.corda.rbac.schema.RbacKeys.OPTIONAL_QUERY_PARAMETER
-import net.corda.rbac.schema.RbacKeys.TENANT_ID_REGEX
-import net.corda.rbac.schema.RbacKeys.USER_REGEX
-import net.corda.rbac.schema.RbacKeys.USER_URL_REGEX
-import net.corda.rbac.schema.RbacKeys.UUID_REGEX
-import net.corda.rbac.schema.RbacKeys.VNODE_SHORT_HASH_REGEX
-import net.corda.rbac.schema.RbacKeys.VNODE_STATE_REGEX
-import net.corda.rbac.schema.RbacKeys.VNODE_STATUS_REQ_REGEX
+import net.corda.rbac.schema.RbacKeys.*
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
@@ -81,6 +65,14 @@ class TestPatternsMatch {
         assertFalse(wildcardMatch("0", USER_URL_REGEX))
     }
 
+    @Test
+    fun testPropertyKeyValue() {
+        val validPropertyKey = "My_Property-key.1"
+
+        assertTrue(wildcardMatch(validPropertyKey, PROPERTY_KEY_VALUE_REGEX))
+        assertFalse(wildcardMatch("Invalid@", PROPERTY_KEY_VALUE_REGEX))
+    }
+
     @Test
     fun testCPIFileChecksum() {
         val validChecksum = "ABCDEF123456"