Skip to content

Commit 0110f2d

Browse files
committed
fix(simulator): satisfy formatting and clippy checks
1 parent 6458112 commit 0110f2d

4 files changed

Lines changed: 19 additions & 22 deletions

File tree

dstack/crates/mock-attestation/src/tdx.rs

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
// SPDX-License-Identifier: Apache-2.0
44

55
use anyhow::Result;
6-
use dcap_qvl::QuoteCollateralV3;
76
use dcap_qvl::quote::{
87
AuthData, AuthDataV4, CertificationData, Data, EnclaveReport, Header,
98
QEReportCertificationData, Quote, Report, TDReport10,
109
};
11-
use p256::ecdsa::{Signature, SigningKey, signature::Signer};
10+
use dcap_qvl::QuoteCollateralV3;
11+
use p256::ecdsa::{signature::Signer, Signature, SigningKey};
1212
use p256::pkcs8::{DecodePrivateKey, EncodePrivateKey};
1313
use rcgen::{
1414
BasicConstraints, Certificate, CertificateParams, CertificateRevocationListParams,
1515
CertifiedKey, CustomExtension, DnType, ExtendedKeyUsagePurpose, IsCa, KeyIdMethod, KeyPair,
16-
KeyUsagePurpose, PKCS_ECDSA_P256_SHA256, RemoteKeyPair, SerialNumber, SignatureAlgorithm,
16+
KeyUsagePurpose, RemoteKeyPair, SerialNumber, SignatureAlgorithm, PKCS_ECDSA_P256_SHA256,
1717
};
1818
use scale::Encode;
1919
use serde_json::json;
@@ -142,11 +142,11 @@ impl TdxGenerator {
142142
pub fn root_ca_pem(&self) -> String {
143143
self.root.pem()
144144
}
145-
pub fn root_key_pem(&self) -> String {
146-
self.root_signing_key
147-
.to_pkcs8_pem(Default::default())
148-
.expect("P-256 key serialization")
149-
.to_string()
145+
pub fn root_key_pem(&self) -> Result<String> {
146+
Ok(self
147+
.root_signing_key
148+
.to_pkcs8_pem(Default::default())?
149+
.to_string())
150150
}
151151

152152
pub fn sample_collateral(&self) -> Result<QuoteCollateralV3> {
@@ -446,14 +446,13 @@ mod tests {
446446
);
447447
let mut tampered = evidence.quote.clone();
448448
tampered[100] ^= 1;
449-
assert!(
450-
verifier
451-
.verify(&tampered, &evidence.collateral, now)
452-
.is_err()
453-
);
454-
assert!(
455-
crate::ensure_report_data(&verified.report.as_td10().unwrap().report_data, &[0x24; 64])
456-
.is_err()
457-
);
449+
assert!(verifier
450+
.verify(&tampered, &evidence.collateral, now)
451+
.is_err());
452+
assert!(crate::ensure_report_data(
453+
&verified.report.as_td10().unwrap().report_data,
454+
&[0x24; 64]
455+
)
456+
.is_err());
458457
}
459458
}

dstack/dstack-attest/src/attestation.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ impl AttestationVerifier {
202202
self.external_trust_anchors
203203
}
204204

205-
206205
async fn verify_tdx_quote(&self, quote: &[u8]) -> Result<TdxVerifiedReport> {
207206
let collateral = self.tdx_collateral.fetch(quote).await?;
208207
let now = SystemTime::now()

dstack/guest-agent-simulator/src/main.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ use std::sync::Arc;
99
use anyhow::{Context, Result};
1010
use clap::Parser;
1111
use dstack_guest_agent::{
12-
AppState,
1312
backend::PlatformBackend,
1413
config::{self, Config},
15-
run_server,
14+
run_server, AppState,
1615
};
1716
use dstack_guest_agent_rpc::{AttestResponse, GetQuoteResponse};
1817
use mock_attestation::tdx::TdxGenerator;
@@ -116,7 +115,7 @@ impl PlatformBackend for SimulatorPlatform {
116115
#[rocket::main]
117116
async fn main() -> Result<()> {
118117
{
119-
use tracing_subscriber::{EnvFilter, fmt};
118+
use tracing_subscriber::{fmt, EnvFilter};
120119
let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
121120
fmt().with_env_filter(filter).with_ansi(false).init();
122121
}

dstack/guest-agent-simulator/src/simulator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use std::path::Path;
66

7-
use anyhow::{Context, Result, anyhow};
7+
use anyhow::{anyhow, Context, Result};
88
use dcap_qvl::quote::Quote;
99
use dstack_guest_agent_rpc::{AttestResponse, GetQuoteResponse};
1010
use mock_attestation::tdx::TdxGenerator;

0 commit comments

Comments
 (0)