Even tighter check

danielmitterdorfer · Jul 17, 2023 · 9d3d546 · 9d3d546
1 parent a67f281
commit 9d3d546
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...plugin/profiler/src/main/java/org/elasticsearch/xpack/profiler/ProfilingIndexManager.java b/...plugin/profiler/src/main/java/org/elasticsearch/xpack/profiler/ProfilingIndexManager.java
@@ -354,7 +354,13 @@ public ProfilingIndex withGeneration(String generation) {
         }
 
         public boolean isMatchWithoutVersion(String indexName) {
-            return indexName.startsWith("." + namePrefix + "-v");
+            String expectedPrefix = "." + namePrefix + "-v";
+            return indexName.startsWith(expectedPrefix) && isVersionNumber(indexName, expectedPrefix.length());
+        }
+
+        private boolean isVersionNumber(String name, int startIndex) {
+            final int versionNumberLength = 3;
+            return name.substring(startIndex, startIndex + versionNumberLength).chars().allMatch(Character::isDigit);
         }
 
         public boolean isMatchWithoutGeneration(String indexName) {

diff --git a/...n/profiler/src/test/java/org/elasticsearch/xpack/profiler/ProfilingIndexManagerTests.java b/...n/profiler/src/test/java/org/elasticsearch/xpack/profiler/ProfilingIndexManagerTests.java
@@ -231,6 +231,7 @@ public void testIndexMatchWithoutVersion() {
         ProfilingIndexManager.ProfilingIndex idx = ProfilingIndexManager.ProfilingIndex.kv("profiling-test", 1);
         assertTrue(idx.isMatchWithoutVersion(".profiling-test-v002"));
         assertFalse(idx.isMatchWithoutVersion(".profiling-testing-v001"));
+        assertFalse(idx.isMatchWithoutVersion(".profiling-test-verbose"));
     }
 
     private ActionResponse verifyIndexInstalled(