Skip to content

Commit 3830ab7

Browse files
committed
chore: sync upstream main for OCSF conformance fix
Merge upstream dependency security fixes and Go SDK routing updates before review. Validate OCSF regressions, gateway SPIFFE JWT verification, and Docker/Podman end-to-end behavior against the synchronized tree. Refs NVIDIA#4915 Signed-off-by: Louis Deng <[email protected]>
2 parents 3f1ad44 + cc99954 commit 3830ab7

47 files changed

Lines changed: 629 additions & 520 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cargo.lock‎

Lines changed: 81 additions & 285 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ h2 = "0.4"
4242
# TLS
4343
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12"] }
4444
rustls = { version = "0.23", default-features = false, features = ["std", "logging", "tls12"] }
45-
rustls-pemfile = "2"
4645
rcgen = { version = "0.14.10", default-features = false, features = ["pem"] }
4746
webpki-roots = "1"
4847
rustls-native-certs = "0.8"
@@ -117,7 +116,7 @@ jsonwebtoken = { version = "10", default-features = false, features = ["use_pem"
117116
zeroize = { version = "1", features = ["derive"] }
118117
getrandom = "0.3"
119118
aws-lc-rs = "1.16"
120-
spiffe = { version = "0.15", default-features = false, features = ["workload-api-jwt", "jwt-verify-rust-crypto", "tracing"] }
119+
spiffe = { version = "0.15", default-features = false, features = ["workload-api-jwt", "jwt-verify-aws-lc-rs", "tracing"] }
121120

122121
# Filesystem embedding
123122
include_dir = "0.7"
@@ -151,7 +150,7 @@ uuid = { version = "1.10", features = ["v4"] }
151150
signal-hook = "0.3"
152151

153152
# SMT solver (system libz3 by default; opt into vendored source or a prebuilt release)
154-
z3 = "0.21"
153+
z3 = "0.22"
155154

156155
[workspace.lints.rust]
157156
unsafe_code = "warn"

‎crates/openshell-cli/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ hyper = { workspace = true }
5353
hyper-util = { workspace = true }
5454
hyper-rustls = { version = "0.27", default-features = false, features = ["native-tokio", "http1", "http2", "tls12", "logging"] }
5555
rustls = { workspace = true }
56-
rustls-pemfile = { workspace = true }
5756
reqwest = { workspace = true }
5857

5958
# Error handling

‎crates/openshell-cli/src/tls.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use openshell_sdk::{AuthConfig, ClientConfig, ClientIdentity, OpenShellClient};
99
use rustls::{
1010
RootCertStore,
1111
client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier},
12-
pki_types::{CertificateDer, PrivateKeyDer, ServerName, UnixTime},
12+
pki_types::{CertificateDer, PrivateKeyDer, ServerName, UnixTime, pem::PemObject},
1313
};
1414
use std::io::Cursor;
1515
use std::path::PathBuf;
@@ -185,7 +185,9 @@ pub fn require_tls_materials(server: &str, tls: &TlsOptions) -> Result<TlsMateri
185185

186186
fn load_private_key(pem: &[u8]) -> Result<PrivateKeyDer<'static>> {
187187
let mut cursor = Cursor::new(pem);
188-
let key = rustls_pemfile::private_key(&mut cursor)
188+
let key = PrivateKeyDer::pem_reader_iter(&mut cursor)
189+
.next()
190+
.transpose()
189191
.into_diagnostic()?
190192
.ok_or_else(|| miette::miette!("no private key found in TLS key PEM"))?;
191193
Ok(key)
@@ -194,15 +196,15 @@ fn load_private_key(pem: &[u8]) -> Result<PrivateKeyDer<'static>> {
194196
pub fn build_rustls_config(materials: &TlsMaterials) -> Result<rustls::ClientConfig> {
195197
let mut roots = RootCertStore::empty();
196198
let mut ca_cursor = Cursor::new(&materials.ca);
197-
let ca_certs = rustls_pemfile::certs(&mut ca_cursor)
199+
let ca_certs = CertificateDer::pem_reader_iter(&mut ca_cursor)
198200
.collect::<Result<Vec<CertificateDer<'static>>, _>>()
199201
.into_diagnostic()?;
200202
for cert in ca_certs {
201203
roots.add(cert).into_diagnostic()?;
202204
}
203205

204206
let mut cert_cursor = Cursor::new(&materials.cert);
205-
let cert_chain = rustls_pemfile::certs(&mut cert_cursor)
207+
let cert_chain = CertificateDer::pem_reader_iter(&mut cert_cursor)
206208
.collect::<Result<Vec<CertificateDer<'static>>, _>>()
207209
.into_diagnostic()?;
208210
let key = load_private_key(&materials.key)?;

‎crates/openshell-core/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ url = { workspace = true }
3333
uuid = { workspace = true }
3434
ipnet = "2"
3535
rustls = { workspace = true }
36-
rustls-pemfile = { workspace = true }
3736
base64 = { workspace = true }
3837
jsonwebtoken = { workspace = true, optional = true }
3938
zeroize = { workspace = true, optional = true }

‎crates/openshell-core/src/driver_utils.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
//! Utility helpers shared across compute-driver crates.
55
6+
use rustls::pki_types::{CertificateDer, pem::PemObject};
67
use std::path::{Path, PathBuf};
78

89
use crate::proto::compute::v1::DriverSandbox;
@@ -473,7 +474,7 @@ pub fn read_upstream_proxy_ca_bundle_file(path: &str, label: &str) -> Result<Str
473474
/// Validating that rustls accepts an anchor — rather than only that PEM
474475
/// framing base64-decodes — is what makes the host-side check equivalent to
475476
/// the guest-side one: a PEM block holding invalid DER passes
476-
/// `rustls_pemfile::certs` but is silently dropped by
477+
/// `CertificateDer::pem_reader_iter` but is silently dropped by
477478
/// `RootCertStore::add_parsable_certificates`, so counting PEM blocks alone
478479
/// would accept on the host a bundle that contributes zero anchors at runtime.
479480
///
@@ -486,7 +487,7 @@ pub fn validate_upstream_proxy_ca_bundle_pem(
486487
path: &str,
487488
label: &str,
488489
) -> Result<(), String> {
489-
let certs: Vec<_> = rustls_pemfile::certs(&mut pem.as_bytes())
490+
let certs: Vec<_> = CertificateDer::pem_reader_iter(&mut pem.as_bytes())
490491
.flatten()
491492
.collect();
492493
if certs.is_empty() {
@@ -1318,7 +1319,7 @@ mod tests {
13181319

13191320
#[test]
13201321
fn ca_bundle_rejects_pem_blocks_holding_invalid_der() {
1321-
// Passes `rustls_pemfile::certs` but contributes no trust anchor, so
1322+
// Passes `CertificateDer::pem_reader_iter` but contributes no trust anchor, so
13221323
// accepting it on the host would break every guest after boot.
13231324
let err = validate_upstream_proxy_ca_bundle_pem(
13241325
"-----BEGIN CERTIFICATE-----\nAQID\n-----END CERTIFICATE-----\n",

‎crates/openshell-core/src/grpc_client.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ impl Drop for ClientSpanStatus {
469469
mod gateway_tls_isolation_tests {
470470
use super::*;
471471
use rcgen::{CertificateParams, IsCa};
472-
use rustls::pki_types::{CertificateDer, PrivateKeyDer};
472+
use rustls::pki_types::{CertificateDer, PrivateKeyDer, pem::PemObject};
473473
use std::io::Cursor;
474474
use tokio::net::TcpListener;
475475
use tokio_rustls::TlsAcceptor;
@@ -503,11 +503,13 @@ mod gateway_tls_isolation_tests {
503503
}
504504

505505
async fn start_h2_tls_server(pki: &TestPki) -> std::net::SocketAddr {
506-
let certificates = rustls_pemfile::certs(&mut Cursor::new(&pki.server_cert_pem))
506+
let certificates = CertificateDer::pem_reader_iter(&mut Cursor::new(&pki.server_cert_pem))
507507
.collect::<std::result::Result<Vec<CertificateDer<'static>>, _>>()
508508
.unwrap();
509509
let key: PrivateKeyDer<'static> =
510-
rustls_pemfile::private_key(&mut Cursor::new(&pki.server_key_pem))
510+
PrivateKeyDer::pem_reader_iter(&mut Cursor::new(&pki.server_key_pem))
511+
.next()
512+
.transpose()
511513
.unwrap()
512514
.unwrap();
513515
let mut config = rustls::ServerConfig::builder()

‎crates/openshell-crypto/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ rotation constraints still apply. Authentication failures expose no plaintext or
110110
distinction between wrong keys, AAD, nonce, ciphertext, or tags.
111111

112112
Coverage excludes dependency-owned SSH/russh primitives, AWS SigV4 signing,
113-
SPIFFE RustCrypto verification, and non-Rust client runtimes. AWS SDK HTTPS also
113+
SPIFFE JWT verification, and non-Rust client runtimes. SPIFFE uses its AWS-LC
114+
backend directly, outside the facade. AWS SDK HTTPS also
114115
retains its dependency-owned selection. Non-security content hashes and ordinary
115116
scheduling randomness are not migrated. No SSH or PQC capability is asserted by
116117
the primitive capability report. OpenSSL, strict policy, module version discovery,

‎crates/openshell-driver-vm/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ libloading = { version = "0.8", optional = true }
6161
tar = { version = "0.4", optional = true }
6262
flate2 = { version = "1", optional = true }
6363
sha2 = { version = "0.10", optional = true }
64-
zstd = { version = "0.13", optional = true }
64+
zstd = { version = "0.14", optional = true }
6565

6666
[features]
6767
# Portable test instrumentation, independent of the compute runtime.

‎crates/openshell-driver-vm/src/driver.rs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12343,6 +12343,28 @@ mod tests {
1234312343
let _ = fs::remove_dir_all(base);
1234412344
}
1234512345

12346+
#[test]
12347+
fn extracts_zstd_compressed_oci_layer() {
12348+
let temp = tempfile::tempdir().unwrap();
12349+
let archive = tar_bytes_with_file("bin/tool", b"tool contents");
12350+
let compressed = zstd::encode_all(archive.as_slice(), 0).unwrap();
12351+
let blob = temp.path().join("layer.tar.zst");
12352+
let extracted = temp.path().join("extracted");
12353+
fs::write(&blob, compressed).unwrap();
12354+
12355+
extract_layer_blob_to_dir(
12356+
&blob,
12357+
"application/vnd.oci.image.layer.v1.tar+zstd",
12358+
&extracted,
12359+
)
12360+
.unwrap();
12361+
12362+
assert_eq!(
12363+
fs::read(extracted.join("bin/tool")).unwrap(),
12364+
b"tool contents"
12365+
);
12366+
}
12367+
1234612368
#[test]
1234712369
fn layer_compression_from_media_type_supports_common_formats() {
1234812370
assert_eq!(

0 commit comments

Comments
 (0)