attestation-service: add az-tdx-vtpm verifier

- Added verification code - Added tdx fixtures and test cases - Reorganized snp fixtures - Added missing dependency for tdx e2e test - Added entry for e2e test Signed-off-by: Magnus Kulke <[email protected]>
confidential-containers · Nov 29, 2023 · aaf600c · aaf600c
1 parent 6aab539
commit aaf600c
Show file tree

Hide file tree

Showing 21 changed files with 255 additions and 45 deletions.
diff --git a/.github/workflows/kbs-e2e.yaml b/.github/workflows/kbs-e2e.yaml
@@ -16,8 +16,9 @@ jobs:
         tee:
         - sample
         # - az-snp-vtpm
+        # - az-tdx-vtpm
 
-    runs-on: ${{ ((matrix.tee == 'az-snp-vtpm') && fromJSON('["self-hosted","azure-cvm"]')) || 'ubuntu-22.04' }}
+    runs-on: ${{ ((matrix.tee == 'az-snp-vtpm') && fromJSON('["self-hosted","az-snp-vtpm"]')) || ((matrix.tee == 'az-tdx-vtpm') && fromJSON('["self-hosted","az-tdx-vtpm"]')) || 'ubuntu-22.04' }}
 
     steps:
     - uses: actions/checkout@v4

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/attestation-service/attestation-service/Cargo.toml b/attestation-service/attestation-service/Cargo.toml
@@ -9,6 +9,7 @@ all-verifier = [ "verifier/all-verifier" ]
 tdx-verifier = [ "verifier/tdx-verifier" ]
 sgx-verifier = [ "verifier/sgx-verifier" ]
 az-snp-vtpm-verifier = [ "verifier/az-snp-vtpm-verifier" ]
+az-tdx-vtpm-verifier = [ "verifier/az-tdx-vtpm-verifier" ]
 snp-verifier = [ "verifier/snp-verifier" ]
 csv-verifier = [ "verifier/csv-verifier" ]
 cca-verifier = [ "verifier/cca-verifier" ]
@@ -25,7 +26,7 @@ base64 = "0.21"
 cfg-if = "1.0.0"
 futures = "0.3.17"
 # TODO: change it to "0.5", once released.
-kbs-types = { git = "https://github.com/virtee/kbs-types", rev = "c90df0e" }
+kbs-types = { git = "https://github.com/virtee/kbs-types", rev = "90b13bb" }
 lazy_static = "1.4.0"
 log.workspace = true
 openssl = { version = "0.10.55", optional = true }

diff --git a/attestation-service/verifier/Cargo.toml b/attestation-service/verifier/Cargo.toml
@@ -5,10 +5,11 @@ edition = "2021"
 
 [features]
 default = [ "all-verifier" ]
-all-verifier = [ "tdx-verifier", "sgx-verifier", "snp-verifier", "az-snp-vtpm-verifier", "csv-verifier", "cca-verifier" ]
+all-verifier = [ "tdx-verifier", "sgx-verifier", "snp-verifier", "az-snp-vtpm-verifier", "az-tdx-vtpm-verifier", "csv-verifier", "cca-verifier" ]
 tdx-verifier = [ "eventlog-rs", "scroll", "sgx-dcap-quoteverify-rs" ]
 sgx-verifier = [ "scroll", "sgx-dcap-quoteverify-rs" ]
 az-snp-vtpm-verifier = [ "az-snp-vtpm", "sev", "snp-verifier" ]
+az-tdx-vtpm-verifier = [ "az-tdx-vtpm", "openssl", "tdx-verifier" ]
 snp-verifier = [ "asn1-rs", "openssl", "sev", "x509-parser" ]
 csv-verifier = [ "openssl", "csv-rs", "codicon" ]
 cca-verifier = [ "cbor-diag", "veraison-apiclient" ]
@@ -18,6 +19,7 @@ anyhow.workspace = true
 asn1-rs = { version = "0.5.1", optional = true }
 async-trait.workspace = true
 az-snp-vtpm = { version = "0.4", default-features = false, features = ["verifier"], optional = true }
+az-tdx-vtpm = { version = "0.4", default-features = false, features = ["verifier"], optional = true }
 base64 = "0.21"
 bincode = "1.3.3"
 byteorder = "1"
@@ -30,7 +32,7 @@ eventlog-rs = { version = "0.1.3", optional = true }
 hex = "0.4.3"
 jsonwebtoken = "8"
 # TODO: change it to "0.5", once released.
-kbs-types = { git = "https://github.com/virtee/kbs-types", rev = "c90df0e" }
+kbs-types = { git = "https://github.com/virtee/kbs-types", rev = "90b13bb" }
 log.workspace = true
 openssl = { version = "0.10.55", optional = true }
 scroll = { version = "0.11.0", default-features = false, features = ["derive"], optional = true }

diff --git a/attestation-service/verifier/src/az_snp_vtpm/mod.rs b/attestation-service/verifier/src/az_snp_vtpm/mod.rs
@@ -122,16 +122,16 @@ fn verify_snp_report(
 mod tests {
     use super::*;
 
-    const REPORT: &[u8; 2048] = include_bytes!("../../test_data/az-hcl-data.bin");
-    const SIGNATURE: &[u8; 256] = include_bytes!("../../test_data/az-vtpm-quote-sig.bin");
-    const MESSAGE: &[u8; 122] = include_bytes!("../../test_data/az-vtpm-quote-msg.bin");
+    const REPORT: &[u8; 2048] = include_bytes!("../../test_data/az-snp-vtpm/hcl-report.bin");
+    const SIGNATURE: &[u8; 256] = include_bytes!("../../test_data/az-snp-vtpm/tpm-quote.sig");
+    const MESSAGE: &[u8; 122] = include_bytes!("../../test_data/az-snp-vtpm/tpm-quote.msg");
     const REPORT_DATA: &[u8] = "challenge".as_bytes();
 
     #[test]
     fn test_verify_snp_report() {
         let hcl_report = HclReport::new(REPORT.to_vec()).unwrap();
         let snp_report = hcl_report.try_into().unwrap();
-        let vcek = Vcek::from_pem(include_str!("../../test_data/az-vcek.pem")).unwrap();
+        let vcek = Vcek::from_pem(include_str!("../../test_data/az-snp-vtpm/vcek.pem")).unwrap();
         let vendor_certs = load_milan_cert_chain().as_ref().unwrap();
         verify_snp_report(&snp_report, &vcek, vendor_certs).unwrap();
     }
@@ -143,7 +143,7 @@ mod tests {
         wrong_report[0x00b0] = 0;
         let hcl_report = HclReport::new(wrong_report.to_vec()).unwrap();
         let snp_report = hcl_report.try_into().unwrap();
-        let vcek = Vcek::from_pem(include_str!("../../test_data/az-vcek.pem")).unwrap();
+        let vcek = Vcek::from_pem(include_str!("../../test_data/az-snp-vtpm/vcek.pem")).unwrap();
         let vendor_certs = load_milan_cert_chain().as_ref().unwrap();
         verify_snp_report(&snp_report, &vcek, vendor_certs).unwrap_err();
     }
@@ -194,7 +194,7 @@ mod tests {
             signature: SIGNATURE.to_vec(),
             message: MESSAGE.to_vec(),
         };
-        let report = include_bytes!("../../test_data/az-hcl-data.bin");
+        let report = include_bytes!("../../test_data/az-snp-vtpm/hcl-report.bin");
         let hcl_report = HclReport::new(report.to_vec()).unwrap();
         let mut report_data = REPORT_DATA.to_vec();
         report_data.reverse();