verifier: Use the VirTEE CA Chain

This introduces changes into the code to utilize the cert chain provided by the VirTEE sev crate, pushing resposibility for upkeep and maintainership back to the library itself. This also reduces duplication of code and expands functionality for future changes. Review Changes: - Adding whitespace back to Makefile Signed-off-by: Larry Dewey <[email protected]>
confidential-containers · Jul 29, 2024 · cba1195 · cba1195
1 parent 5e27ab3
commit cba1195
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 133 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,9 +34,13 @@ kbs-types = "0.6.0"
 kms = { git = "https://github.com/confidential-containers/guest-components.git", rev="9bd6f06a9704e01808e91abde130dffb20e632a5", default-features = false }
 jsonwebtoken = { version = "9", default-features = false }
 log = "0.4.17"
-prost = "0.12"
-regorus = { version = "0.1.5", default-features = false, features = ["regex", "base64", "time"] }
-reqwest = "0.12"
+prost = "0.12.0"
+regorus = { version = "0.1.5", default-features = false, features = [
+    "regex",
+    "base64",
+    "time",
+] }
+reqwest = { version = "0.12", default-features = false }
 rstest = "0.18.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.89"
@@ -46,7 +50,11 @@ sha2 = "0.10"
 shadow-rs = "0.19.0"
 strum = { version = "0.25", features = ["derive"] }
 thiserror = "1.0"
-tokio = { version = "1", features = ["full"] }
+tokio = { version = "1", features = ["full"], default-features = false }
 tempfile = "3.4.0"
 tonic = "0.11"
