attestation: simplify cbor schema shape

Author: kvinwang

dstack-attest/Cargo.toml

@@ -14,7 +14,7 @@ anyhow.workspace = true
 cc-eventlog.workspace = true
 ciborium.workspace = true
 dcap-qvl.workspace = true
-dstack-attestation-types = { path = "../../../dstack-attestation-types" }
+dstack-attestation-types = { path = "../../../src/attestation-types" }
 dstack-types.workspace = true
 ez-hash.workspace = true
 fs-err.workspace = true

dstack-attest/src/attestation.rs

@@ -19,8 +19,8 @@ use dcap_qvl::{
     verify::VerifiedReport as TdxVerifiedReport,
 };
 use dstack_attestation_types::{
-    bytes_value, text_value, AttestationV1, Attribute as V1Attribute, Extension as V1Extension,
-    PlatformEvidence,
+    bytes_value, text_value, Attestation as SchemaAttestation, Attribute as V1Attribute,
+    Extension as V1Extension,
 };
 #[cfg(feature = "quote")]
 use dstack_types::SysConfig;
@@ -36,8 +36,8 @@ use sha2::Digest as _;
 const NATIVE_PLATFORM_TDX: &str = "tdx";
 const NATIVE_PLATFORM_GCP_TDX: &str = "gcp-tdx";
 const NATIVE_PLATFORM_NITRO_ENCLAVE: &str = "nitro-enclave";
-const DSTACK_VARIANT_DSTACK: &str = "dstack";
-const DSTACK_VARIANT_DSTACK_K8S: &str = "dstack-k8s";
+const DSTACK_PROFILE_DSTACK: &str = "dstack";
+const DSTACK_PROFILE_DSTACK_K8S: &str = "dstack-k8s";
 const DSTACK_TDX: &str = "dstack-tdx";
 const DSTACK_GCP_TDX: &str = "dstack-gcp-tdx";
 const DSTACK_NITRO_ENCLAVE: &str = "dstack-nitro-enclave";
@@ -130,7 +130,7 @@ fn optional_decoded_attribute<T: DeserializeOwned>(
     }
 }
 
