Only add split segments valid numeric indexes (#805)

smallrye · Aug 29, 2022 · f7ac9b2 · f7ac9b2
1 parent 338f921
commit f7ac9b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/implementation/src/main/java/io/smallrye/config/KeyMap.java b/implementation/src/main/java/io/smallrye/config/KeyMap.java
@@ -211,7 +211,7 @@ private KeyMap<V> getNext(final String seg) {
             return getOrCreateAny();
         } else if (seg.endsWith("]")) {
             int begin = seg.lastIndexOf('[');
-            if (begin != -1) {
+            if (begin != -1 && isValidIndex(seg, begin)) {
                 String index = seg.substring(begin + 1, seg.length() - 1);
                 String name = seg.substring(0, begin);
                 KeyMap<V> next;

diff --git a/implementation/src/test/java/io/smallrye/config/KeyMapTest.java b/implementation/src/test/java/io/smallrye/config/KeyMapTest.java
@@ -202,7 +202,9 @@ void putAllAny() {
     void map() {
         KeyMap<String> map = new KeyMap<>();
         map.findOrAdd("map.roles.*[*]").putRootValue("foo");
+        map.findOrAdd("map.threadpool.config[customPool].id").putRootValue("customPool");
 
         assertEquals("foo", map.findRootValue("map.roles.user[0]"));
+        assertEquals("customPool", map.findRootValue("map.threadpool.config[customPool].id"));
     }
 }