Cleanup and added regex validation

Signed-off-by: scottselikoff <scott@selikoff.net>
prometheus · Dec 23, 2022 · b425a01 · b425a01
1 parent 73aee9c
commit b425a01
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/collector/src/main/java/io/prometheus/jmx/JmxCollector.java b/collector/src/main/java/io/prometheus/jmx/JmxCollector.java
@@ -24,6 +24,7 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 import static java.lang.String.format;
 
@@ -209,8 +210,14 @@ private Config loadConfig(Map<String, Object> yamlConfig) throws MalformedObject
         }
 
         if (yamlConfig.containsKey("collectorNamePattern")) {
-            cfg.collectorNamePattern = (String)yamlConfig.get("collectorNamePattern");
-          }
+        	final String pattern = (String)yamlConfig.get("collectorNamePattern");
+            try {
+            	Pattern.compile(pattern);
+                cfg.collectorNamePattern = pattern;
+            } catch (PatternSyntaxException e) {
+            	throw new IllegalArgumentException("Invalid collectNamePattern regular expression: " + pattern);
+            }
+        }
 
       if (yamlConfig.containsKey("rules")) {
           List<Map<String,Object>> configRules = (List<Map<String,Object>>) yamlConfig.get("rules");

diff --git a/collector/src/test/java/io/prometheus/jmx/JmxCollectorTest.java b/collector/src/test/java/io/prometheus/jmx/JmxCollectorTest.java
@@ -291,7 +291,12 @@ public void testCollectorNamePatternSet() throws Exception {
       JmxCollector jc = new JmxCollector("---\ncollectorNamePattern: `jmx_collector_v1`".replace('`','"')).register(registry);
       assertEquals("jmx_collector_v1", jc.getCollectorNamePattern());
     }
-
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testCollectorNamePatternInvalidRegex() throws Exception {
+        JmxCollector jc = new JmxCollector("---\ncollectorNamePattern: `(`".replace('`','"')).register(registry);
+      }
+
     @Test
     public void testCamelLastExchangFailureTimestamp() throws Exception{
       String rulePattern =

diff --git a/jmx_prometheus_javaagent_common/src/main/java/io/prometheus/jmx/JavaAgent.java b/jmx_prometheus_javaagent_common/src/main/java/io/prometheus/jmx/JavaAgent.java
@@ -6,8 +6,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.sun.net.httpserver.HttpServer;
-
 import io.prometheus.client.CollectorRegistry;
 import io.prometheus.client.Predicate;
 import io.prometheus.client.exporter.HTTPServer;