Additional pattern for detecting IPv6 addresses formatted as [2001:db…

…8::1]
logfellow · Aug 30, 2022 · 472b362 · 472b362
1 parent f7d231a
commit 472b362
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 4 deletions.
diff --git a/src/main/java/net/logstash/logback/appender/destination/DestinationParser.java b/src/main/java/net/logstash/logback/appender/destination/DestinationParser.java
@@ -28,7 +28,9 @@
  */
 public class DestinationParser {
 
-    private static final Pattern DESTINATION_PATTERN = Pattern.compile("^\\s*(\\S+?)\\s*(:\\s*(\\S+)\\s*)?$");
+    private static final Pattern DESTINATION_PATTERN = Pattern.compile("^([^:]+)(:(.+))?$");
+    private static final Pattern DESTINATION_IPV6_PATTERN = Pattern.compile("^\\[(.+)\\](:(.+))?$");
+
     private static final int HOSTNAME_GROUP = 1;
     private static final int PORT_GROUP = 3;
 
@@ -56,8 +58,8 @@ public static List<InetSocketAddress> parse(String destinations, int defaultPort
         /*
          * Multiple destinations can be specified on one single line, separated by comma
          */
-        String[] destinationStrings = (destinations == null ? "" : destinations.trim()).split("\\s*,\\s*");
-
+        String[] destinationStrings = (destinations == null ? "" : destinations.replace(" ", "")).split(",");
+        
         List<InetSocketAddress> destinationList = new ArrayList<>(destinationStrings.length);
 
         for (String entry: destinationStrings) {
@@ -70,7 +72,10 @@ public static List<InetSocketAddress> parse(String destinations, int defaultPort
                 throw new IllegalArgumentException("Invalid destination '" + entry + "': unparseable value (expected format 'host[:port]').");
             }
 
-            Matcher matcher = DESTINATION_PATTERN.matcher(entry);
+            Matcher matcher = DESTINATION_IPV6_PATTERN.matcher(entry);
+            if (!matcher.matches()) {
+                matcher = DESTINATION_PATTERN.matcher(entry);
+            }
             if (!matcher.matches()) {
                 throw new IllegalArgumentException("Invalid destination '" + entry + "': unparseable value (expected format 'host[:port]').");
             }

diff --git a/src/test/java/net/logstash/logback/appender/destination/DestinationParserTest.java b/src/test/java/net/logstash/logback/appender/destination/DestinationParserTest.java
@@ -66,6 +66,13 @@ public void testParse_Single_NegativePort() {
             DestinationParser.parse("localhost:-1", 1);
         });
     }
+
+    @Test
+    public void testParse_Single_MissingPortAfterColon() {
+        assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> {
+            DestinationParser.parse(" localhost: ", 1);
+        });
+    }
 
     @Test
     public void testParse_Single_UndefinedProperty() {
@@ -105,4 +112,40 @@ public void testParse_Multiple_Empty() {
             DestinationParser.parse("localhost:1000, , localhost:1001", 1);
         });
     }
+
+    @Test
+    public void testIPv4_WithPort() {
+        List<InetSocketAddress> destinations = DestinationParser.parse(" 192.168.1.1:8080 ", 1);
+
+        assertThat(destinations).containsExactly(
+                InetSocketAddress.createUnresolved("192.168.1.1", 8080)
+            );
+    }
+
+    @Test
+    public void testIPv4_DefaultPort() {
+        List<InetSocketAddress> destinations = DestinationParser.parse(" 192.168.1.1 ", 1);
+
+        assertThat(destinations).containsExactly(
+                InetSocketAddress.createUnresolved("192.168.1.1", 1)
+            );
+    }
+
+    @Test
+    public void testIPv6_WithPort() {
+        List<InetSocketAddress> destinations = DestinationParser.parse(" [2001:db8::1]:8080 ", 1);
+
+        assertThat(destinations).containsExactly(
+                InetSocketAddress.createUnresolved("2001:db8::1", 8080)
+            );
+    }
+
+    @Test
+    public void testIPv6_DefaultPort() {
+        List<InetSocketAddress> destinations = DestinationParser.parse(" [2001:db8::1] ", 1);
+
+        assertThat(destinations).containsExactly(
+                InetSocketAddress.createUnresolved("2001:db8::1", 1)
+            );
+    }
 }