add timzone config to SyslogServerEvent

Author: kodjo-anipah

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

@@ -4,6 +4,8 @@
 import org.graylog2.syslog4j.server.SyslogServerEventIF;
 import org.graylog2.syslog4j.util.SyslogUtility;
 import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.format.ISODateTimeFormat;
 
 import java.net.InetAddress;
 import java.text.DateFormat;
@@ -12,6 +14,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
+import java.util.Objects;
 
 /**
  * SyslogServerEvent provides an implementation of the SyslogServerEventIF interface.
@@ -40,12 +43,19 @@ public class SyslogServerEvent implements SyslogServerEventIF {
     protected boolean isHostStrippedFromMessage = false;
     protected String message = null;
     protected InetAddress inetAddress = null;
+    protected DateTimeZone sysLogServerTimeZone;
 
     protected SyslogServerEvent() {
     }
 
     public SyslogServerEvent(final String message, InetAddress inetAddress) {
-        initialize(message, inetAddress);
+        initialize(message, inetAddress, null);
+
+        parse();
+    }
+
+    public SyslogServerEvent(final String message, InetAddress inetAddress, DateTimeZone sysLogServerTimeZone) {
+        initialize(message, inetAddress, sysLogServerTimeZone);
 
         parse();
     }
@@ -56,6 +66,12 @@ public SyslogServerEvent(final byte[] message, int length, InetAddress inetAddre
         parse();
     }
 
+    public SyslogServerEvent(final byte[] message, int length, InetAddress inetAddress, DateTimeZone sysLogServerTimeZone) {
+        initialize(message, length, inetAddress, sysLogServerTimeZone);
+
+        parse();
+    }
+
     protected void initialize(final String message, InetAddress inetAddress) {
         this.rawString = message;
         this.rawLength = message.length();
@@ -64,12 +80,22 @@ protected void initialize(final String message, InetAddress inetAddress) {
         this.message = message;
     }
 
+    protected void initialize(final String message, InetAddress inetAddress, DateTimeZone sysLogServerTimeZone) {
+        this.sysLogServerTimeZone = sysLogServerTimeZone;
+        initialize(message, inetAddress);
+    }
+
     protected void initialize(final byte[] message, int length, InetAddress inetAddress) {
         this.rawBytes = message;
         this.rawLength = length;
         this.inetAddress = inetAddress;
     }
 
+    protected void initialize(final byte[] message, int length, InetAddress inetAddress, DateTimeZone sysLogServerTimeZone) {
+        this.sysLogServerTimeZone = sysLogServerTimeZone;
+        initialize(message, length, inetAddress);
+    }
+
     protected void parseHost() {
         int i = this.message.indexOf(' ');
 
@@ -96,16 +122,13 @@ protected void parseDate() {
                 isDate8601 = true;
             }
 
-            String year = Integer.toString(Calendar.getInstance().get(Calendar.YEAR));
             String originalDate = this.message.substring(0, datelength - 1);
-            String modifiedDate = originalDate + " " + year;
 
-            DateFormat dateFormat = new SimpleDateFormat(dateFormatS, Locale.ENGLISH);
             try {
                 if (!isDate8601) {
-                    this.date = dateFormat.parse(modifiedDate);
+                    this.date = parseDateBasedOnFormat(originalDate, datelength, dateFormatS);
                 } else {
-                    this.date = DateTime.parse(originalDate).toDate();
+                    this.date = parse8601Date(originalDate).toDate();
                 }
 
                 this.message = this.message.substring(datelength);
@@ -118,6 +141,28 @@ protected void parseDate() {
         parseHost();
     }
 
+    private Date parseDateBasedOnFormat(String originalDate, int dateLength, String format) throws ParseException {
+        String year = Integer.toString(Calendar.getInstance().get(Calendar.YEAR));
+        String modifiedDate = originalDate + " " + year;
+        DateFormat dateFormat = new SimpleDateFormat(format, Locale.ENGLISH);
+
+        if (Objects.nonNull(sysLogServerTimeZone)) {
+            dateFormat.setTimeZone(sysLogServerTimeZone.toTimeZone());
+        }
+
+        return dateFormat.parse(modifiedDate);
+    }
+
+    private DateTime parse8601Date(String date) {
+        boolean hasTimezone = date.substring(date.length() - 6).matches(".*[Z+-].*");
+
+        if (!hasTimezone && Objects.nonNull(sysLogServerTimeZone)) {
+            return DateTime.parse(date, ISODateTimeFormat.dateTimeParser().withZone(sysLogServerTimeZone));
+        }
+
+        return DateTime.parse(date);
+    }
+
     protected void parsePriority() {
         if (this.message.charAt(0) == '<') {
             int i = this.message.indexOf(">");

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

@@ -2,15 +2,20 @@
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
+import org.joda.time.LocalDateTime;
 import org.junit.Test;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.util.Date;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 public class SyslogServerEventTest {
     private final InetAddress INET_ADDR = new InetSocketAddress(514).getAddress();
+    private final DateTimeZone mstZone = DateTimeZone.forID("MST");
+    private final DateTimeZone cet = DateTimeZone.forID("CET");
 
     private SyslogServerEvent buildEvent(String message) {
         return new SyslogServerEvent(message, INET_ADDR);
@@ -185,6 +190,7 @@ public void testRFC5424Timestamps() throws Exception {
         // https://tools.ietf.org/html/rfc5424#section-6.2.3.1
         final String example1 = "<0>1985-04-12T23:20:50.52Z hostname test[42]: Test";
         final SyslogServerEvent event1 = buildEvent(example1);
+
         assertEquals(new DateTime(1985, 4, 12, 23, 20, 50, 520, DateTimeZone.UTC).toDate(), event1.getDate());
         assertEquals(0, event1.getFacility());
         assertEquals("hostname", event1.getHost());
@@ -224,4 +230,40 @@ public void testRFC5424Timestamps() throws Exception {
         assertEquals(0, event5.getLevel());
         assertEquals("hostname test[42]: Test", event5.getMessage());
     }
+
+    @Test
+    public void testDefaultTimeZoneForRFC5424() {
+        final String withUtcOffset = "<0>1985-04-12T23:20:50.52Z hostname test[42]: Test";
+        DateTime utcDateTime = new DateTime(1985, 4, 12, 23, 20, 50, 520, DateTimeZone.UTC);
+
+        assertEquals(utcDateTime.toDate(), new SyslogServerEvent(withUtcOffset, INET_ADDR).getDate());
+        assertEquals(utcDateTime.toDate(), new SyslogServerEvent(withUtcOffset.getBytes(), withUtcOffset.length(), INET_ADDR).getDate());
+
+        final String withMstOffset = "<0>1985-04-12T23:20:50.52-07:00 hostname test[42]: Test";
+        DateTime cetDateTime = new DateTime(1985, 4, 12, 23, 20, 50, 520, cet);
+        DateTime mstDateTime = new DateTime(1985, 4, 12, 23, 20, 50, 520, mstZone);
+        SyslogServerEvent syslogServerEventMstWithDefaultCet = new SyslogServerEvent(withMstOffset, INET_ADDR, cet);
+
+        assertEquals(mstDateTime.toDate(), new SyslogServerEvent(withMstOffset, INET_ADDR).getDate());
+        assertEquals(mstDateTime.toDate(), syslogServerEventMstWithDefaultCet.getDate());
+        assertNotEquals(cetDateTime.toDate(), syslogServerEventMstWithDefaultCet.getDate());
+
+        final String withoutOffset = "<0>1985-04-12T23:20:50.52 hostname test[42]: Test";
+        SyslogServerEvent syslogServerEventCet = new SyslogServerEvent(withoutOffset, INET_ADDR, cet);
+
+        assertEquals(cetDateTime.toDate(), syslogServerEventCet.getDate());
+        assertNotEquals(mstDateTime.toDate(), syslogServerEventCet.getDate());
+        assertEquals(mstDateTime.toDate(), new SyslogServerEvent(withoutOffset, INET_ADDR, mstZone).getDate());
+    }
+
+    @Test
+    public void testDefaultTimeZones() {
+        final String message = "<34>Oct 11 17:14:15 mymachine su: 'su root' failed for lonvick on /dev/pts/8";
+        final SyslogServerEvent testWithDefaultConf = new SyslogServerEvent(message, INET_ADDR, mstZone);
+        final SyslogServerEvent test = new SyslogServerEvent(message, INET_ADDR);
+
+        assertEquals(new DateTime(new DateTime().getYear() + "-10-11T17:14:15", mstZone).toDate(), testWithDefaultConf.getDate());
+        assertEquals(new DateTime(new DateTime().getYear() + "-10-11T17:14:15").toDate(), test.getDate());
+
+    }
 }