From e27ff73b3221a977639de1bd18c8bbb0ed78805c Mon Sep 17 00:00:00 2001
From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Fri, 19 Dec 2014 17:06:38 -0500
Subject: [PATCH] Reject out-of-range output when converting to TS_MW

TS_MW is a 14-character string "YYYYMMDDHHIISS", and thus cannot
represent timestamps earlier than 00000101000000 or later than
99991231235959.

MWTimestamp should throw an exception if asked to represent out-of-range
times in this format, rather than returning invalid values that are
likely to be truncated by the database.

Bug: T51580
Change-Id: I744e446356f3ed9193dfaaaec5dc81c611dab4a3
---
 includes/MWTimestamp.php                   |  5 +++++
 tests/phpunit/includes/MWTimestampTest.php | 23 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/includes/MWTimestamp.php b/includes/MWTimestamp.php
index 4b3d36a71f..ea91470e85 100644
--- a/includes/MWTimestamp.php
+++ b/includes/MWTimestamp.php
@@ -182,6 +182,11 @@ class MWTimestamp {
 			$output .= ' GMT';
 		}
 
+		if ( $style == TS_MW && strlen( $output ) !== 14 ) {
+			throw new TimestampException( __METHOD__ . ': The timestamp cannot be represented in ' .
+				'the specified format' );
+		}
+
 		return $output;
 	}
 
diff --git a/tests/phpunit/includes/MWTimestampTest.php b/tests/phpunit/includes/MWTimestampTest.php
index 05c1a661dc..365625459e 100644
--- a/tests/phpunit/includes/MWTimestampTest.php
+++ b/tests/phpunit/includes/MWTimestampTest.php
@@ -81,6 +81,17 @@ class MWTimestampTest extends MediaWikiLangTestCase {
 		new MWTimestamp( "This is not a timestamp." );
 	}
 
+	/**
+	 * Test an out of range timestamp
+	 * @dataProvider provideOutOfRangeTimestamps
+	 * @expectedException TimestampException
+	 * @covers MWTimestamp
+	 */
+	public function testOutOfRangeTimestamps( $format, $input ) {
+		$timestamp = new MWTimestamp( $input );
+		$timestamp->getTimestamp( $format );
+	}
+
 	/**
 	 * Test requesting an invalid output format.
 	 * @expectedException TimestampException
@@ -113,6 +124,18 @@ class MWTimestampTest extends MediaWikiLangTestCase {
 		);
 	}
 
+	/**
+	 * Returns a list of out of range timestamps in the format:
+	 * array( type, timestamp_of_type )
+	 */
+	public static function provideOutOfRangeTimestamps() {
+		return array(
+			// Various formats
+			array( TS_MW, '-62167219201' ), // -0001-12-31T23:59:59Z
+			array( TS_MW, '253402300800' ), // 10000-01-01T00:00:00Z
+		);
+	}
+
 	/**
 	 * @dataProvider provideHumanTimestampTests
 	 * @covers MWTimestamp::getHumanTimestamp
-- 
2.20.1