Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Verifier: Refactor errors in csv module #330

Merged
merged 1 commit into from
Mar 24, 2024
Merged

Verifier: Refactor errors in csv module #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions attestation-service/verifier/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cca-verifier = [ "ear", "jsonwebtoken", "veraison-apiclient" ]

[dependencies]
anyhow.workspace = true
thiserror.workspace = true
asn1-rs = { version = "0.5.1", optional = true }
async-trait.workspace = true
az-snp-vtpm = { version = "0.5.2", default-features = false, features = ["verifier"], optional = true }
Expand All @@ -29,6 +30,7 @@ codicon = { version = "3.0", optional = true }
csv-rs = { git = "https://github.com/openanolis/csv-rs", rev = "b74aa8c", optional = true }
eventlog-rs = { version = "0.1.3", optional = true }
hex.workspace = true
jsonwebkey = "0.3.5"
jsonwebtoken = { workspace = true, default-features = false, optional = true }
kbs-types.workspace = true
log.workspace = true
Expand Down
46 changes: 36 additions & 10 deletions attestation-service/verifier/src/csv/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
//

use log::{debug, warn};
use thiserror::Error;
extern crate serde;
use self::serde::{Deserialize, Serialize};
use super::*;
Expand All @@ -30,6 +31,32 @@ struct CsvEvidence {
serial_number: Vec<u8>,
}

#[derive(Error, Debug)]
pub enum CsvError {
#[error("REPORT_DATA is different from that in CSV Quote")]
ReportDataMismatch,
#[error("Deserialize Quote failed")]
DesearizeQuoteFailed(#[source] serde_json::Error),
#[error(transparent)]
SerdeJson(#[from] serde_json::Error),
#[error("IO error")]
IO(#[from] std::io::Error),
#[error("HRK cert Signature verification failed: {0}")]
HRKSignatureVerification(String),
#[error("HSK cert Signature validation failed: {0}")]
HSKSignatureValidation(String),
#[error("CEK cert Signature validation failed: {0}")]
CEKSignatureValidation(String),
#[error("PEK cert Signature validation failed: {0}")]
PEKSignatureValidation(String),
#[error("Attestation Report Signature validation failed: {0}")]
AttestationReportSignatureValidation(String),
#[error("Parse TEE evidence failed: {0}")]
ParseTeeEvidence(String),
#[error("Verify report signature failed: {0}")]
VerifyReportSignature(String),
}

pub const HRK: &[u8] = include_bytes!("hrk.cert");

#[derive(Debug, Default)]
Expand All @@ -43,8 +70,7 @@ impl Verifier for CsvVerifier {
expected_report_data: &ReportData,
expected_init_data_hash: &InitDataHash,
) -> Result<TeeEvidenceParsedClaim> {
let tee_evidence =
serde_json::from_slice::<CsvEvidence>(evidence).context("Deserialize Quote failed.")?;
let tee_evidence = serde_json::from_slice::<CsvEvidence>(evidence)?;

verify_report_signature(&tee_evidence.attestation_report, &tee_evidence.cert_chain)?;

Expand All @@ -55,7 +81,7 @@ impl Verifier for CsvVerifier {
let expected_report_data =
regularize_data(expected_report_data, 64, "REPORT_DATA", "CSV");
if expected_report_data != report_raw.body.report_data {
bail!("REPORT_DATA is different from that in CSV Quote");
return Err(CsvError::ReportDataMismatch.into());
}
}

Expand All @@ -70,29 +96,29 @@ impl Verifier for CsvVerifier {
fn verify_report_signature(
attestation_report: &AttestationReport,
cert_chain: &CertificateChain,
) -> Result<()> {
) -> Result<(), CsvError> {
// Verify certificate chain
let hrk = ca::Certificate::decode(&mut &HRK[..], ())?;
(&hrk, &hrk)
.verify()
.context("HRK cert Signature validation failed.")?;
.map_err(|err| CsvError::HRKSignatureVerification(err.to_string()))?;
(&hrk, &cert_chain.hsk)
.verify()
.context("HSK cert Signature validation failed.")?;
.map_err(|err| CsvError::HSKSignatureValidation(err.to_string()))?;
(&cert_chain.hsk, &cert_chain.cek)
.verify()
.context("CEK cert Signature validation failed.")?;
.map_err(|err| CsvError::CEKSignatureValidation(err.to_string()))?;
(&cert_chain.cek, &cert_chain.pek)
.verify()
.context("PEK cert Signature validation failed.")?;
.map_err(|err| CsvError::PEKSignatureValidation(err.to_string()))?;

// Verify the TEE Hardware signature.

(&cert_chain.pek, attestation_report)
.verify()
.context("Attestation Report Signature validation failed.")?;
.map_err(|err| CsvError::AttestationReportSignatureValidation(err.to_string()))?;

Ok(())
Ok(()).map_err(|err| CsvError::VerifyReportSignature(err.to_string()))
}

fn xor_with_anonce(data: &mut [u8], anonce: &u32) {
Expand Down
Loading