add timezone config to StructuredSyslogServerEvent and detect tz

Author: kodjo-anipah

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

@@ -148,15 +148,18 @@ private Date parseDateBasedOnFormat(String originalDate, int dateLength, String
     }
 
     private DateTime parse8601Date(String date) {
-        boolean hasTimezone = date.substring(date.length() - 6).matches(".*[Z+-].*");
 
-        if (!hasTimezone && Objects.nonNull(sysLogServerTimeZone)) {
+        if (!hasTimeZone(date) && Objects.nonNull(sysLogServerTimeZone)) {
             return DateTime.parse(date, ISODateTimeFormat.dateTimeParser().withZone(sysLogServerTimeZone));
         }
 
         return DateTime.parse(date);
     }
 
+    protected boolean hasTimeZone(String date) {
+        return date.substring(date.length() - 6).matches(".*[Z+-].*");
+    }
+
     protected void parsePriority() {
         if (this.message.charAt(0) == '<') {
             int i = this.message.indexOf(">");

src/main/java/org/graylog2/syslog4j/server/impl/event/structured/StructuredSyslogServerEvent.java

@@ -4,11 +4,13 @@
 import org.graylog2.syslog4j.impl.message.structured.StructuredSyslogMessage;
 import org.graylog2.syslog4j.server.impl.event.SyslogServerEvent;
 import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
 
 import java.net.InetAddress;
 import java.util.Locale;
+import java.util.Objects;
 
 /**
  * SyslogServerStructuredEvent provides an implementation of the
@@ -43,12 +45,25 @@ public StructuredSyslogServerEvent(final byte[] message, int length, InetAddress
         parse();
     }
 
+    public StructuredSyslogServerEvent(final byte[] message, int length, InetAddress inetAddres, DateTimeZone sysLogServerTimeZone) {
+        super();
+
+        initialize(message, length, inetAddress, sysLogServerTimeZone);
+        parse();
+    }
+
     public StructuredSyslogServerEvent(final String message, InetAddress inetAddress) {
         super();
 
         initialize(message, inetAddress, null);
         parse();
     }
+    public StructuredSyslogServerEvent(final String message, InetAddress inetAddress, DateTimeZone sysLogServerTimeZone) {
+        super();
+
+        initialize(message, inetAddress, sysLogServerTimeZone);
+        parse();
+    }
 
     public DateTimeFormatter getDateTimeFormatter() {
         if (dateTimeFormatter == null) {
@@ -103,6 +118,10 @@ protected void parseDate() {
             try {
                 DateTimeFormatter formatter = getDateTimeFormatter();
 
+                if (!hasTimeZone(dateString) && Objects.nonNull(sysLogServerTimeZone)) {
+                    formatter = formatter.withZone(sysLogServerTimeZone);
+                }
+
                 this.dateTime = formatter.parseDateTime(dateString);
                 this.date = this.dateTime.toDate();
 

src/test/java/org/graylog2/syslog4j/server/impl/event/structured/StructuredSyslogServerEventTest.java

@@ -1,17 +1,22 @@
 package org.graylog2.syslog4j.server.impl.event.structured;
 
 import org.joda.time.DateTime;
+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.util.HashMap;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
 
 public class StructuredSyslogServerEventTest {
+    public static final DateTimeZone MST = DateTimeZone.forID("MST");
     private final InetAddress INET_ADDR = new InetSocketAddress(514).getAddress();
 
     private StructuredSyslogServerEvent buildEvent(String message) {
@@ -223,4 +228,24 @@ public void testStructuredSyslogNgNoMillisecTimestamp() throws Exception {
         assertEquals(null, event.getStructuredMessage().getMessageId());
         assertEquals("syslog-ng starting up; version='3.5.3'", event.getStructuredMessage().getMessage());
     }
-}
+
+    @Test
+    public void testDefaultTimeZoneNotSet() throws Exception {
+        // Message from: https://github.com/Graylog2/graylog2-server/issues/845
+        final String messageWithoutZone = "<45>1 2014-10-21T10:21:09 c4dc57ba1ebb syslog-ng 7120 - [meta sequenceId=\"1\"] syslog-ng starting up; version='3.5.3'";
+        final String messageWithZone = "<45>1 2014-10-21T10:21:09-07:00 c4dc57ba1ebb syslog-ng 7120 - [meta sequenceId=\"1\"] syslog-ng starting up; version='3.5.3'";
+
+        assertEquals(new DateTime("2014-10-21T10:21:09.000"), buildEvent(messageWithoutZone).getDateTime());
+        assertEquals(new DateTime("2014-10-21T10:21:09.000-07:00"), buildEvent(messageWithZone).getDateTime());
+    }
+
+    @Test
+    public void testDefaultTimeZoneSet() throws Exception {
+        // Message from: https://github.com/Graylog2/graylog2-server/issues/845
+        final String messageWithoutZone = "<45>1 2014-10-21T10:21:09 c4dc57ba1ebb syslog-ng 7120 - [meta sequenceId=\"1\"] syslog-ng starting up; version='3.5.3'";
+        final String messageWithZone = "<45>1 2014-10-21T10:21:09+01:00 c4dc57ba1ebb syslog-ng 7120 - [meta sequenceId=\"1\"] syslog-ng starting up; version='3.5.3'";
+        ZonedDateTime of = ZonedDateTime.of(2014, 10, 21, 10, 21, 9, 0, MST.toTimeZone().toZoneId());
+        assertEquals(new DateTime("2014-10-21T10:21:09.000-07:00", MST), new StructuredSyslogServerEvent(messageWithoutZone, INET_ADDR, MST).getDateTime());
+        assertEquals(new DateTime("2014-10-21T10:21:09.000+01:00"), new StructuredSyslogServerEvent(messageWithZone, INET_ADDR, MST).getDateTime());
+    }
+}