From 289cf60e57d80c9cf43d5a91d8c66422690c517e Mon Sep 17 00:00:00 2001
From: brycx <brycx@protonmail.com>
Date: Sun, 29 Nov 2020 14:25:32 +0100
Subject: [PATCH] Fix #22: Correctly set timestamp in Branca::new() which had
 Branca.encode() never generate a new one

---
 src/lib.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 0ebc9c6..cedc6f4 100755
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -139,6 +139,7 @@ pub struct Branca {
     /// The Branca Key which is exactly 32 bytes in length.
     key: Vec<u8>,
     /// The Branca Nonce which is exactly 24 bytes in length.
+    /// A new nonce is generated each time `encode()` is called.
     nonce: Vec<u8>,
     /// The Time-to-live field (TTL) to set the number of seconds
     /// for the token to be valid for after its creation set in the `timestamp` field.
@@ -146,7 +147,8 @@ pub struct Branca {
     /// If the TTL field is set to 0, then the expiration check is omitted.
     /// By default it is set to 0 when using `Branca::new(&key)` method.
     ttl: u32,
-    /// The creation time of the Branca token.
+    /// The creation time of the Branca token. If not specified manually, it is created
+    /// given the current system time, each time `encode()` is called.
     ///
     /// This is used together with the `ttl` to check if the token has expired or not.
     timestamp: u32,
@@ -197,17 +199,11 @@ impl Branca {
             return Err(BrancaError::BadKeyLength);
         }
 
-        // Generate a timestamp instead of a zero supplied one.
-        let timestamp = SystemTime::now()
-            .duration_since(SystemTime::UNIX_EPOCH)
-            .expect("Failed to obtain timestamp from system clock.")
-            .as_secs() as u32;
-
         Ok(Branca {
             key: key.to_vec(),
             nonce: Vec::new(),
             ttl: 0,
-            timestamp,
+            timestamp: 0,
         })
     }
 
@@ -230,6 +226,9 @@ impl Branca {
     /// When used with the TTL, the expiration time is determined simply by:
     /// `exp_timestamp = (timestamp + ttl)`
     ///
+    /// If this hasn't been specified manually, or `encode()` hasn't been called yet,
+    /// this returns `0`.
+    ///
     /// If the token has been set with a TTL, the decoder checks the validity of the token
     /// and any timestamp set before the future_time is valid, otherwise it is expired.
     pub fn timestamp(self) -> u32 {
@@ -256,6 +255,9 @@ impl Branca {
     ///
     /// This panics if unable to securely generate random bytes or if unable to obtain current system time.
     ///
+    /// If the `timestamp` hasn't been set, the current system time is used. If `timestamp` has been set and is not `0`,
+    /// that value is used for all tokens created with this function (until changed).
+    ///
     /// The contents of the message can be of any arbitrary sequence of bytes, ie. text, JSON, Protobuf, JWT or a MessagePack, etc.
     ///
     /// `message` - The data to be encoded as a Branca token.
@@ -274,6 +276,7 @@ impl Branca {
     /// }
     /// ```
     pub fn encode(&mut self, message: &[u8]) -> Result<String, BrancaError> {
+        // A timestamp has not been manually set, so we create one automatically.
         let mut timestamp = self.timestamp;
         if timestamp == 0 {
             // Generate a timestamp instead of a zero supplied one.
@@ -290,6 +293,7 @@ impl Branca {
 
         encode_with_nonce(message, &self.key, &Nonce::from(nonce), timestamp)
     }
+
     /// Decodes a Branca token with the provided key in the struct.
     ///
     /// `ciphertext` - The input which is to be decrypted with the key found in the Branca struct.