Use std::time::SystemTime instead of u64 for timestamps

sgeisler · sgeisler · commit 06bfd374fd5e · 2018-11-02T15:33:47.000-07:00
diff --git a/README.md b/README.md
@@ -4,6 +4,9 @@
 This repo provides datastructures for BOLT 11 lightning invoices.
 It provides functions to parse and serialize invoices from and to bech32.
 
+**Please be sure to run the test suite since we need to check assumptions
+regarding `SystemTime`'s bounds on your platform.**
+
 ## Contributing
 * same coding style standard as [rust-bitcoin/rust-lightning](https://github.com/rust-bitcoin/rust-lightning)
 * use tabs and spaces (appropriately)
diff --git a/src/de.rs b/src/de.rs
@@ -311,8 +311,7 @@ impl FromBase32 for RawDataPart {
 			return Err(ParseError::TooShortDataPart);
 		}
 
-		let timestamp: u64 = parse_int_be(&data[0..7], 32)
-			.expect("7*5bit < 64bit, no overflow possible");
+		let timestamp = PositiveTimestamp::from_base32(&data[0..7])?;
 		let tagged = parse_tagged_parts(&data[7..])?;
 
 		Ok(RawDataPart {
@@ -322,6 +321,23 @@ impl FromBase32 for RawDataPart {
 	}
 }
 
+impl FromBase32 for PositiveTimestamp {
+	type Err = ParseError;
+
+	fn from_base32(b32: &[u5]) -> Result<Self, Self::Err> {
+		if b32.len() != 7 {
+			return Err(ParseError::InvalidSliceLength("PositiveTimestamp::from_base32()".into()));
+		}
+		let timestamp: u64 = parse_int_be(b32, 32)
+			.expect("7*5bit < 64bit, no overflow possible");
+		match PositiveTimestamp::from_unix_timestamp(timestamp) {
+			Ok(t) => Ok(t),
+			Err(CreationError::TimestampOutOfBounds) => Err(ParseError::TimestampOverflow),
+			Err(_) => unreachable!(),
+		}
+	}
+}
+
 impl FromBase32 for Signature {
 	type Err = ParseError;
 	fn from_base32(signature: &[u5]) -> Result<Self, Self::Err> {
@@ -589,7 +605,8 @@ pub enum ParseError {
 	InvalidScriptHashLength,
 	InvalidRecoveryId,
 	InvalidSliceLength(String),
-	Skip
+	Skip,
+	TimestampOverflow,
 }
 
 #[derive(PartialEq, Debug, Clone)]
@@ -648,6 +665,7 @@ impl error::Error for ParseError {
 			InvalidRecoveryId => "recovery id is out of range (should be in [0,3])",
 			InvalidSliceLength(_) => "some slice had the wrong length",
 			Skip => "the tagged field has to be skipped because of an unexpected, but allowed property",
+			TimestampOverflow => "the invoice's timestamp could not be represented as SystemTime",
 		}
 	}
 }
@@ -924,7 +942,8 @@ mod test {
 	fn test_raw_signed_invoice_deserialization() {
 		use TaggedField::*;
 		use secp256k1::{RecoveryId, RecoverableSignature, Secp256k1};
-		use {SignedRawInvoice, Signature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256};
+		use {SignedRawInvoice, Signature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256,
+			 PositiveTimestamp};
 
 		assert_eq!(
 			"lnbc1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdpl2pkx2ctnv5sxxmmw\
@@ -938,7 +957,7 @@ mod test {
 						si_prefix: None,
 					},
 					data: RawDataPart {
-					timestamp: 1496314658,
+					timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 					tagged_fields: vec ! [
 						PaymentHash(Sha256(Sha256Hash::from_hex(
 							"0001020304050607080900010203040506070809000102030405060708090102"
diff --git a/src/lib.rs b/src/lib.rs
@@ -13,13 +13,32 @@ use std::ops::Deref;
 
 use std::iter::FilterMap;
 use std::slice::Iter;
+use std::time::{SystemTime, Duration, UNIX_EPOCH};
 
 mod de;
 mod ser;
 mod tb;
 
 pub use de::{ParseError, ParseOrSemanticError};
 
+
+// TODO: fix before 2038 (see rust PR #55527)
+/// Defines the maximum UNIX timestamp that can be represented as `SystemTime`. This is checked by
+/// one of the unit tests, please run them.
+const SYSTEM_TIME_MAX_UNIX_TIMESTAMP: u64 = std::i32::MAX as u64;
+
+/// This function is used as a static assert for the size of `SystemTime`. If the crate fails to
+/// compile due to it this indicates that your system uses unexpected bounds for `SystemTime`. You
+/// can remove this functions and run the test `test_system_time_bounds_assumptions`. In any case,
+/// please open an issue. If all tests pass you should be able to use this library safely by just
+/// removing this function till we patch it accordingly.
+fn __system_time_size_check() {
+	/// Use 2 * sizeof(u64) as expected size since the expected underlying implementation is storing
+	/// a `Duration` since `SystemTime::UNIX_EPOCH`.
+	unsafe { std::mem::transmute::<SystemTime, [u8; 16]>(UNIX_EPOCH); }
+}
+
+
 /// Builder for `Invoice`s. It's the most convenient and advised way to use this library. It ensures
 /// that only a semantically and syntactically correct Invoice can be built using it.
 ///
@@ -72,7 +91,7 @@ pub struct InvoiceBuilder<D: tb::Bool, H: tb::Bool, T: tb::Bool> {
 	currency: Currency,
 	amount: Option<u64>,
 	si_prefix: Option<SiPrefix>,
-	timestamp: Option<u64>,
+	timestamp: Option<PositiveTimestamp>,
 	tagged_fields: Vec<TaggedField>,
 	error: Option<CreationError>,
 
@@ -149,14 +168,22 @@ pub struct RawHrp {
 /// Data of the `RawInvoice` that is encoded in the data part
 #[derive(Eq, PartialEq, Debug, Clone)]
 pub struct RawDataPart {
-	// TODO: find better fitting type that only allows positive timestamps to avoid checks for negative timestamps when encoding
-	/// generation time of the invoice as UNIX timestamp
-	pub timestamp: u64,
+	/// generation time of the invoice
+	pub timestamp: PositiveTimestamp,
 
 	/// tagged fields of the payment request
 	pub tagged_fields: Vec<RawTaggedField>,
 }
 
+/// A timestamp that refers to a date after 1 January 1970 which means its representation as UNIX
+/// timestamp is positive.
+///
+/// # Invariants
+/// The UNIX timestamp representing the stored time has to be positive and small enough so that
+/// a `EpiryTime` can be added to it without an overflow.
+#[derive(Eq, PartialEq, Debug, Clone)]
+pub struct PositiveTimestamp(SystemTime);
+
 /// SI prefixes for the human readable part
 #[derive(Eq, PartialEq, Debug, Clone, Copy)]
 pub enum SiPrefix {
@@ -442,17 +469,30 @@ impl<D: tb::Bool, T: tb::Bool> InvoiceBuilder<D, tb::False, T> {
 
 impl<D: tb::Bool, H: tb::Bool> InvoiceBuilder<D, H, tb::False> {
 	/// Sets the timestamp. `time` is a UNIX timestamp.
-	pub fn timestamp(mut self, time: u64) -> InvoiceBuilder<D, H, tb::True> {
-		self.timestamp = Some(time);
+	pub fn timestamp_raw(mut self, time: u64) -> InvoiceBuilder<D, H, tb::True> {
+		match PositiveTimestamp::from_unix_timestamp(time) {
+			Ok(t) => self.timestamp = Some(t),
+			Err(e) => self.error = Some(e),
+		}
+
+		self.set_flags()
+	}
+
+	/// Sets the timestamp.
+	pub fn timestamp(mut self, time: SystemTime) -> InvoiceBuilder<D, H, tb::True> {
+		match PositiveTimestamp::from_system_time(time) {
+			Ok(t) => self.timestamp = Some(t),
+			Err(e) => self.error = Some(e),
+		}
+
 		self.set_flags()
 	}
 
 	/// Sets the timestamp to the current UNIX timestamp.
 	pub fn current_timestamp(mut self) -> InvoiceBuilder<D, H, tb::True> {
 		use std::time::{SystemTime, UNIX_EPOCH};
-		let now = SystemTime::now();
-		let since_unix_epoch = now.duration_since(UNIX_EPOCH).expect("it won't be 1970 ever again");
-		self.timestamp = Some(since_unix_epoch.as_secs() as u64);
+		let now = PositiveTimestamp::from_system_time(SystemTime::now());
+		self.timestamp = Some(now.expect("for the foreseeable future this shouldn't happen"));
 		self.set_flags()
 	}
 }
@@ -717,6 +757,61 @@ impl RawInvoice {
 	}
 }
 
+impl PositiveTimestamp {
+
+	/// Create a new `PositiveTimestamp` from a unix timestamp in the Range
+	/// `0...SYSTEM_TIME_MAX_UNIX_TIMESTAMP / 2`, otherwise return a
+	/// `CreationError::TimestampOutOfBounds`.
+	pub fn from_unix_timestamp(unix_seconds: u64) -> Result<Self, CreationError> {
+		if unix_seconds > SYSTEM_TIME_MAX_UNIX_TIMESTAMP / 2 {
+			Err(CreationError::TimestampOutOfBounds)
+		} else {
+			Ok(PositiveTimestamp(UNIX_EPOCH + Duration::from_secs(unix_seconds)))
+		}
+	}
+
+	/// Create a new `PositiveTimestamp` from a `SystemTime` with a corresponding unix timestamp in
+	/// the Range `0...SYSTEM_TIME_MAX_UNIX_TIMESTAMP / 2`, otherwise return a
+	/// `CreationError::TimestampOutOfBounds`.
+	pub fn from_system_time(time: SystemTime) -> Result<Self, CreationError> {
+		if time
+			.duration_since(UNIX_EPOCH)
+			.map(|t| t.as_secs() <= SYSTEM_TIME_MAX_UNIX_TIMESTAMP / 2) // check for consistency reasons
+			.unwrap_or(true)
+			{
+				Ok(PositiveTimestamp(time))
+			} else {
+			Err(CreationError::TimestampOutOfBounds)
+		}
+	}
+
+	/// Returns the UNIX timestamp representing the stored time
+	pub fn as_unix_timestamp(&self) -> u64 {
+		self.0.duration_since(UNIX_EPOCH)
+			.expect("ensured by type contract/constructors")
+			.as_secs()
+	}
+
+	/// Returns a reference to the internal `SystemTime` time representation
+	pub fn as_time(&self) -> &SystemTime {
+		&self.0
+	}
+}
+
+impl Into<SystemTime> for PositiveTimestamp {
+	fn into(self) -> SystemTime {
+		self.0
+	}
+}
+
+impl Deref for PositiveTimestamp {
+	type Target = SystemTime;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
 impl Invoice {
 	fn into_signed_raw(self) -> SignedRawInvoice {
 		self.signed_invoice
@@ -788,8 +883,8 @@ impl Invoice {
 		Ok(invoice)
 	}
 
-	pub fn timestamp(&self) -> u64 {
-		self.signed_invoice.raw_invoice.data.timestamp
+	pub fn timestamp(&self) -> &SystemTime {
+		self.signed_invoice.raw_invoice().data.timestamp.as_time()
 	}
 
 	/// Returns an iterator over all tagged fields of this Invoice.
@@ -967,6 +1062,9 @@ pub enum CreationError {
 
 	/// The specified route has too many hops and can't be encoded
 	RouteTooLong,
+
+	/// The unix timestamp of the supplied date is <0 or can't be represented as `SystemTime`
+	TimestampOutOfBounds,
 }
 
 /// Errors that may occur when converting a `RawInvoice` to an `Invoice`. They relate to the
@@ -997,9 +1095,23 @@ mod test {
 	use bitcoin_hashes::hex::FromHex;
 	use bitcoin_hashes::sha256::Sha256Hash;
 
+	#[test]
+	fn test_system_time_bounds_assumptions() {
+		use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+		/// The upper and lower bounds of `SystemTime` are not part of its public contract and are
+		/// platform specific. That's why we have to test if our assumptions regarding these bounds
+		/// hold on the target platform.
+		///
+		/// If this test fails on your platform, please don't use the library and open an issue
+		/// instead so we can resolve the situation. Currently this library is tested on:
+		///   * Linux (64bit)
+		let _ = UNIX_EPOCH + Duration::from_secs(::std::i64::MAX as u64);
+	}
+
 	#[test]
 	fn test_calc_invoice_hash() {
-		use ::{RawInvoice, RawHrp, RawDataPart, Currency};
+		use ::{RawInvoice, RawHrp, RawDataPart, Currency, PositiveTimestamp};
 		use secp256k1::*;
 		use ::TaggedField::*;
 
@@ -1010,7 +1122,7 @@ mod test {
 				si_prefix: None,
 			},
 			data: RawDataPart {
-				timestamp: 1496314658,
+				timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 				tagged_fields: vec![
 					PaymentHash(::Sha256(Sha256Hash::from_hex(
 						"0001020304050607080900010203040506070809000102030405060708090102"
@@ -1036,7 +1148,8 @@ mod test {
 		use TaggedField::*;
 		use secp256k1::{RecoveryId, RecoverableSignature, Secp256k1};
 		use secp256k1::key::{SecretKey, PublicKey};
-		use {SignedRawInvoice, Signature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256};
+		use {SignedRawInvoice, Signature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256,
+			 PositiveTimestamp};
 
 		let mut invoice = SignedRawInvoice {
 			raw_invoice: RawInvoice {
@@ -1046,7 +1159,7 @@ mod test {
 					si_prefix: None,
 				},
 				data: RawDataPart {
-					timestamp: 1496314658,
+					timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 					tagged_fields: vec ! [
 						PaymentHash(Sha256(Sha256Hash::from_hex(
 							"0001020304050607080900010203040506070809000102030405060708090102"
@@ -1181,6 +1294,7 @@ mod test {
 		use ::*;
 		use secp256k1::Secp256k1;
 		use secp256k1::key::{SecretKey, PublicKey};
+		use std::time::UNIX_EPOCH;
 
 		let secp_ctx = Secp256k1::new();
 
@@ -1230,7 +1344,7 @@ mod test {
 
 		let builder = InvoiceBuilder::new(Currency::BitcoinTestnet)
 			.amount_pico_btc(123)
-			.timestamp(1234567)
+			.timestamp_raw(1234567)
 			.payee_pub_key(public_key.clone())
 			.expiry_time_seconds(54321)
 			.min_final_cltv_expiry(144)
@@ -1250,7 +1364,10 @@ mod test {
 
 		assert_eq!(invoice.amount_pico_btc(), Some(123));
 		assert_eq!(invoice.currency(), Currency::BitcoinTestnet);
-		assert_eq!(invoice.timestamp(), 1234567);
+		assert_eq!(
+			invoice.timestamp().duration_since(UNIX_EPOCH).unwrap().as_secs(),
+			1234567
+		);
 		assert_eq!(invoice.payee_pub_key(), Some(&PayeePubKey(public_key)));
 		assert_eq!(invoice.expiry_time(), Some(&ExpiryTime{seconds: 54321}));
 		assert_eq!(invoice.min_final_cltv_expiry(), Some(&MinFinalCltvExpiry(144)));
diff --git a/src/ser.rs b/src/ser.rs
@@ -119,7 +119,7 @@ impl ToBase32<Vec<u5>> for RawDataPart {
 		let mut encoded = Vec::<u5>::new();
 
 		// encode timestamp
-		encoded.extend(&encode_int_be_base32(self.timestamp));
+		encoded.extend(self.timestamp.to_base32());
 
 		// encode tagged fields
 		for tagged_field in self.tagged_fields.iter() {
@@ -130,6 +130,12 @@ impl ToBase32<Vec<u5>> for RawDataPart {
 	}
 }
 
+impl ToBase32<Vec<u5>> for PositiveTimestamp {
+	fn to_base32(&self) -> Vec<u5> {
+		encode_int_be_base32(self.as_unix_timestamp())
+	}
+}
+
 impl ToBase32<Vec<u5>> for RawTaggedField {
 	fn to_base32(&self) -> Vec<u5> {
 		match *self {
diff --git a/tests/ser_de.rs b/tests/ser_de.rs
@@ -16,7 +16,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, Option<SemanticError>)> {
 			wd5kgetjypeh2ursdae8g6twvus8g6rfwvs8qun0dfjkxaq8rkx3yf5tcsyz3d73gafnh3cax9rn449d9p5uxz9\
 			ezhhypd0elx87sjle52x86fux2ypatgddc6k63n7erqz25le42c4u4ecky03ylcqca784w".to_owned(),
 			InvoiceBuilder::new(Currency::Bitcoin)
-				.timestamp(1496314658)
+				.timestamp_raw(1496314658)
 				.payment_hash(Sha256Hash::from_hex(
 						"0001020304050607080900010203040506070809000102030405060708090102"
 				).unwrap())
@@ -45,7 +45,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, Option<SemanticError>)> {
 			9zw97j25emudupq63nyw24cg27h2rspfj9srp".to_owned(),
 			InvoiceBuilder::new(Currency::Bitcoin)
 				.amount_pico_btc(2500000000)
-				.timestamp(1496314658)
+				.timestamp_raw(1496314658)
 				.payment_hash(Sha256Hash::from_hex(
 					"0001020304050607080900010203040506070809000102030405060708090102"
 				).unwrap())
@@ -75,7 +75,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, Option<SemanticError>)> {
 			hhr8wpald05e92xw006sq94mg8v2ndf4sefvf9sygkshp5zfem29trqq2yxxz7".to_owned(),
 			InvoiceBuilder::new(Currency::Bitcoin)
 				.amount_pico_btc(20000000000)
-				.timestamp(1496314658)
+				.timestamp_raw(1496314658)
 				.payment_hash(Sha256Hash::from_hex(
 					"0001020304050607080900010203040506070809000102030405060708090102"
 				).unwrap())
