Merge branch 'master' into hash_ek

keylime · Jun 3, 2022 · de8cbf5 · de8cbf5
2 parents 8833138 + aed51c7
commit de8cbf5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/packit-ci.fmf b/packit-ci.fmf
@@ -2,6 +2,9 @@
 
   summary: run keylime e2e tests
 
+  environment:
+    TPM_BINARY_MEASUREMENTS: /var/tmp/binary_bios_measurements
+
   prepare:
     how: shell
     script:
@@ -20,6 +23,7 @@
        - /functional/basic-attestation-without-mtls
        - /functional/basic-attestation-with-unpriviledged-agent
        - /functional/keylime_tenant-commands-on-localhost
+       - /functional/measured-boot-swtpm-sanity
 
   adjust:
    # prepare step adjustments

diff --git a/src/quotes_handler.rs b/src/quotes_handler.rs
@@ -221,6 +221,15 @@ pub async fn integrity(
             if let Some(measuredboot_ml_file) = &data.measuredboot_ml_file {
                 let mut ml = Vec::<u8>::new();
                 let mut f = measuredboot_ml_file.lock().unwrap(); //#[allow_ci]
+                if let Err(e) = f.rewind() {
+                    debug!("Failed to rewind measured boot file: {}", e);
+                    return HttpResponse::InternalServerError().json(
+                        JsonWrapper::error(
+                            500,
+                            "Unable to retrieve quote".to_string(),
+                        ),
+                    );
+                }
                 mb_measurement_list = match f.read_to_end(&mut ml) {
                     Ok(_) => Some(base64::encode(ml)),
                     Err(e) => {