-tonic-build = "0.11"
+tonic-build = "0.11"
+
+# Will be removed after updates are pulled in upstream
+[patch.crates-io]
+sev = { version = "3.1.1", path = "/home/larry/git/larrydewey/virtee-sev" }
diff --git a/deps/verifier/Cargo.toml b/deps/verifier/Cargo.toml
@@ -4,31 +4,44 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-default = [ "all-verifier" ]
-all-verifier = [ "tdx-verifier", "sgx-verifier", "snp-verifier", "az-snp-vtpm-verifier", "az-tdx-vtpm-verifier", "csv-verifier", "cca-verifier", "se-verifier" ]
-tdx-verifier = [ "eventlog-rs", "scroll", "intel-tee-quote-verification-rs" ]
-sgx-verifier = [ "scroll", "intel-tee-quote-verification-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 = [ "ear", "jsonwebtoken", "veraison-apiclient" ]
-se-verifier = [ "openssl", "pv", "serde_with", "tokio/sync" ]
+default = ["all-verifier"]
+all-verifier = [
+    "tdx-verifier",
+    "sgx-verifier",
+    "snp-verifier",
+    "az-snp-vtpm-verifier",
+    "az-tdx-vtpm-verifier",
+    "csv-verifier",
+    "cca-verifier",
+    "se-verifier",
+]
+tdx-verifier = ["eventlog-rs", "scroll", "intel-tee-quote-verification-rs"]
+sgx-verifier = ["scroll", "intel-tee-quote-verification-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 = ["ear", "jsonwebtoken", "veraison-apiclient"]
+se-verifier = ["openssl", "pv", "serde_with", "tokio/sync"]
 
 [dependencies]
 anyhow.workspace = true
 thiserror.workspace = true
 asn1-rs = { version = "0.5.1", optional = true }
 async-trait.workspace = true
-az-snp-vtpm = { version = "0.5.3", default-features = false, features = ["verifier"], optional = true }
-az-tdx-vtpm = { version = "0.5.3", default-features = false, features = ["verifier"], optional = true }
+az-snp-vtpm = { version = "0.5.3", default-features = false, features = [
+    "verifier",
+], optional = true }
+az-tdx-vtpm = { version = "0.5.3", default-features = false, features = [
+    "verifier",
+], optional = true }
 base64 = "0.21"
 bincode = "1.3.3"
 byteorder = "1"
 cfg-if = "1.0.0"
 codicon = { version = "3.0", optional = true }
 # TODO: change it to "0.1", once released.
-csv-rs = { git = "https://github.com/openanolis/csv-rs", rev = "b74aa8c", optional = true }
+csv-rs = { version = "=0.1.0", git = "https://github.com/openanolis/csv-rs", rev = "b74aa8c", optional = true }
 eventlog-rs = { version = "0.1.3", optional = true }
 hex.workspace = true
 jsonwebkey = "0.3.5"
@@ -37,13 +50,15 @@ kbs-types.workspace = true
 log.workspace = true
 openssl = { version = "0.10.55", optional = true }
 pv = { version = "0.10.0", package = "s390_pv", optional = true }
-scroll = { version = "0.11.0", default-features = false, features = ["derive"], optional = true }
+scroll = { version = "0.11.0", default-features = false, features = [
+    "derive",
+], optional = true }
 serde.workspace = true
 serde_json.workspace = true
 serde_with = { workspace = true, optional = true }
 sev = { version = "3.1.1", features = ["openssl", "snp"], optional = true }
 sha2.workspace = true 
-tokio = { workspace = true, optional = true, default-features = false }
+tokio = { workspace = true, optional = true }
 intel-tee-quote-verification-rs = { git = "https://github.com/intel/SGXDataCenterAttestationPrimitives", tag = "DCAP_1.21", optional = true }
 strum.workspace = true
 veraison-apiclient = { git = "https://github.com/chendave/rust-apiclient", branch = "token", optional = true }

diff --git a/deps/verifier/src/az_snp_vtpm/mod.rs b/deps/verifier/src/az_snp_vtpm/mod.rs
@@ -4,9 +4,7 @@
 //
 
 use super::{TeeEvidenceParsedClaim, Verifier};
-use crate::snp::{
-    load_milan_cert_chain, parse_tee_evidence, verify_report_signature, VendorCertificates,
-};
+use crate::snp::{load_milan_cert_chain, parse_tee_evidence, verify_report_signature};
 use crate::{InitDataHash, ReportData};
 use anyhow::{bail, Context, Result};
 use async_trait::async_trait;
@@ -19,6 +17,7 @@ use log::{debug, warn};
 use openssl::pkey::PKey;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
+use sev::certs::snp::Chain;
 use sev::firmware::host::{CertTableEntry, CertType};
 use thiserror::Error;
 
@@ -32,7 +31,7 @@ struct Evidence {
 }
 
 pub struct AzSnpVtpm {
-    vendor_certs: VendorCertificates,
+    vendor_certs: Chain,
 }
 
 #[derive(Error, Debug)]
@@ -54,12 +53,10 @@ pub enum CertError {
 }
 
 impl AzSnpVtpm {
-    pub fn new() -> Result<Self, CertError> {
-        let Result::Ok(vendor_certs) = load_milan_cert_chain() else {
-            return Err(CertError::LoadMilanCert);
-        };
-        let vendor_certs = vendor_certs.clone();
-        Ok(Self { vendor_certs })
+    pub fn new() -> Self {
+        Self {
+            vendor_certs: load_milan_cert_chain().clone(),
+        }
     }
 }
 
@@ -171,7 +168,7 @@ fn verify_report_data(
 fn verify_snp_report(
     snp_report: &AttestationReport,
     vcek: &Vcek,
-    vendor_certs: &VendorCertificates,
+    vendor_certs: &Chain,
 ) -> Result<(), CertError> {
     let vcek_data = vcek.0.to_der().context("Failed to get raw VCEK data")?;
     let cert_chain = [CertTableEntry::new(CertType::VCEK, vcek_data)];
@@ -199,7 +196,7 @@ mod tests {
         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-snp-vtpm/vcek.pem")).unwrap();
-        let vendor_certs = load_milan_cert_chain().as_ref().unwrap();
+        let vendor_certs = load_milan_cert_chain();
         verify_snp_report(&snp_report, &vcek, vendor_certs).unwrap();
     }
 
@@ -211,7 +208,7 @@ mod tests {
         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-snp-vtpm/vcek.pem")).unwrap();
-        let vendor_certs = load_milan_cert_chain().as_ref().unwrap();
+        let vendor_certs = load_milan_cert_chain();
         assert_eq!(
             verify_snp_report(&snp_report, &vcek, vendor_certs)
                 .unwrap_err()

diff --git a/deps/verifier/src/lib.rs b/deps/verifier/src/lib.rs
@@ -39,7 +39,7 @@ pub fn to_verifier(tee: &Tee) -> Result<Box<dyn Verifier + Send + Sync>> {
         Tee::AzSnpVtpm => {
             cfg_if::cfg_if! {
                 if #[cfg(feature = "az-snp-vtpm-verifier")] {
-                    let verifier = az_snp_vtpm::AzSnpVtpm::new()?;
+                    let verifier = az_snp_vtpm::AzSnpVtpm::new();
                     Ok(Box::new(verifier) as Box<dyn Verifier + Send + Sync>)
                 } else {
                     bail!("feature `az-snp-vtpm-verifier` is not enabled for `verifier` crate.")
@@ -67,7 +67,7 @@ pub fn to_verifier(tee: &Tee) -> Result<Box<dyn Verifier + Send + Sync>> {
         Tee::Snp => {
             cfg_if::cfg_if! {
                 if #[cfg(feature = "snp-verifier")] {
-                    let verifier = snp::Snp::new()?;
+                    let verifier = snp::Snp::new();
                     Ok(Box::new(verifier) as Box<dyn Verifier + Send + Sync>)
                 } else {
                     bail!("feature `snp-verifier` is not enabled for `verifier` crate.")