remove : from allowed chars

rundeck · May 24, 2021 · b89a08c · b89a08c
1 parent 544e16b
commit b89a08c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/rd-api-client/src/main/java/org/rundeck/client/util/Format.java b/rd-api-client/src/main/java/org/rundeck/client/util/Format.java
@@ -35,7 +35,7 @@ public static String format(String format, DataOutput data, final String start,
     }
 
     public static String format(String format, Map<?, ?> data, final String start, final String end) {
-        Pattern pat = Pattern.compile(Pattern.quote(start) + "([\\w.:_-]+)" + Pattern.quote(end));
+        Pattern pat = Pattern.compile(Pattern.quote(start) + "([\\w._-]+)" + Pattern.quote(end));
         Matcher matcher = pat.matcher(format);
         StringBuffer sb = new StringBuffer();
         while (matcher.find()) {

diff --git a/rd-cli-tool/src/test/groovy/org/rundeck/client/util/FormatSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/util/FormatSpec.groovy
@@ -39,7 +39,6 @@ class FormatSpec extends Specification {
         '%'   | ''  | 'a %b %c'     | [b: '\\x'] | 'a \\x '
         '%'   | ''  | 'a %b-x q'    | ['b-x': 'z'] | 'a z q'
         '%'   | ''  | 'a %b_x r'    | ['b_x': 'z'] | 'a z r'
-        '%'   | ''  | 'a %b:x r'    | ['b:x': 'z'] | 'a z r'
 
     }
 
@@ -58,7 +57,6 @@ class FormatSpec extends Specification {
         '%'   | ''  | '%a.b b c'     | [a: 'x', b: [c: 'd']] | ' b c'
         '%'   | ''  | '%b.c-d q r'     | [a: 'x', b: ['c-d': 'e']] | 'e q r'
         '%'   | ''  | '%b.c_d q r'     | [a: 'x', b: ['c_d': 'e']] | 'e q r'
-        '%'   | ''  | '%b.c:d q r'     | [a: 'x', b: ['c:d': 'e']] | 'e q r'
 
     }
 }