Review: Disallow parsing of unixtimestamps with non UTC timezone

Author: spinscale

src/main/java/org/elasticsearch/common/joda/Joda.java

@@ -218,8 +218,11 @@ public int estimateParsedLength() {
 
         @Override
         public int parseInto(DateTimeParserBucket bucket, String text, int position) {
-            if (text.length() > estimateParsedLength() || pattern.matcher(text).matches() == false) {
-                return 0;
+            if (text.length() > estimateParsedLength() ||
+                // timestamps have to have UTC timezone
+                bucket.getZone() != DateTimeZone.UTC ||
+                pattern.matcher(text).matches() == false) {
+                return -1;
             }
 
             int factor = hasMilliSecondPrecision ? 1 : 1000;
@@ -235,7 +238,7 @@ public int parseInto(DateTimeParserBucket bucket, String text, int position) {
                 bucket.saveField(DateTimeFieldType.millisOfSecond(), dt.getMillisOfSecond());
                 bucket.setZone(DateTimeZone.UTC);
             } catch (Exception e) {
-                return 0;
+                return -1;
             }
             return text.length();
         }

src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java

@@ -57,7 +57,7 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
 
     public static final String NAME = "_timestamp";
     public static final String CONTENT_TYPE = "_timestamp";
-    public static final String DEFAULT_DATE_TIME_FORMAT = "epoch_second_millis||dateOptionalTime";
+    public static final String DEFAULT_DATE_TIME_FORMAT = "epoch_millis||dateOptionalTime";
 
     public static class Defaults extends DateFieldMapper.Defaults {
         public static final String NAME = "_timestamp";

src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java

@@ -23,14 +23,16 @@
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.joda.time.DateTimeZone;
+import org.junit.Test;
 
+import java.util.TimeZone;
 import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.hamcrest.Matchers.equalTo;
 
 public class DateMathParserTests extends ElasticsearchTestCase {
+
     FormatDateTimeFormatter formatter = Joda.forPattern("dateOptionalTime||epoch_millis");
     DateMathParser parser = new DateMathParser(formatter);
 
@@ -195,9 +197,6 @@ public void testRounding() {
     public void testTimestamps() {
         assertDateMathEquals("1418248078000", "2014-12-10T21:47:58.000");
 
-        // timezone does not affect timestamps
-        assertDateMathEquals("1418248078000", "2014-12-10T21:47:58.000", 0, false, DateTimeZone.forID("-08:00"));
-
         // datemath still works on timestamps
         assertDateMathEquals("1418248078000||/m", "2014-12-10T21:47:00.000");
 
@@ -250,4 +249,10 @@ public Long call() throws Exception {
         parser.parse("now/d", now, false, null);
         assertTrue(called.get());
     }
+
+    @Test(expected = ElasticsearchParseException.class)
+    public void testThatUnixTimestampMayNotHaveTimeZone() {
+        DateMathParser parser = new DateMathParser(Joda.forPattern("epoch_millis"));
+        parser.parse("1234567890123", callable(42), false, DateTimeZone.forTimeZone(TimeZone.getTimeZone("CET")));
+    }
 }

src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java

@@ -272,9 +272,15 @@ public void testThatEpochsInSecondsCanBeParsed() {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testForInvalidDates() {
-        FormatDateTimeFormatter formatter = Joda.forPattern(randomBoolean() ? "epoch_second" : "epoch_millis");
-        formatter.parser().parseDateTime(randomFrom("invalid date", "12345678901", "123456789", "12345678901234"));
+    public void testForInvalidDatesInEpochSecond() {
+        FormatDateTimeFormatter formatter = Joda.forPattern("epoch_second");
+        formatter.parser().parseDateTime(randomFrom("invalid date", "12345678901", "12345678901234"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testForInvalidDatesInEpochMillis() {
+        FormatDateTimeFormatter formatter = Joda.forPattern("epoch_millis");
+        formatter.parser().parseDateTime(randomFrom("invalid date", "12345678901234"));
     }
 
     private long utcTimeInMillis(String time) {