Merge pull request #127 from wa5i/bugfix

Fix bug causing authentication failure due to missing fields when using old tokens

Author: Paul Yang

src/modules/auth/token_store.rs

@@ -36,7 +36,7 @@ use crate::{
     storage::{Storage, StorageEntry},
     utils::{
         deserialize_duration, deserialize_system_time, generate_uuid, is_str_subset,
-        policy::sanitize_policies,
+        default_system_time, policy::sanitize_policies,
         serialize_duration, serialize_system_time, sha1,
         token_util::{DEFAULT_LEASE_TTL, MAX_LEASE_TTL},
     },
@@ -94,11 +94,11 @@ pub struct TokenEntry {
     pub num_uses: u32,
     pub ttl: u64,
     #[default(SystemTime::now())]
-    #[serde(serialize_with = "serialize_system_time", deserialize_with = "deserialize_system_time")]
+    #[serde(default = "default_system_time", serialize_with = "serialize_system_time", deserialize_with = "deserialize_system_time")]
     pub creation_time: SystemTime,
-    #[serde(serialize_with = "serialize_duration", deserialize_with = "deserialize_duration")]
+    #[serde(default, serialize_with = "serialize_duration", deserialize_with = "deserialize_duration")]
     pub period: Duration,
-    #[serde(serialize_with = "serialize_duration", deserialize_with = "deserialize_duration")]
+    #[serde(default, serialize_with = "serialize_duration", deserialize_with = "deserialize_duration")]
     pub explicit_max_ttl: Duration,
 }
 

src/modules/pki/mod.rs

@@ -598,7 +598,7 @@ x/+V28hUf8m8P2NxP5ALaDZagdaMfzjGZo3O3wDv33Cds0P5GMGQYnRXDxcZN/2L
     #[cfg(feature = "crypto_adaptor_tongsuo")]
     #[maybe_async::test(feature = "sync_handler", async(all(not(feature = "sync_handler")), tokio::test))]
     async fn test_pki_sm2_generate_root() {
-        let (root_token, c) = test_rusty_vault_init("test_pki_generate_root");
+        let (root_token, c) = test_rusty_vault_init("test_pki_sm2_generate_root");
         let token = &root_token;
         let core = c.read().unwrap();
         let path = "sm2pki/";

src/utils/mod.rs

@@ -152,3 +152,7 @@ pub fn is_protect_path(protected: &[&str], paths: &[&str]) -> bool {
 
     false
 }
+
+pub fn default_system_time() -> SystemTime {
+    SystemTime::UNIX_EPOCH
+}