Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions attested-tls/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ impl AttestedTlsServer {
self.attestation_verifier
.verify_attestation(remote_attestation_message, remote_input_data)
.await?
.map(|verified| verified.measurements)
} else {
None
};
Expand Down Expand Up @@ -382,7 +383,8 @@ impl AttestedTlsClient {
let measurements = self
.attestation_verifier
.verify_attestation(remote_attestation_message, remote_input_data)
.await?;
.await?
.map(|verified| verified.measurements);

// If we are in a CVM, provide an attestation
let attestation = if self.attestation_generator.attestation_type != AttestationType::None {
Expand Down Expand Up @@ -633,7 +635,7 @@ mod tests {
use super::*;

use crate::test_helpers::{generate_certificate_chain, generate_tls_config};
use attestation::measurements::MeasurementPolicy;
use attestation::{PccsMode, measurements::MeasurementPolicy};
use tokio::net::TcpListener;

#[tokio::test]
Expand Down Expand Up @@ -752,8 +754,9 @@ mod tests {
)
.unwrap();

let mut attestation_verifier = AttestationVerifier::mock();
attestation_verifier.measurement_policy = measurement_policy;
let attestation_verifier = AttestationVerifier::builder(measurement_policy)
.with_pccs_mode(PccsMode::None)
.build();

let client = AttestedTlsClient::new_with_tls_config(
client_config,
Expand Down
8 changes: 5 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,8 @@ where
#[cfg(test)]
mod tests {
use crate::{
attestation::measurements::MeasurementPolicy, attested_tls::get_tls_cert_with_config,
attestation::{PccsMode, measurements::MeasurementPolicy},
attested_tls::get_tls_cert_with_config,
};

use super::*;
Expand Down Expand Up @@ -1338,8 +1339,9 @@ mod tests {
)
.unwrap();

let mut attestation_verifier = AttestationVerifier::mock();
attestation_verifier.measurement_policy = measurement_policy;
let attestation_verifier = AttestationVerifier::builder(measurement_policy)
.with_pccs_mode(PccsMode::None)
.build();

let proxy_client_result = ProxyClient::new_with_tls_config(
client_config,
Expand Down
19 changes: 11 additions & 8 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ use attested_tls_proxy::{
attested_get::{attested_get, split_target_and_path},
attested_tls::{
TlsCertAndKey,
attestation::{AttestationType, AttestationVerifier, measurements::MeasurementPolicy},
attestation::{
AttestationType, AttestationVerifier, PccsMode, measurements::MeasurementPolicy,
},
},
file_server::attested_file_server,
get_tls_cert, health_check,
Expand Down Expand Up @@ -230,13 +232,14 @@ async fn main() -> anyhow::Result<()> {
}
};

let mut attestation_verifier = AttestationVerifier::new(
measurement_policy,
None,
cli.log_dcap_quote,
cli.override_azure_outdated_tcb,
);
attestation_verifier.internal_pccs = Some(pccs::Pccs::new_without_prewarm(cli.pccs_url));
let mut attestation_verifier_builder = AttestationVerifier::builder(measurement_policy)
.with_pccs_mode(PccsMode::Lazy)
.with_dump_dcap_quotes(cli.log_dcap_quote)
.with_override_azure_outdated_tcb(cli.override_azure_outdated_tcb);
if let Some(pccs_url) = cli.pccs_url {
attestation_verifier_builder = attestation_verifier_builder.with_pccs_url(pccs_url);
}
let attestation_verifier = attestation_verifier_builder.build();

match cli.command {
CliCommand::Client {
Expand Down
Loading