add timzone config to CiscoSyslogServerEvent

Author: kodjo-anipah

src/main/java/org/graylog2/syslog4j/server/impl/event/CiscoSyslogServerEvent.java

@@ -1,13 +1,17 @@
 package org.graylog2.syslog4j.server.impl.event;
 
+import org.joda.time.DateTimeZone;
+
 import java.net.InetAddress;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
+import java.util.Objects;
 
 /**
  * CiscoSyslogServerEvent provides an implementation of the
@@ -19,8 +23,7 @@
 public class CiscoSyslogServerEvent extends SyslogServerEvent {
     private static final DateTimeFormatter DEFAULT_FORMATTER =
             DateTimeFormatter
-                    .ofPattern("yyyy MMM ppd HH:mm:ss[.SSS][ zzz]", Locale.ROOT)
-                    .withZone(ZoneOffset.UTC);
+                    .ofPattern("yyyy MMM ppd HH:mm:ss[.SSS][ zzz]", Locale.ROOT);
     private int sequenceNumber = 0;
 
     public CiscoSyslogServerEvent(final byte[] message, int length, InetAddress inetAddress) {
@@ -29,6 +32,12 @@ public CiscoSyslogServerEvent(final byte[] message, int length, InetAddress inet
         initialize(message, length, inetAddress);
         parse();
     }
+    public CiscoSyslogServerEvent(final byte[] message, int length, InetAddress inetAddress, DateTimeZone sysLogServerTimeZone) {
+        super();
+
+        initialize(message, length, inetAddress, sysLogServerTimeZone);
+        parse();
+    }
 
     public CiscoSyslogServerEvent(final String message, InetAddress inetAddress) {
         super();
@@ -37,6 +46,13 @@ public CiscoSyslogServerEvent(final String message, InetAddress inetAddress) {
         parse();
     }
 
+    public CiscoSyslogServerEvent(final String message, InetAddress inetAddress, DateTimeZone sysLogServerTimeZone) {
+        super();
+
+        initialize(message, inetAddress, sysLogServerTimeZone);
+        parse();
+    }
+
     @Override
     protected void parsePriority() {
         if (this.message.charAt(0) == '<') {
@@ -117,7 +133,7 @@ protected void parseDate() {
         if (this.message.length() > dateLength) {
             boolean isYearMissing = Character.isLetter(message.charAt(0));
             String originalDate = this.message.substring(0, dateLength);
-            DateTimeFormatter formatter = DEFAULT_FORMATTER;
+            DateTimeFormatter formatter = DEFAULT_FORMATTER.withZone(getDefaultServerZoneId());
 
             // Hacky override for: "Mar 06 2016 12:53:10 DEVICENAME :"
             if (Character.isDigit(message.charAt(7))
@@ -129,7 +145,7 @@ protected void parseDate() {
                 originalDate = this.message.substring(0, dateLength);
                 formatter = DateTimeFormatter
                         .ofPattern("MMM ppd yyyy HH:mm:ss", Locale.ROOT)
-                        .withZone(ZoneOffset.UTC);
+                        .withZone(getDefaultServerZoneId());
             }
 
             try {
@@ -154,4 +170,8 @@ protected void parseDate() {
     public int getSequenceNumber() {
         return sequenceNumber;
     }
+
+    private ZoneId getDefaultServerZoneId() {
+        return Objects.isNull(sysLogServerTimeZone) ? ZoneOffset.UTC : sysLogServerTimeZone.toTimeZone().toZoneId();
+    }
 }

src/test/java/org/graylog2/syslog4j/server/impl/event/CiscoSyslogServerEventTest.java

@@ -1,19 +1,25 @@
 package org.graylog2.syslog4j.server.impl.event;
 
+import org.joda.time.DateTimeZone;
 import org.junit.Test;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.Locale;
 
 import static java.time.ZoneOffset.UTC;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 
 public class CiscoSyslogServerEventTest {
+    public static final DateTimeZone MST = DateTimeZone.forID("MST");
+    public static final ZoneId MST_ZONE_ID = MST.toTimeZone().toZoneId();
     private static final InetAddress INET_ADDR = new InetSocketAddress(514).getAddress();
     private static final ZoneId CET = ZoneId.of("CET");
     private static final int YEAR = ZonedDateTime.now().getYear();
@@ -122,6 +128,31 @@ public void testCisco7() throws Exception {
         assertThat(event.getMessage()).isEqualTo("%ASA-6-302015: Built inbound UDP connection 23631055 for inside:192.168.19.91/44764 (192.168.19.91/44764) to identity:192.168.249.33/161 (192.168.249.33/161)");
     }
 
+    @Test
+    public void testDefaultTimeZoneUtcIfNotConfigured() throws Exception {
+        final String message = "<190>: 2016 Mar 06 09:22:34: %AUTHPRIV-6-SYSTEM_MSG: START: rsync pid=4311 from=::ffff:IP - xinetd[6219]";
+        final CiscoSyslogServerEvent event = buildEvent(message);
+
+        assertThat(toZonedDateTime(event.getDate(), UTC)).isEqualTo(ZonedDateTime.of(2016, 3, 6, 9, 22, 34, 0, UTC));
+    }
+
+    @Test
+    public void testDefaultTimeZoneConfigured() throws Exception {
+        final String message = "<190>: 2016 Mar 06 09:22:34: %AUTHPRIV-6-SYSTEM_MSG: START: rsync pid=4311 from=::ffff:IP - xinetd[6219]";
+        final CiscoSyslogServerEvent event = new CiscoSyslogServerEvent(message, INET_ADDR, MST);
+
+        assertThat(toZonedDateTime(event.getDate(), MST_ZONE_ID)).isEqualTo(ZonedDateTime.of(2016, 3, 6, 9, 22, 34, 0, MST_ZONE_ID));
+    }
+
+    @Test
+    public void testDefaultTimeZoneIgnoredSinceZoneDetected() throws Exception {
+        final String message = "<190>: 2016 Mar 06 09:22:34 CET: %AUTHPRIV-6-SYSTEM_MSG: START: rsync pid=4311 from=::ffff:IP - xinetd[6219]";
+        DateTimeZone mst = DateTimeZone.forID("MST");
+        final CiscoSyslogServerEvent event = new CiscoSyslogServerEvent(message, INET_ADDR, mst);
+
+        assertThat(toZonedDateTime(event.getDate(), CET)).isEqualTo(ZonedDateTime.of(2016, 3, 6, 9, 22, 34, 0, CET));
+    }
+
     private ZonedDateTime toZonedDateTime(Date date, ZoneId zoneId) {
         return ZonedDateTime.ofInstant(date.toInstant(), zoneId);
     }