fix: bug in v2 gap comparison

elmurci · Feb 11, 2025 · 2f78504 · 2f78504
1 parent 47c304c
commit 2f78504
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/time.rs b/src/time.rs
@@ -37,7 +37,12 @@ pub fn get_timestamp() -> Result<u64> {
 
 pub fn blobs_have_no_time_gaps(mut blobs: Vec<BlobV2>) -> Result<bool> {
     // Sort by start date
-    blobs.sort_by_key(|blob| blob.decoded_blob.as_ref().unwrap().effective.unwrap());
+    blobs.sort_by_key(|blob| {
+        blob.decoded_blob
+            .as_ref()
+            .and_then(|decoded| decoded.effective)
+            .unwrap_or_default()
+    });
 
     // Early return if empty or only one blob
     if blobs.len() < 2 {
@@ -51,13 +56,13 @@ pub fn blobs_have_no_time_gaps(mut blobs: Vec<BlobV2>) -> Result<bool> {
         if next
             .decoded_blob
             .as_ref()
-            .context("Could not get Decoded Blob")?
+            .context("Could not get next Decoded Blob")?
             .effective
-            .context("Could not get Effectivate date")?
+            .context("Could not get next Effectivate date")?
             > current
                 .decoded_blob
                 .as_ref()
-                .context("Could not get Decoded Blob")?
+                .context("Could not get current Decoded Blob")?
                 .expiration
         {
             return Ok(false);

diff --git a/src/vl.rs b/src/vl.rs
@@ -248,10 +248,7 @@ pub async fn sign_vl(
         } else {
             anyhow::bail!(VlValidationError::MalformedVl);
         }
-        // Make sure there is no gap when generating new UNLs
-        if !blobs_have_no_time_gaps(v.blobs_v2.context("Missing blobs_v2")?)? {
-            anyhow::bail!(VlValidationError::HasGaps);
-        }
+
     }
 
     let mut vl = v2_vl.clone().unwrap_or_default();
@@ -343,6 +340,11 @@ pub async fn sign_vl(
                 blob_verification: None,
             });
         vl.version = 2;
+
+        // Make sure there is no gap when generating new UNLs
+        if !blobs_have_no_time_gaps(decode_vl_v2(&vl.clone())?.decoded_blobs_v2.context("Could not get blobs v2")?)? {
+            anyhow::bail!(VlValidationError::HasGaps);
+        }
     }
 
     Ok(vl)