Merge target branch

Author: ameba23

Cargo.lock

@@ -57,6 +57,9 @@ default = []
 # Adds support for Microsoft Azure attestation generation and verification
 azure = ["attestation/azure"]
 
+# Adds support for mock attestations for testing. Do not enable in production.
+mock = ["attestation/mock"]
+
 [package.metadata.deb]
 maintainer = "Flashbots Team <devops+ci@flashbots.net>"
 depends = "$auto"

Cargo.toml

@@ -97,7 +97,7 @@ async fn main() -> anyhow::Result<()> {
             let attestation_verifier = AttestationVerifier {
                 measurement_policy,
                 pccs_url: None,
-                log_dcap_quote: cli.log_dcap_quote,
+                dump_dcap_quotes: cli.log_dcap_quote,
                 override_azure_outdated_tcb: false,
             };
 

attestation-provider-server/src/main.rs

@@ -193,7 +193,7 @@ impl AttestedTlsServer {
         let remote_attestation_type = remote_attestation_message.attestation_type;
 
         // If we expect an attestaion from the client, verify it and get measurements
-        let measurements = if self.attestation_verifier.has_remote_attestion() {
+        let measurements = if self.attestation_verifier.has_remote_attestation() {
             let remote_input_data = compute_report_input(remote_cert_chain.as_deref(), exporter)?;
 
             self.attestation_verifier
@@ -745,7 +745,7 @@ mod tests {
         let attestation_verifier = AttestationVerifier {
             measurement_policy,
             pccs_url: None,
-            log_dcap_quote: false,
+            dump_dcap_quotes: false,
             override_azure_outdated_tcb: false,
         };
 

attested-tls/src/lib.rs

@@ -1710,7 +1710,7 @@ mod tests {
             .await
             .unwrap();
 
-        let echoed: serde_json::Value = res.json().await.unwrap();
+        let echoed: serde_json::Value = serde_json::from_slice(&res.bytes().await.unwrap()).unwrap();
         assert!(echoed["measurement"].is_null());
         assert!(echoed["attestation_type"].is_null());
     }