Skip to content

Commit

Permalink
Refactor Rust variant conversion utilities to use traits.
Browse files Browse the repository at this point in the history 
Change-Id: I35e7fdfa1a1089a9a0c8a2783c74376431508665
ACKNOWLEDGE_FAILING_COPYBARA_IMPORT=Will fix manually
  • Loading branch information
@thmsbinder
thmsbinder committed Jan 21, 2025
1 parent fed6b05 commit 4f80981
Show file tree
Hide file tree
Showing 12 changed files with 169 additions and 98 deletions.
13 changes: 5 additions & 8 deletions oak_attestation_verification/src/policy/application.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//

use anyhow::Context;
use oak_attestation_verification_types::{policy::Policy, APPLICATION_ENDORSEMENT_ID};
use oak_attestation_verification_types::policy::Policy;
use oak_proto_rust::oak::{
attestation::v1::{
ApplicationEndorsement, ApplicationLayerData, ApplicationLayerReferenceValues,
Expand All @@ -26,8 +26,7 @@ use oak_proto_rust::oak::{

use crate::{
compare::compare_application_layer_measurement_digests,
expect::acquire_application_event_expected_values,
util::{decode_endorsement_proto, decode_event_proto},
expect::acquire_application_event_expected_values, util::decode_event_proto,
};

pub struct ApplicationPolicy {
Expand All @@ -47,17 +46,15 @@ impl Policy<[u8], Variant> for ApplicationPolicy {
fn verify(
&self,
encoded_event: &[u8],
encoded_event_endorsement: &Variant,
encoded_endorsement: &Variant,
milliseconds_since_epoch: i64,
) -> anyhow::Result<EventAttestationResults> {
let event = decode_event_proto::<ApplicationLayerData>(
"type.googleapis.com/oak.attestation.v1.ApplicationLayerData",
encoded_event,
)?;
let endorsement = decode_endorsement_proto::<ApplicationEndorsement>(
&APPLICATION_ENDORSEMENT_ID,
encoded_event_endorsement,
)?;
let endorsement: ApplicationEndorsement =
encoded_endorsement.try_into().map_err(anyhow::Error::msg)?;

let expected_values = acquire_application_event_expected_values(
milliseconds_since_epoch,
Expand Down
2 changes: 1 addition & 1 deletion oak_attestation_verification/src/policy/binary.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Policy<[u8], Variant> for BinaryPolicy {
fn verify(
&self,
encoded_event: &[u8],
_encoded_event_endorsement: &Variant,
_encoded_endorsement: &Variant,
milliseconds_since_epoch: i64,
) -> anyhow::Result<EventAttestationResults> {
let event = decode_event_proto::<EventData>(
Expand Down
13 changes: 5 additions & 8 deletions oak_attestation_verification/src/policy/container.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//

use anyhow::Context;
use oak_attestation_verification_types::{policy::Policy, CONTAINER_ENDORSEMENT_ID};
use oak_attestation_verification_types::policy::Policy;
use oak_proto_rust::oak::{
attestation::v1::{
ContainerEndorsement, ContainerLayerData, ContainerLayerReferenceValues,
Expand All @@ -26,8 +26,7 @@ use oak_proto_rust::oak::{

use crate::{
compare::compare_container_layer_measurement_digests,
expect::acquire_container_event_expected_values,
util::{decode_endorsement_proto, decode_event_proto},
expect::acquire_container_event_expected_values, util::decode_event_proto,
};

pub struct ContainerPolicy {
Expand All @@ -47,17 +46,15 @@ impl Policy<[u8], Variant> for ContainerPolicy {
fn verify(
&self,
encoded_event: &[u8],
encoded_event_endorsement: &Variant,
encoded_endorsement: &Variant,
milliseconds_since_epoch: i64,
) -> anyhow::Result<EventAttestationResults> {
let event = decode_event_proto::<ContainerLayerData>(
"type.googleapis.com/oak.attestation.v1.ContainerLayerData",
encoded_event,
)?;
let endorsement = decode_endorsement_proto::<ContainerEndorsement>(
&CONTAINER_ENDORSEMENT_ID,
encoded_event_endorsement,
)?;
let endorsement: ContainerEndorsement =
encoded_endorsement.try_into().map_err(anyhow::Error::msg)?;

let expected_values = acquire_container_event_expected_values(
milliseconds_since_epoch,
Expand Down
12 changes: 5 additions & 7 deletions oak_attestation_verification/src/policy/firmware.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
//

use anyhow::Context;
use oak_attestation_verification_types::{policy::Policy, FIRMWARE_ENDORSEMENT_ID};
use oak_attestation_verification_types::policy::Policy;
use oak_proto_rust::oak::{
attestation::v1::{BinaryReferenceValue, EventAttestationResults, FirmwareEndorsement},
Variant,
};

use crate::{
compare::compare_measurement_digest, expect::acquire_stage0_expected_values,
platform::convert_amd_sev_snp_initial_measurement, util::decode_endorsement_proto,
platform::convert_amd_sev_snp_initial_measurement,
};

pub struct FirmwarePolicy {
Expand All @@ -40,14 +40,12 @@ impl Policy<[u8], Variant> for FirmwarePolicy {
fn verify(
&self,
firmware_measurement: &[u8],
encoded_firmware_endorsement: &Variant,
encoded_endorsement: &Variant,
milliseconds_since_epoch: i64,
) -> anyhow::Result<EventAttestationResults> {
let initial_measurement = convert_amd_sev_snp_initial_measurement(firmware_measurement);
let endorsement = decode_endorsement_proto::<FirmwareEndorsement>(
&FIRMWARE_ENDORSEMENT_ID,
encoded_firmware_endorsement,
)?;
let endorsement: FirmwareEndorsement =
encoded_endorsement.try_into().map_err(anyhow::Error::msg)?;

let expected_values = acquire_stage0_expected_values(
milliseconds_since_epoch,
Expand Down
14 changes: 6 additions & 8 deletions oak_attestation_verification/src/policy/kernel.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//

use anyhow::Context;
use oak_attestation_verification_types::{policy::Policy, KERNEL_ENDORSEMENT_ID};
use oak_attestation_verification_types::policy::Policy;
use oak_proto_rust::oak::{
attestation::v1::{
EventAttestationResults, KernelEndorsement, KernelLayerReferenceValues, Stage0Measurements,
Expand All @@ -26,8 +26,7 @@ use oak_proto_rust::oak::{
use crate::{
compare::compare_kernel_layer_measurement_digests,
expect::acquire_kernel_event_expected_values,
extract::stage0_measurements_to_kernel_layer_data,
util::{decode_endorsement_proto, decode_event_proto},
extract::stage0_measurements_to_kernel_layer_data, util::decode_event_proto,
};

pub struct KernelPolicy {
Expand All @@ -44,25 +43,24 @@ impl Policy<[u8], Variant> for KernelPolicy {
fn verify(
&self,
encoded_event: &[u8],
encoded_event_endorsement: &Variant,
encoded_endorsement: &Variant,
milliseconds_since_epoch: i64,
) -> anyhow::Result<EventAttestationResults> {
let event =
stage0_measurements_to_kernel_layer_data(decode_event_proto::<Stage0Measurements>(
"type.googleapis.com/oak.attestation.v1.Stage0Measurements",
encoded_event,
)?);
let endorsement = decode_endorsement_proto::<KernelEndorsement>(
&KERNEL_ENDORSEMENT_ID,
encoded_event_endorsement,
)?;
let endorsement: KernelEndorsement =
encoded_endorsement.try_into().map_err(anyhow::Error::msg)?;

let expected_values = acquire_kernel_event_expected_values(
milliseconds_since_epoch,
Some(&endorsement),
&self.reference_values,
)
.context("couldn't verify kernel endorsements")?;

compare_kernel_layer_measurement_digests(&event, &expected_values)
.context("couldn't verify kernel event")?;

Expand Down
13 changes: 5 additions & 8 deletions oak_attestation_verification/src/policy/platform.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//

use anyhow::Context;
use oak_attestation_verification_types::{policy::Policy, AMD_SEV_SNP_PLATFORM_ENDORSEMENT_ID};
use oak_attestation_verification_types::policy::Policy;
use oak_proto_rust::oak::{
attestation::v1::{AmdSevReferenceValues, AmdSevSnpEndorsement, EventAttestationResults},
Variant,
Expand All @@ -28,7 +28,6 @@ use crate::{
convert_amd_sev_snp_attestation_report, verify_amd_sev_attestation_report_values,
verify_amd_sev_snp_attestation_report_validity,
},
util::decode_endorsement_proto,
};

pub struct AmdSevSnpPolicy {
Expand All @@ -45,19 +44,17 @@ impl Policy<AttestationReport, Variant> for AmdSevSnpPolicy {
fn verify(
&self,
attestation_report: &AttestationReport,
encoded_platform_endorsement: &Variant,
encoded_endorsement: &Variant,
milliseconds_since_epoch: i64,
) -> anyhow::Result<EventAttestationResults> {
let platform_endorsement = decode_endorsement_proto::<AmdSevSnpEndorsement>(
&AMD_SEV_SNP_PLATFORM_ENDORSEMENT_ID,
encoded_platform_endorsement,
)?;
let endorsement: AmdSevSnpEndorsement =
encoded_endorsement.try_into().map_err(anyhow::Error::msg)?;

// Ensure the Attestation report is properly signed by the platform and the
// corresponding certificate is signed by AMD.
verify_amd_sev_snp_attestation_report_validity(
attestation_report,
&platform_endorsement.tee_certificate,
&endorsement.tee_certificate,
milliseconds_since_epoch,
)
.context("couldn't verify AMD SEV-SNP attestation validity")?;
Expand Down
13 changes: 5 additions & 8 deletions oak_attestation_verification/src/policy/system.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//

use anyhow::Context;
use oak_attestation_verification_types::{policy::Policy, SYSTEM_ENDORSEMENT_ID};
use oak_attestation_verification_types::policy::Policy;
use oak_proto_rust::oak::{
attestation::v1::{
EventAttestationResults, SystemEndorsement, SystemLayerData, SystemLayerReferenceValues,
Expand All @@ -25,8 +25,7 @@ use oak_proto_rust::oak::{

use crate::{
compare::compare_system_layer_measurement_digests,
expect::acquire_system_event_expected_values,
util::{decode_endorsement_proto, decode_event_proto},
expect::acquire_system_event_expected_values, util::decode_event_proto,
};

pub struct SystemPolicy {
Expand All @@ -43,17 +42,15 @@ impl Policy<[u8], Variant> for SystemPolicy {
fn verify(
&self,
encoded_event: &[u8],
encoded_event_endorsement: &Variant,
encoded_endorsement: &Variant,
milliseconds_since_epoch: i64,
) -> anyhow::Result<EventAttestationResults> {
let event = decode_event_proto::<SystemLayerData>(
"type.googleapis.com/oak.attestation.v1.SystemLayerData",
encoded_event,
)?;
let endorsement = decode_endorsement_proto::<SystemEndorsement>(
&SYSTEM_ENDORSEMENT_ID,
encoded_event_endorsement,
)?;
let endorsement: SystemEndorsement =
encoded_endorsement.try_into().map_err(anyhow::Error::msg)?;

let expected_values = acquire_system_event_expected_values(
milliseconds_since_epoch,
Expand Down
16 changes: 1 addition & 15 deletions oak_attestation_verification/src/util.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use oak_proto_rust::oak::{
RootLayerData, RootLayerReferenceValues, Signature, SkipVerification, StringLiterals,
SystemLayerReferenceValues, TextReferenceValue, Validity, VerifyingKeySet,
},
HexDigest, RawDigest, Variant,
HexDigest, RawDigest,
};
use p256::pkcs8::{der::Decode, DecodePublicKey};
use prost::Message;
Expand Down Expand Up @@ -426,20 +426,6 @@ pub fn decode_event_proto<M: Message + Default>(
)
}

/// Decodes serialized endorsement into a specified [`Message`].
pub fn decode_endorsement_proto<M: Message + Default>(
id: &[u8],
message: &Variant,
) -> anyhow::Result<M> {
if message.id == id {
let decoded_message = M::decode(message.value.as_ref())
.map_err(|error| anyhow::anyhow!("couldn't decode endorsement: {:?}", error))?;
Ok(decoded_message)
} else {
anyhow::bail!("unexpected endorsement ID, expected {:?}, found {:?}", id, message.id);
}
}

/// Decodes [`Any`] message into a specified [`Message`].
pub fn decode_protobuf_any<M: Message + Default>(
expected_type_url: &str,
Expand Down
30 changes: 9 additions & 21 deletions oak_attestation_verification/tests/policy_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,12 @@ use oak_attestation_verification::policy::{
application::ApplicationPolicy, container::ContainerPolicy, firmware::FirmwarePolicy,
kernel::KernelPolicy, platform::AmdSevSnpPolicy, system::SystemPolicy,
};
use oak_attestation_verification_types::{
policy::Policy, AMD_SEV_SNP_PLATFORM_ENDORSEMENT_ID, FIRMWARE_ENDORSEMENT_ID,
};
use oak_attestation_verification_types::policy::Policy;
use oak_file_utils::data_path;
use oak_proto_rust::oak::{
attestation::v1::{
binary_reference_value, endorsements, reference_values, AmdSevSnpEndorsement, Endorsements,
Evidence, FirmwareEndorsement, OakContainersReferenceValues,
OakRestrictedKernelReferenceValues, ReferenceValues, SkipVerification,
},
Variant,
use oak_proto_rust::oak::attestation::v1::{
binary_reference_value, endorsements, reference_values, AmdSevSnpEndorsement, Endorsements,
Evidence, FirmwareEndorsement, OakContainersReferenceValues,
OakRestrictedKernelReferenceValues, ReferenceValues, SkipVerification,
};
use oak_sev_snp_attestation_report::AttestationReport;
use prost::Message;
Expand Down Expand Up @@ -146,20 +141,16 @@ fn amd_sev_snp_platform_policy_verify_succeeds() {
OC_REFERENCE_VALUES.root_layer.as_ref().unwrap().amd_sev.as_ref().unwrap();
let policy = AmdSevSnpPolicy::new(platform_reference_values);
let attestation_report = extract_attestation_report(&OC_EVIDENCE).unwrap();
let platform_endorsement = AmdSevSnpEndorsement {
let endorsement = AmdSevSnpEndorsement {
tee_certificate: match OC_ENDORSEMENTS.r#type.as_ref() {
Some(endorsements::Type::OakContainers(e)) => {
e.root_layer.as_ref().unwrap().tee_certificate.to_vec()
}
_ => vec![],
},
};
let encoded_endorsement = Variant {
id: AMD_SEV_SNP_PLATFORM_ENDORSEMENT_ID.to_vec(),
value: platform_endorsement.encode_to_vec(),
};

let result = policy.verify(attestation_report, &encoded_endorsement, MILLISECONDS_SINCE_EPOCH);
let result = policy.verify(attestation_report, &endorsement.into(), MILLISECONDS_SINCE_EPOCH);

// TODO: b/356631062 - Verify detailed attestation results.
assert!(result.is_ok(), "Failed: {:?}", result.err().unwrap());
Expand All @@ -186,13 +177,10 @@ fn amd_sev_snp_firmware_policy_verify_succeeds() {
let firmware_measurement = &extract_attestation_report(&OC_EVIDENCE).unwrap().data.measurement;
// TODO: b/375137648 - Use new endorsements directly once available.
let firmware_endorsement = FirmwareEndorsement { firmware: None };
let encoded_endorsement = Variant {
id: FIRMWARE_ENDORSEMENT_ID.to_vec(),
value: firmware_endorsement.encode_to_vec(),
};

let result =
policy.verify(firmware_measurement, &encoded_endorsement, MILLISECONDS_SINCE_EPOCH);
policy.verify(firmware_measurement, &firmware_endorsement.into(), MILLISECONDS_SINCE_EPOCH);

// TODO: b/356631062 - Verify detailed attestation results.
assert!(result.is_ok(), "Failed: {:?}", result.err().unwrap());
}
Expand Down
13 changes: 0 additions & 13 deletions oak_attestation_verification_types/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,3 @@ extern crate alloc;
pub mod policy;
pub mod util;
pub mod verifier;

pub static AMD_SEV_SNP_PLATFORM_ENDORSEMENT_ID: [u8; 16] =
[90, 18, 208, 15, 72, 160, 66, 36, 191, 244, 151, 92, 118, 87, 67, 143];
pub static FIRMWARE_ENDORSEMENT_ID: [u8; 16] =
[222, 74, 13, 85, 96, 234, 77, 198, 171, 209, 9, 237, 116, 79, 128, 234];
pub static KERNEL_ENDORSEMENT_ID: [u8; 16] =
[137, 81, 29, 101, 93, 53, 70, 1, 144, 11, 30, 109, 186, 248, 66, 182];
pub static SYSTEM_ENDORSEMENT_ID: [u8; 16] =
[71, 34, 101, 93, 150, 61, 79, 201, 132, 67, 241, 69, 113, 221, 50, 162];
pub static APPLICATION_ENDORSEMENT_ID: [u8; 16] =
[232, 78, 215, 20, 102, 157, 67, 10, 166, 15, 138, 101, 30, 90, 85, 3];
pub static CONTAINER_ENDORSEMENT_ID: [u8; 16] =
[114, 151, 165, 31, 160, 93, 73, 161, 175, 219, 100, 205, 238, 7, 134, 45];
3 changes: 2 additions & 1 deletion oak_proto_rust/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ pub mod perftools {
}
}

pub mod oak {
pub mod variant;

pub mod oak {
// Do not lint generated code.
#![allow(clippy::all, clippy::pedantic, clippy::nursery)]

Expand Down
Loading

0 comments on commit 4f80981

Please sign in to comment.