Encode attestation type as enum

Author: ameba23

Cargo.lock

@@ -27,6 +27,7 @@ bytes = "1.10.1"
 http = "1.3.1"
 serde_json = "1.0.145"
 serde = "1.0.228"
+serde_plain = "1.0.2"
 
 [dev-dependencies]
 rcgen = "0.14.5"

Cargo.toml

@@ -174,8 +174,10 @@ pub async fn get_measurements_from_file(
     for measurement in measurements_simple {
         measurements.push(MeasurementRecord {
             measurement_id: measurement.measurement_id,
-            attestation_type: AttestationType::parse_from_str(&measurement.attestation_type)
-                .map_err(|_| MeasurementFormatError::AttestationTypeNotValid)?,
+            attestation_type: serde_json::from_value(serde_json::Value::String(
+                measurement.attestation_type,
+            ))
+            .map_err(|_| MeasurementFormatError::AttestationTypeNotValid)?,
             measurements: Measurements {
                 platform: PlatformMeasurements {
                     mrtd: hex::decode(&measurement.measurements["0"].expected)?

src/attestation/measurements.rs

@@ -24,7 +24,7 @@ const PCS_URL: &str = "https://api.trustedservices.intel.com";
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct AttesationPayload {
-    pub attestation_type: String, // TODO should be AttestationType
+    pub attestation_type: AttestationType,
     pub attestation: Vec<u8>,
 }
 
@@ -35,15 +35,16 @@ impl AttesationPayload {
         attesation_generator: Arc<dyn QuoteGenerator>,
     ) -> Result<Self, AttestationError> {
         Ok(Self {
-            attestation_type: attesation_generator.attestation_type().as_str().to_string(),
+            attestation_type: attesation_generator.attestation_type(),
             attestation: attesation_generator.create_attestation(cert_chain, exporter)?,
         })
     }
 }
 
 /// Type of attestaion used
 /// Only supported (or soon-to-be supported) types are given
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
 pub enum AttestationType {
     /// No attestion
     None,
@@ -72,17 +73,17 @@ impl AttestationType {
         }
     }
 
-    pub fn parse_from_str(input: &str) -> Result<Self, AttestationError> {
-        match input {
-            "none" => Ok(Self::None),
-            "dummy" => Ok(Self::Dummy),
-            "azure-tdx" => Ok(Self::AzureTdx),
-            "qemu-tdx" => Ok(Self::QemuTdx),
-            "dcap-tdx" => Ok(Self::DcapTdx),
-            "gcp-tdx" => Ok(Self::GcpTdx),
-            _ => Err(AttestationError::AttestationTypeNotSupported),
-        }
-    }
+    // pub fn parse_from_str(input: &str) -> Result<Self, AttestationError> {
+    //     match input {
+    //         "none" => Ok(Self::None),
+    //         "dummy" => Ok(Self::Dummy),
+    //         "azure-tdx" => Ok(Self::AzureTdx),
+    //         "qemu-tdx" => Ok(Self::QemuTdx),
+    //         "dcap-tdx" => Ok(Self::DcapTdx),
+    //         "gcp-tdx" => Ok(Self::GcpTdx),
+    //         _ => Err(AttestationError::AttestationTypeNotSupported),
+    //     }
+    // }
 
     pub fn get_quote_generator(&self) -> Result<Arc<dyn QuoteGenerator>, AttestationError> {
         match self {
@@ -154,8 +155,7 @@ impl AttestationVerifier {
         cert_chain: &[CertificateDer<'_>],
         exporter: [u8; 32],
     ) -> Result<Option<Measurements>, AttestationError> {
-        let attestation_type =
-            AttestationType::parse_from_str(&attestation_payload.attestation_type)?;
+        let attestation_type = attestation_payload.attestation_type;
 
         let measurements = match attestation_type {
             AttestationType::DcapTdx => {

src/attestation/mod.rs

@@ -210,7 +210,7 @@ impl ProxyServer {
         {
             let remote_attestation_payload: AttesationPayload = serde_json::from_slice(&buf)?;
 
-            let remote_attestation_type = remote_attestation_payload.attestation_type.clone();
+            let remote_attestation_type = remote_attestation_payload.attestation_type;
             (
                 attestation_verifier
                     .verify_attestation(
@@ -222,7 +222,7 @@ impl ProxyServer {
                 remote_attestation_type,
             )
         } else {
-            (None, AttestationType::None.to_string())
+            (None, AttestationType::None)
         };
 
         let http = Builder::new();
@@ -501,8 +501,7 @@ impl ProxyClient {
         tls_stream.read_exact(&mut buf).await?;
 
         let remote_attestation_payload: AttesationPayload = serde_json::from_slice(&buf)?;
-        let remote_attestation_type =
-            AttestationType::parse_from_str(&remote_attestation_payload.attestation_type)?;
+        let remote_attestation_type = remote_attestation_payload.attestation_type;
 
         let measurements = attestation_verifier
             .verify_attestation(remote_attestation_payload, &remote_cert_chain, exporter)

src/lib.rs

@@ -137,8 +137,8 @@ async fn main() -> anyhow::Result<()> {
                 None => AttestationVerifier::do_not_verify(),
             };
 
-            let client_attestation_type = AttestationType::parse_from_str(
-                &client_attestation_type.unwrap_or("none".to_string()),
+            let client_attestation_type: AttestationType = serde_json::from_value(
+                serde_json::Value::String(client_attestation_type.unwrap_or("none".to_string())),
             )?;
 
             let client_attestation_generator = client_attestation_type.get_quote_generator()?;
@@ -170,8 +170,8 @@ async fn main() -> anyhow::Result<()> {
             let tls_cert_and_chain =
                 load_tls_cert_and_key(tls_certificate_path, tls_private_key_path)?;
 
-            let server_attestation_type = AttestationType::parse_from_str(
-                &server_attestation_type.unwrap_or("none".to_string()),
+            let server_attestation_type: AttestationType = serde_json::from_value(
+                serde_json::Value::String(server_attestation_type.unwrap_or("none".to_string())),
             )?;
 
             let local_attestation_generator = server_attestation_type.get_quote_generator()?;