Skip to content

Commit 47d7e63

Browse files
committed
refactor(supervisor): route shared supervisor crypto through openshell-crypto
Main now routes first-party TLS providers and digests through the openshell-crypto facade. Build the session-control TLS configurations and the routed-runtime test server from its configuration provider, install the experimental host's default provider through it, and hash shared session registrations with its SHA-256 instead of a direct sha2 dependency. Signed-off-by: Drew Newberry <anewberry@nvidia.com>
1 parent 65b59a3 commit 47d7e63

6 files changed

Lines changed: 7 additions & 10 deletions

File tree

‎Cargo.lock‎

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

‎crates/openshell-sandbox-backend/src/runtime_routed.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,9 @@ mod tests {
386386
stream
387387
.write_all(&encode_route_preface(route).unwrap())
388388
.await?;
389-
let mut config = rustls::ServerConfig::builder_with_provider(Arc::new(
390-
rustls::crypto::aws_lc_rs::default_provider(),
391-
))
389+
let mut config = rustls::ServerConfig::builder_with_provider(
390+
openshell_crypto::tls::configuration_provider(),
391+
)
392392
.with_protocol_versions(&[&rustls::version::TLS13])
393393
.unwrap()
394394
.with_no_client_auth()

‎crates/openshell-sandbox-backend/src/session_control.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ pub fn server_tls_config(
231231
private_key_pem: &[u8],
232232
client_ca_pem: &[u8],
233233
) -> Result<Arc<rustls::ServerConfig>, BackendError> {
234-
let provider = Arc::new(rustls::crypto::aws_lc_rs::default_provider());
234+
let provider = openshell_crypto::tls::configuration_provider();
235235
let verifier = rustls::server::WebPkiClientVerifier::builder_with_provider(
236236
Arc::new(root_store(client_ca_pem)?),
237237
provider.clone(),
@@ -261,7 +261,7 @@ pub fn client_tls_config(
261261
private_key_pem: &[u8],
262262
server_ca_pem: &[u8],
263263
) -> Result<Arc<rustls::ClientConfig>, BackendError> {
264-
let provider = Arc::new(rustls::crypto::aws_lc_rs::default_provider());
264+
let provider = openshell_crypto::tls::configuration_provider();
265265
let config = rustls::ClientConfig::builder_with_provider(provider)
266266
.with_protocol_versions(&[&rustls::version::TLS13])
267267
.map_err(|error| BackendError::Descriptor(error.to_string()))?

‎crates/openshell-supervisor/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ rustls = { workspace = true }
4444
rustix = { workspace = true }
4545
serde = { workspace = true }
4646
serde_json = { workspace = true }
47-
sha2 = { workspace = true }
4847
socket2 = { workspace = true }
4948
tempfile = "3"
5049
thiserror = { workspace = true }

‎crates/openshell-supervisor/src/experimental.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn run_platform(args: Args) -> Result<()> {
5757
.build()
5858
.into_diagnostic()?;
5959
runtime.block_on(async {
60-
let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
60+
openshell_crypto::tls::ensure_default_provider();
6161
let console_filter = tracing_subscriber::EnvFilter::try_from_default_env()
6262
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(&args.log_level));
6363
// Process-wide OCSF JSON output stays off; each session's own

‎crates/openshell-supervisor/src/shared_host.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use openshell_sandbox_backend::session_control::{
2727
MAX_REGISTRATION_BYTES, SESSIONS_PATH, SessionList, SessionPhaseReport, SessionRegistration,
2828
SessionStatusReport,
2929
};
30-
use sha2::{Digest as _, Sha256};
3130
use tokio::sync::watch;
3231

3332
use crate::session_host::{HostedSessionSpec, SessionHost, SessionPhase, SessionStatus};
@@ -361,7 +360,7 @@ impl SharedHost {
361360
fn registration_digest(registration: &SessionRegistration) -> Result<[u8; 32], ControlError> {
362361
let encoded = serde_json::to_vec(registration)
363362
.map_err(|error| ControlError::Invalid(format!("encode registration: {error}")))?;
364-
Ok(Sha256::digest(&encoded).into())
363+
openshell_crypto::sha256(&encoded).map_err(|error| ControlError::Unavailable(error.to_string()))
365364
}
366365

367366
fn status_report(route: &str, sandbox_id: String, status: &SessionStatus) -> SessionStatusReport {

0 commit comments

Comments
 (0)