Merge pull request #637 from Dstack-TEE/refactor/attest-cbor-to-msgpack

kvinwang · web-flow · commit 7ea4c5530d06 · 2026-04-09T06:38:29.000Z
refactor: replace cbor with msgpack for AttestationV1 wire format
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dstack-attest/Cargo.toml b/dstack-attest/Cargo.toml
@@ -12,7 +12,7 @@ license.workspace = true
 [dependencies]
 anyhow.workspace = true
 cc-eventlog.workspace = true
-ciborium.workspace = true
+rmp-serde.workspace = true
 dcap-qvl.workspace = true
 dstack-types.workspace = true
 ez-hash.workspace = true
diff --git a/dstack-attest/src/attestation.rs b/dstack-attest/src/attestation.rs
@@ -52,8 +52,9 @@ fn read_vm_config() -> Result<String> {
     Ok(sys_config.vm_config)
 }
 
-fn is_cbor_map_prefix(byte: u8) -> bool {
-    matches!(byte, 0xa0..=0xbf)
+fn is_msgpack_map_prefix(byte: u8) -> bool {
+    // fixmap (0x80..=0x8f), map16 (0xde), map32 (0xdf)
+    matches!(byte, 0x80..=0x8f | 0xde | 0xdf)
 }
 
 impl From<Attestation> for AttestationV1 {
@@ -409,8 +410,8 @@ impl VersionedAttestation {
                 LegacyVersionedAttestation::V0 { attestation } => Ok(Self::V0 { attestation }),
             };
         }
-        if is_cbor_map_prefix(first) {
-            let attestation = AttestationV1::from_cbor(bytes)?;
+        if is_msgpack_map_prefix(first) {
+            let attestation = AttestationV1::from_msgpack(bytes)?;
             return Ok(Self::V1 { attestation });
         }
         bail!("Unknown attestation wire format");
@@ -423,7 +424,7 @@ impl VersionedAttestation {
                 attestation: attestation.clone(),
             }
             .encode()),
-            Self::V1 { attestation } => attestation.to_cbor(),
+            Self::V1 { attestation } => attestation.to_msgpack(),
         }
     }
 
@@ -1336,7 +1337,7 @@ mod tests {
             .into_v1()
             .into_dstack_pod(payload.clone());
         let encoded = VersionedAttestation::V1 { attestation }.to_bytes().unwrap();
-        assert!(matches!(encoded.first(), Some(0xa0..=0xbf)));
+        assert!(matches!(encoded.first(), Some(0x80..=0x8f)));
         let decoded = VersionedAttestation::from_bytes(&encoded)
             .expect("decode attestation")
             .into_v1();
diff --git a/dstack-attest/src/v1.rs b/dstack-attest/src/v1.rs
@@ -147,21 +147,18 @@ impl Attestation {
         }
     }
 
-    pub fn to_cbor(&self) -> Result<Vec<u8>> {
+    pub fn to_msgpack(&self) -> Result<Vec<u8>> {
         let mut normalized = self.clone();
         normalized.version = ATTESTATION_VERSION;
-        let mut bytes = Vec::new();
-        ciborium::into_writer(&normalized, &mut bytes)
-            .context("Failed to encode attestation as CBOR")?;
-        Ok(bytes)
+        rmp_serde::to_vec_named(&normalized).context("failed to encode attestation as msgpack")
     }
 
-    pub fn from_cbor(bytes: &[u8]) -> Result<Self> {
+    pub fn from_msgpack(bytes: &[u8]) -> Result<Self> {
         let value: Self =
-            ciborium::from_reader(bytes).context("Failed to decode attestation from CBOR")?;
+            rmp_serde::from_slice(bytes).context("failed to decode attestation from msgpack")?;
         if value.version != ATTESTATION_VERSION {
             bail!(
-                "Unsupported attestation version: expected {}, got {}",
+                "unsupported attestation version: expected {}, got {}",
                 ATTESTATION_VERSION,
                 value.version
             );
@@ -199,7 +196,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn cbor_roundtrip_preserves_attestation() {
+    fn msgpack_roundtrip_preserves_attestation() {
         let attestation = Attestation::new(
             PlatformEvidence::Tdx {
                 quote: vec![1u8, 2, 3],
@@ -222,9 +219,9 @@ mod tests {
             },
         );
 
-        let encoded = attestation.to_cbor().expect("encode cbor");
-        assert!(matches!(encoded.first(), Some(0xa0..=0xbf)));
-        let decoded = Attestation::from_cbor(&encoded).expect("decode cbor");
+        let encoded = attestation.to_msgpack().expect("encode msgpack");
+        assert!(matches!(encoded.first(), Some(0x80..=0x8f)));
+        let decoded = Attestation::from_msgpack(&encoded).expect("decode msgpack");
         assert_eq!(decoded.version, ATTESTATION_VERSION);
         match decoded.platform {
             PlatformEvidence::Tdx { quote, event_log } => {

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,9 @@ fn read_vm_config() -> Result<String> {`
`52`	`52`	`Ok(sys_config.vm_config)`
`53`	`53`	`}`
`54`	`54`
`55`		`-fn is_cbor_map_prefix(byte: u8) -> bool {`
`56`		`- matches!(byte, 0xa0..=0xbf)`
	`55`	`+fn is_msgpack_map_prefix(byte: u8) -> bool {`
	`56`	`+ // fixmap (0x80..=0x8f), map16 (0xde), map32 (0xdf)`
	`57`	`+ matches!(byte, 0x80..=0x8f \| 0xde \| 0xdf)`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`impl From<Attestation> for AttestationV1 {`
`@@ -409,8 +410,8 @@ impl VersionedAttestation {`
`409`	`410`	`LegacyVersionedAttestation::V0 { attestation } => Ok(Self::V0 { attestation }),`
`410`	`411`	`};`
`411`	`412`	`}`
`412`		`- if is_cbor_map_prefix(first) {`
`413`		`- let attestation = AttestationV1::from_cbor(bytes)?;`
	`413`	`+ if is_msgpack_map_prefix(first) {`
	`414`	`+ let attestation = AttestationV1::from_msgpack(bytes)?;`
`414`	`415`	`return Ok(Self::V1 { attestation });`
`415`	`416`	`}`
`416`	`417`	`bail!("Unknown attestation wire format");`
`@@ -423,7 +424,7 @@ impl VersionedAttestation {`
`423`	`424`	`attestation: attestation.clone(),`
`424`	`425`	`}`
`425`	`426`	`.encode()),`
`426`		`- Self::V1 { attestation } => attestation.to_cbor(),`
	`427`	`+ Self::V1 { attestation } => attestation.to_msgpack(),`
`427`	`428`	`}`
`428`	`429`	`}`
`429`	`430`
`@@ -1336,7 +1337,7 @@ mod tests {`
`1336`	`1337`	`.into_v1()`
`1337`	`1338`	`.into_dstack_pod(payload.clone());`
`1338`	`1339`	`let encoded = VersionedAttestation::V1 { attestation }.to_bytes().unwrap();`
`1339`		`- assert!(matches!(encoded.first(), Some(0xa0..=0xbf)));`
	`1340`	`+ assert!(matches!(encoded.first(), Some(0x80..=0x8f)));`
`1340`	`1341`	`let decoded = VersionedAttestation::from_bytes(&encoded)`
`1341`	`1342`	`.expect("decode attestation")`
`1342`	`1343`	`.into_v1();`