-fn report_data_payload_v1(attestation: &AttestationV1) -> Option<&str> {
+fn report_data_payload_v1(attestation: &SchemaAttestation) -> Option<&str> {
     match find_extension(&attestation.extensions, EXT_REPORT_DATA_PAYLOAD) {
         Some(CborValue::Text(text)) => Some(text.as_str()),
         _ => None,
@@ -143,9 +143,9 @@ fn is_cbor_map_prefix(byte: u8) -> bool {
 
 fn legacy_into_v1(
     attestation: Attestation,
-    variant: &str,
+    profile: &str,
     extensions: Vec<V1Extension>,
-) -> AttestationV1 {
+) -> SchemaAttestation {
     let Attestation {
         quote,
         runtime_events,
@@ -159,21 +159,19 @@ fn legacy_into_v1(
         AttestationQuote::DstackGcpTdx => NATIVE_PLATFORM_GCP_TDX,
         AttestationQuote::DstackNitroEnclave => NATIVE_PLATFORM_NITRO_ENCLAVE,
     };
-    let mut platform = PlatformEvidence::new(native_platform, variant);
+    let mut v1 = SchemaAttestation::new(native_platform, profile);
     match quote {
         AttestationQuote::DstackTdx(TdxQuote { quote, event_log }) => {
-            platform
-                .basic_attributes
+            v1.basic_attributes
                 .push(V1Attribute::new(ATTR_TDX_QUOTE, bytes_value(quote)));
-            platform.basic_attributes.push(V1Attribute::new(
+            v1.basic_attributes.push(V1Attribute::new(
                 ATTR_TDX_EVENT_LOG,
                 to_cbor_value(&event_log).or_panic("TDX event log should encode to CBOR"),
             ));
         }
         AttestationQuote::DstackGcpTdx | AttestationQuote::DstackNitroEnclave => {}
     }
 
-    let mut v1 = AttestationV1::new(platform);
     v1.basic_attributes.push(V1Attribute::new(
         ATTR_REPORT_DATA,
         bytes_value(report_data.to_vec()),
@@ -188,7 +186,7 @@ fn legacy_into_v1(
     v1
 }
 
-fn v1_into_legacy(attestation: AttestationV1) -> Result<Attestation> {
+fn v1_into_legacy(attestation: SchemaAttestation) -> Result<Attestation> {
     let report_data_bytes =
         required_bytes_attribute(&attestation.basic_attributes, ATTR_REPORT_DATA)?;
     let report_data: [u8; 64] = report_data_bytes
@@ -200,20 +198,17 @@ fn v1_into_legacy(attestation: AttestationV1) -> Result<Attestation> {
             .unwrap_or_default();
     let config = optional_text_attribute(&attestation.optional_attributes, ATTR_CONFIG)?;
 
-    let quote = match attestation.platform.platform.as_str() {
+    let quote = match attestation.platform.as_str() {
         NATIVE_PLATFORM_TDX => {
-            let quote =
-                required_bytes_attribute(&attestation.platform.basic_attributes, ATTR_TDX_QUOTE)?;
-            let event_log: Vec<TdxEvent> = optional_decoded_attribute(
-                &attestation.platform.basic_attributes,
-                ATTR_TDX_EVENT_LOG,
-            )?
-            .unwrap_or_default();
+            let quote = required_bytes_attribute(&attestation.basic_attributes, ATTR_TDX_QUOTE)?;
+            let event_log: Vec<TdxEvent> =
+                optional_decoded_attribute(&attestation.basic_attributes, ATTR_TDX_EVENT_LOG)?
+                    .unwrap_or_default();
             AttestationQuote::DstackTdx(TdxQuote { quote, event_log })
         }
         NATIVE_PLATFORM_GCP_TDX => AttestationQuote::DstackGcpTdx,
         NATIVE_PLATFORM_NITRO_ENCLAVE => AttestationQuote::DstackNitroEnclave,
-        other => bail!("Unsupported platform in AttestationV1: {other}"),
+        other => bail!("Unsupported platform in attestation schema: {other}"),
     };
 
     Ok(Attestation {
@@ -225,11 +220,10 @@ fn v1_into_legacy(attestation: AttestationV1) -> Result<Attestation> {
     })
 }
 
-fn strip_v1_attestation(mut attestation: AttestationV1) -> AttestationV1 {
-    if let Some(event_log_value) = find_attribute_mut(
-        &mut attestation.platform.basic_attributes,
-        ATTR_TDX_EVENT_LOG,
-    ) {
+fn strip_v1_attestation(mut attestation: SchemaAttestation) -> SchemaAttestation {
+    if let Some(event_log_value) =
+        find_attribute_mut(&mut attestation.basic_attributes, ATTR_TDX_EVENT_LOG)
+    {
         let event_log: Vec<TdxEvent> =
             from_cbor_value(event_log_value).or_panic("TDX event log should decode from CBOR");
         let stripped: Vec<_> = event_log
@@ -460,7 +454,7 @@ pub enum VersionedAttestation {
     /// Extensible CBOR-encoded attestation.
     V1 {
         /// The version 1 attestation envelope.
-        attestation: AttestationV1,
+        attestation: SchemaAttestation,
     },
 }
 
@@ -506,11 +500,11 @@ impl VersionedAttestation {
             };
         }
         if is_cbor_map_prefix(first) {
-            let attestation = AttestationV1::from_cbor(bytes)?;
+            let attestation = SchemaAttestation::from_cbor(bytes)?;
             return Ok(Self::V1 { attestation });
         }
         if first == 0x01 && bytes.get(1).is_some_and(|byte| is_cbor_map_prefix(*byte)) {
-            let attestation = AttestationV1::from_cbor(&bytes[1..])?;
+            let attestation = SchemaAttestation::from_cbor(&bytes[1..])?;
             return Ok(Self::V1 { attestation });
         }
         bail!("Unknown attestation wire format");
@@ -525,7 +519,7 @@ impl VersionedAttestation {
             .encode(),
             Self::V1 { attestation } => attestation
                 .to_cbor()
-                .or_panic("AttestationV1 should encode as CBOR"),
+                .or_panic("attestation schema should encode as CBOR"),
         }
     }
 
@@ -601,7 +595,7 @@ impl VersionedAttestation {
             VersionedAttestation::V1 { attestation } => {
                 let report_data_payload = report_data_payload_v1(&attestation).map(str::to_owned);
                 let mut legacy = v1_into_legacy(attestation)
-                    .or_panic("AttestationV1 should project into legacy Attestation");
+                    .or_panic("attestation schema should project into legacy Attestation");
                 patch_legacy_report_data(&mut legacy, report_data);
                 match report_data_payload {
                     Some(payload) => legacy.into_versioned_with_report_data_payload(payload),
@@ -970,20 +964,20 @@ impl Attestation {
 }
 
 impl Attestation {
-    pub fn into_v1(self) -> AttestationV1 {
-        legacy_into_v1(self, DSTACK_VARIANT_DSTACK, Vec::new())
+    pub fn into_v1(self) -> SchemaAttestation {
+        legacy_into_v1(self, DSTACK_PROFILE_DSTACK, Vec::new())
     }
 
-    pub fn into_v1_with_extensions(self, extensions: Vec<V1Extension>) -> AttestationV1 {
-        legacy_into_v1(self, DSTACK_VARIANT_DSTACK, extensions)
+    pub fn into_v1_with_extensions(self, extensions: Vec<V1Extension>) -> SchemaAttestation {
+        legacy_into_v1(self, DSTACK_PROFILE_DSTACK, extensions)
     }
 
-    pub fn into_v1_with_variant_and_extensions(
+    pub fn into_v1_with_profile_and_extensions(
         self,
-        variant: &str,
+        profile: &str,
         extensions: Vec<V1Extension>,
-    ) -> AttestationV1 {
-        legacy_into_v1(self, variant, extensions)
+    ) -> SchemaAttestation {
+        legacy_into_v1(self, profile, extensions)
     }
 
     /// Verify the quote with optional custom time (testing hook)
@@ -1023,8 +1017,8 @@ impl Attestation {
         report_data_payload: String,
     ) -> VersionedAttestation {
         VersionedAttestation::V1 {
-            attestation: self.into_v1_with_variant_and_extensions(
-                DSTACK_VARIANT_DSTACK_K8S,
+            attestation: self.into_v1_with_profile_and_extensions(
+                DSTACK_PROFILE_DSTACK_K8S,
                 vec![V1Extension::new(
                     EXT_REPORT_DATA_PAYLOAD,
                     true,
@@ -1224,8 +1218,8 @@ mod tests {
         let VersionedAttestation::V1 { attestation } = decoded else {
             panic!("expected V1 attestation");
         };
-        assert_eq!(attestation.platform.platform, NATIVE_PLATFORM_TDX);
-        assert_eq!(attestation.platform.variant, DSTACK_VARIANT_DSTACK_K8S);
+        assert_eq!(attestation.platform, NATIVE_PLATFORM_TDX);
+        assert_eq!(attestation.profile, DSTACK_PROFILE_DSTACK_K8S);
     }
 
     #[test]
@@ -1238,9 +1232,9 @@ mod tests {
     }
 
     #[test]
-    fn legacy_v0_upgrade_uses_dstack_variant() {
+    fn legacy_v0_upgrade_uses_dstack_profile() {
         let upgraded = dummy_tdx_attestation([3u8; 64]).into_v1();
-        assert_eq!(upgraded.platform.platform, NATIVE_PLATFORM_TDX);
-        assert_eq!(upgraded.platform.variant, DSTACK_VARIANT_DSTACK);
+        assert_eq!(upgraded.platform, NATIVE_PLATFORM_TDX);
+        assert_eq!(upgraded.profile, DSTACK_PROFILE_DSTACK);
     }
 }