Default to auto, not none

Author: ameba23

src/attestation/mod.rs

@@ -121,14 +121,12 @@ impl AttestationGenerator {
         attestation_type_string: Option<String>,
         dummy_dcap_url: Option<String>,
     ) -> Result<Self, AttestationError> {
-        let attestaton_type = if attestation_type_string.as_deref() == Some("auto") {
+        let attestation_type_string = attestation_type_string.unwrap_or_else(|| "auto".to_string());
+        let attestaton_type = if attestation_type_string == "auto" {
             tracing::info!("Doing attestation type detection...");
             AttestationType::detect().await
         } else {
-            serde_json::from_value(serde_json::Value::String(
-                attestation_type_string.unwrap_or("none".to_string()),
-            ))
-            .unwrap()
+            serde_json::from_value(serde_json::Value::String(attestation_type_string))?
         };
         tracing::info!("Local platform: {attestaton_type}");
 
@@ -392,6 +390,8 @@ pub enum AttestationError {
     DummyUrl,
     #[error("Dummy server: {0}")]
     DummyServer(String),
+    #[error("JSON: {0}")]
+    SerdeJson(#[from] serde_json::Error),
 }
 
 #[cfg(test)]
@@ -401,6 +401,6 @@ mod tests {
     #[tokio::test]
     async fn attestation_detection_does_not_panic() {
         // We dont enforce what platform the test is run on, only that the function does not panic
-        let _ = AttestationGenerator::new_with_detection(Some("auto".to_string()), None).await;
+        let _ = AttestationGenerator::new_with_detection(None, None).await;
     }
 }

src/main.rs

@@ -43,7 +43,7 @@ enum CliCommand {
         listen_addr: SocketAddr,
         /// The hostname:port or ip:port of the proxy server (port defaults to 443)
         target_addr: String,
-        /// Type of attestation to present (dafaults to none)
+        /// Type of attestation to present (dafaults to 'auto' for automatic detection)
         /// If other than None, a TLS key and certicate must also be given
         #[arg(long, env = "CLIENT_ATTESTATION_TYPE")]
         client_attestation_type: Option<String>,
@@ -68,7 +68,7 @@ enum CliCommand {
         listen_addr: SocketAddr,
         /// Socket address of the target service to forward traffic to
         target_addr: SocketAddr,
-        /// Type of attestation to present (dafaults to none)
+        /// Type of attestation to present (dafaults to 'auto' for automatic detection)
         /// If other than None, a TLS key and certicate must also be given
         #[arg(long, env = "SERVER_ATTESTATION_TYPE")]
         server_attestation_type: Option<String>,
@@ -177,10 +177,6 @@ async fn main() -> anyhow::Result<()> {
                 None
             };
 
-            let client_attestation_type: AttestationType = serde_json::from_value(
-                serde_json::Value::String(client_attestation_type.unwrap_or("none".to_string())),
-            )?;
-
             let remote_tls_cert = match tls_ca_certificate {
                 Some(remote_cert_filename) => Some(
                     load_certs_pem(remote_cert_filename)?
@@ -192,7 +188,8 @@ async fn main() -> anyhow::Result<()> {
             };
 
             let client_attestation_generator =
-                AttestationGenerator::new(client_attestation_type, dev_dummy_dcap)?;
+                AttestationGenerator::new_with_detection(client_attestation_type, dev_dummy_dcap)
+                    .await?;
 
             let client = ProxyClient::new(
                 tls_cert_and_chain,
@@ -222,12 +219,9 @@ 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 = serde_json::from_value(
-                serde_json::Value::String(server_attestation_type.unwrap_or("none".to_string())),
-            )?;
-
             let local_attestation_generator =
-                AttestationGenerator::new(server_attestation_type, dev_dummy_dcap)?;
+                AttestationGenerator::new_with_detection(server_attestation_type, dev_dummy_dcap)
+                    .await?;
 
             let server = ProxyServer::new(
                 tls_cert_and_chain,