Skip to content

Commit 73c0e86

Browse files
authored
Merge pull request #1522 from Dstack-TEE/fix/ratls-server-key-possession
fix(ra-rpc): verify TLS key possession for attested servers
2 parents 963883c + a2cfb1f commit 73c0e86

8 files changed

Lines changed: 213 additions & 15 deletions

File tree

‎dstack/Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dstack/dstack-util/src/main.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -655,14 +655,14 @@ async fn cmd_get_keys(args: GetKeysArgs) -> Result<()> {
655655

656656
// Step 1: Fetch the KMS root CA
657657
eprintln!("Connecting to KMS: {kms_url}");
658-
let tls_no_check = root_ca_pem.is_none();
659-
if tls_no_check {
658+
let tls_skip_ca_verification = root_ca_pem.is_none();
659+
if tls_skip_ca_verification {
660660
eprintln!("Warning: no --root-ca provided, TLS certificate verification is disabled for initial connection");
661661
}
662662
let root_ca = {
663663
let client = RaClientConfig::builder()
664664
.remote_uri(kms_url.clone())
665-
.tls_no_check(tls_no_check)
665+
.tls_skip_ca_verification(tls_skip_ca_verification)
666666
.tls_built_in_root_certs(false)
667667
.maybe_tls_ca_cert(root_ca_pem.clone())
668668
.build()
@@ -682,7 +682,7 @@ async fn cmd_get_keys(args: GetKeysArgs) -> Result<()> {
682682

683683
// Step 3: Create authenticated client and request app keys
684684
let ra_client = RaClientConfig::builder()
685-
.tls_no_check(false)
685+
.tls_skip_ca_verification(false)
686686
.tls_built_in_root_certs(false)
687687
.remote_uri(kms_url.clone())
688688
.tls_client_cert(cert_pair.cert_pem)
@@ -819,7 +819,7 @@ async fn cmd_encrypt(args: EncryptArgs) -> Result<()> {
819819
.transpose()?;
820820
let client = RaClientConfig::builder()
821821
.remote_uri(kms_url)
822-
.tls_no_check(false)
822+
.tls_skip_ca_verification(false)
823823
.tls_built_in_root_certs(root_ca_pem.is_none())
824824
.maybe_tls_ca_cert(root_ca_pem)
825825
.build()

‎dstack/dstack-util/src/system_setup.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ impl<'a> GatewayContext<'a> {
592592
.tls_client_key(client_key.to_string())
593593
.tls_ca_cert(ca_cert)
594594
.tls_built_in_root_certs(false)
595-
.tls_no_check(gateway_app_id == "any")
595+
.tls_skip_ca_verification(gateway_app_id == "any")
596596
.verify_server_attestation(false)
597597
.cert_validator(Box::new(move |cert| cert_validator.validate(cert)))
598598
.build()
@@ -2437,7 +2437,7 @@ impl<'a> Stage0<'a> {
24372437
generate_self_signed_ra_cert(None).context("Failed to generate RA-TLS cert")?;
24382438
let attestation_verifier = attestation_verifier(&self.shared.sys_config)?;
24392439
let ra_client = RaClientConfig::builder()
2440-
.tls_no_check(false)
2440+
.tls_skip_ca_verification(false)
24412441
.tls_built_in_root_certs(false)
24422442
.remote_uri(kms_url.clone())
24432443
.tls_client_cert(cert_pair.cert_pem)

‎dstack/kms/src/onboard_service.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ impl Keys {
742742
};
743743
let (ra_cert, ra_key) = gen_ra_cert(tmp_ca).await?;
744744
let client = RaClientConfig::builder()
745-
.tls_no_check(true)
745+
.tls_skip_ca_verification(true)
746746
.tls_built_in_root_certs(false)
747747
.remote_uri(other_kms_url.to_string())
748748
.tls_client_cert(ra_cert)

‎dstack/ra-rpc/Cargo.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ prost-types = { workspace = true, optional = true }
2828
or-panic.workspace = true
2929

3030
[dev-dependencies]
31-
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
31+
ra-tls = { workspace = true, features = ["test-pki"] }
32+
tokio-rustls.workspace = true
33+
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "net", "io-util"] }
3234
reqwest = { workspace = true, default-features = false, features = [
3335
"rustls",
3436
"charset",
@@ -37,5 +39,5 @@ reqwest = { workspace = true, default-features = false, features = [
3739
[features]
3840
default = ["rocket", "client"]
3941
rocket = ["dep:rocket", "dep:rocket-vsock-listener", "dep:rustls"]
40-
client = ["reqwest"]
42+
client = ["reqwest", "dep:rustls"]
4143
openapi = ["dep:prost-types"]

‎dstack/ra-rpc/src/client.rs‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ use serde::{de::DeserializeOwned, Serialize};
1818

1919
use bon::Builder;
2020

21+
mod tls;
22+
2123
pub struct CertInfo {
2224
pub cert_der: Vec<u8>,
2325
pub attestation: Option<VerifiedAttestation>,
@@ -30,8 +32,10 @@ type CertValidator = Box<dyn Fn(Option<CertInfo>) -> Result<()> + Send + Sync +
3032
#[derive(Builder)]
3133
pub struct RaClientConfig {
3234
remote_uri: String,
35+
/// Skip CA-based certificate checks (trust chain, hostname, and validity).
36+
/// TLS handshake signatures remain verified; attestation is checked separately.
3337
#[builder(default = false)]
34-
tls_no_check: bool,
38+
tls_skip_ca_verification: bool,
3539
#[builder(default = true)]
3640
verify_server_attestation: bool,
3741
#[builder(default = false)]
@@ -50,14 +54,19 @@ impl RaClientConfig {
5054
pub fn into_client(self) -> Result<RaClient> {
5155
let mut builder = Client::builder()
5256
.tls_sni(true)
53-
.danger_accept_invalid_certs(self.tls_no_check)
5457
.danger_accept_invalid_hostnames(self.tls_no_check_hostname)
5558
.connect_timeout(Duration::from_secs(5))
5659
.timeout(Duration::from_secs(60));
5760
if self.cert_validator.is_some() {
5861
builder = builder.tls_info(true);
5962
}
60-
if let (Some(cert_pem), Some(key_pem)) = (self.tls_client_cert, self.tls_client_key) {
63+
if self.tls_skip_ca_verification {
64+
builder = builder.use_preconfigured_tls(tls::config_without_ca_verification(
65+
self.tls_client_cert.as_deref(),
66+
self.tls_client_key.as_deref(),
67+
)?);
68+
} else if let (Some(cert_pem), Some(key_pem)) = (self.tls_client_cert, self.tls_client_key)
69+
{
6170
let identity_pem = format!("{cert_pem}\n{key_pem}");
6271
let identity =
6372
Identity::from_pem(identity_pem.as_bytes()).context("Failed to parse identity")?;
@@ -104,9 +113,9 @@ pub struct RaClient {
104113
}
105114

106115
impl RaClient {
107-
pub fn new(remote_uri: String, tls_no_check: bool) -> Result<Self> {
116+
pub fn new(remote_uri: String, tls_skip_ca_verification: bool) -> Result<Self> {
108117
RaClientConfig::builder()
109-
.tls_no_check(tls_no_check)
118+
.tls_skip_ca_verification(tls_skip_ca_verification)
110119
.remote_uri(remote_uri)
111120
.build()
112121
.into_client()

‎dstack/ra-rpc/src/client/tls.rs‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
// SPDX-FileCopyrightText: © 2026 Phala Network <dstack@phala.network>
2+
//
3+
// SPDX-License-Identifier: Apache-2.0
4+
5+
use std::sync::Arc;
6+
7+
use anyhow::{bail, Context, Result};
8+
use rustls::{
9+
client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier},
10+
crypto::WebPkiSupportedAlgorithms,
11+
pki_types::{CertificateDer, ServerName, UnixTime},
12+
DigitallySignedStruct, SignatureScheme,
13+
};
14+
15+
/// Attestation is checked on the response, but TLS must still prove possession
16+
/// of the attested certificate key. Reqwest's no-verifier also skips that proof.
17+
#[derive(Debug)]
18+
struct SkipCaVerification(WebPkiSupportedAlgorithms);
19+
20+
impl ServerCertVerifier for SkipCaVerification {
21+
fn verify_server_cert(
22+
&self,
23+
_end_entity: &CertificateDer<'_>,
24+
_intermediates: &[CertificateDer<'_>],
25+
_server_name: &ServerName<'_>,
26+
_ocsp_response: &[u8],
27+
_now: UnixTime,
28+
) -> Result<ServerCertVerified, rustls::Error> {
29+
Ok(ServerCertVerified::assertion())
30+
}
31+
32+
fn verify_tls12_signature(
33+
&self,
34+
message: &[u8],
35+
cert: &CertificateDer<'_>,
36+
signature: &DigitallySignedStruct,
37+
) -> Result<HandshakeSignatureValid, rustls::Error> {
38+
rustls::crypto::verify_tls12_signature(message, cert, signature, &self.0)
39+
}
40+
41+
fn verify_tls13_signature(
42+
&self,
43+
message: &[u8],
44+
cert: &CertificateDer<'_>,
45+
signature: &DigitallySignedStruct,
46+
) -> Result<HandshakeSignatureValid, rustls::Error> {
47+
rustls::crypto::verify_tls13_signature(message, cert, signature, &self.0)
48+
}
49+
50+
fn supported_verify_schemes(&self) -> Vec<SignatureScheme> {
51+
self.0.supported_schemes()
52+
}
53+
}
54+
55+
pub(super) fn config_without_ca_verification(
56+
cert: Option<&str>,
57+
key: Option<&str>,
58+
) -> Result<rustls::ClientConfig> {
59+
use rustls::pki_types::{pem::PemObject, PrivateKeyDer};
60+
let provider = rustls::crypto::CryptoProvider::get_default()
61+
.cloned()
62+
.unwrap_or_else(|| Arc::new(rustls::crypto::aws_lc_rs::default_provider()));
63+
let verifier = SkipCaVerification(provider.signature_verification_algorithms);
64+
let builder = rustls::ClientConfig::builder_with_provider(provider)
65+
.with_safe_default_protocol_versions()?
66+
.dangerous()
67+
.with_custom_certificate_verifier(Arc::new(verifier));
68+
match (cert, key) {
69+
(Some(cert), Some(key)) => builder
70+
.with_client_auth_cert(
71+
CertificateDer::pem_slice_iter(cert.as_bytes()).collect::<Result<Vec<_>, _>>()?,
72+
PrivateKeyDer::from_pem_slice(key.as_bytes())?,
73+
)
74+
.context("invalid RA-TLS client identity"),
75+
(None, None) => Ok(builder.with_no_client_auth()),
76+
_ => bail!("RA-TLS client identity requires both certificate and key"),
77+
}
78+
}
Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
// SPDX-FileCopyrightText: © 2026 Phala Network <dstack@phala.network>
2+
//
3+
// SPDX-License-Identifier: Apache-2.0
4+
5+
#![cfg(feature = "client")]
6+
7+
use std::sync::Arc;
8+
9+
use prpc::client::RequestClient;
10+
use ra_rpc::client::RaClientConfig;
11+
use ra_tls::test_pki::{TestCa, TestCert};
12+
use rustls::{
13+
pki_types::PrivatePkcs8KeyDer,
14+
server::{ClientHello, ResolvesServerCert},
15+
sign::CertifiedKey,
16+
};
17+
use tokio::io::{AsyncReadExt, AsyncWriteExt};
18+
19+
#[derive(Debug)]
20+
struct FixedCertificate(Arc<CertifiedKey>);
21+
22+
impl ResolvesServerCert for FixedCertificate {
23+
fn resolve(&self, _: ClientHello<'_>) -> Option<Arc<CertifiedKey>> {
24+
Some(self.0.clone())
25+
}
26+
}
27+
28+
#[tokio::test]
29+
async fn tls12_requires_the_server_certificate_key_even_without_ca_validation() {
30+
check_key_possession(&rustls::version::TLS12).await;
31+
}
32+
33+
#[tokio::test]
34+
async fn tls13_requires_the_server_certificate_key_even_without_ca_validation() {
35+
check_key_possession(&rustls::version::TLS13).await;
36+
}
37+
38+
async fn check_key_possession(version: &'static rustls::SupportedProtocolVersion) {
39+
for correct_key in [true, false] {
40+
let server_cert = TestCert::localhost().self_signed().unwrap();
41+
let signing_key = if correct_key {
42+
server_cert.key_der()
43+
} else {
44+
TestCert::localhost().self_signed().unwrap().key_der()
45+
};
46+
let ca = TestCa::new().unwrap();
47+
let client_cert = TestCert::localhost().signed_by(&ca).unwrap();
48+
let mut roots = rustls::RootCertStore::empty();
49+
roots.add(ca.cert_key().cert.der().clone()).unwrap();
50+
let provider = Arc::new(rustls::crypto::aws_lc_rs::default_provider());
51+
let client_verifier = rustls::server::WebPkiClientVerifier::builder_with_provider(
52+
Arc::new(roots),
53+
provider.clone(),
54+
)
55+
.build()
56+
.unwrap();
57+
let signing_key = provider
58+
.key_provider
59+
.load_private_key(PrivatePkcs8KeyDer::from(signing_key).into())
60+
.unwrap();
61+
// A resolver permits deliberately pairing a stolen certificate with
62+
// another key, unlike with_single_cert which rejects it up front.
63+
let pinned_cert = server_cert.cert_der();
64+
let certified = CertifiedKey::new(vec![server_cert.cert.der().clone()], signing_key);
65+
let config = rustls::ServerConfig::builder_with_provider(provider)
66+
.with_protocol_versions(&[version])
67+
.unwrap()
68+
.with_client_cert_verifier(client_verifier)
69+
.with_cert_resolver(Arc::new(FixedCertificate(Arc::new(certified))));
70+
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
71+
let address = listener.local_addr().unwrap();
72+
let server = tokio::spawn(async move {
73+
let (stream, _) = listener.accept().await.unwrap();
74+
let Ok(mut stream) = tokio_rustls::TlsAcceptor::from(Arc::new(config))
75+
.accept(stream)
76+
.await
77+
else {
78+
return false;
79+
};
80+
let mut request = [0; 4096];
81+
if !matches!(stream.read(&mut request).await, Ok(n) if n > 0) {
82+
return false;
83+
}
84+
stream
85+
.write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 4\r\nConnection: close\r\n\r\nnull")
86+
.await
87+
.unwrap();
88+
true
89+
});
90+
let client = RaClientConfig::builder()
91+
.remote_uri(format!("https://{address}"))
92+
.tls_skip_ca_verification(true)
93+
.tls_client_cert(client_cert.cert_pem())
94+
.tls_client_key(client_cert.key_pem())
95+
.verify_server_attestation(false)
96+
.cert_validator(Box::new(move |info| {
97+
let info = info.ok_or_else(|| anyhow::anyhow!("missing server certificate"))?;
98+
anyhow::ensure!(info.cert_der == pinned_cert, "server certificate changed");
99+
Ok(())
100+
}))
101+
.build()
102+
.into_client()
103+
.unwrap();
104+
let result = client.request::<(), ()>("Probe", ()).await;
105+
assert_eq!(result.is_ok(), correct_key, "{version:?}: {result:?}");
106+
assert_eq!(server.await.unwrap(), correct_key);
107+
}
108+
}

0 commit comments

Comments
 (0)