Skip to content

Commit ec548b2

Browse files
fix(crypto): adapt upstream TLS fixtures and protocol tests
Signed-off-by: Varsha Prasad Narsing <[email protected]>
1 parent 00c6acd commit ec548b2

11 files changed

Lines changed: 1426 additions & 53 deletions

File tree

‎Cargo.lock‎

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

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -523,22 +523,23 @@ mod tests {
523523
TokenGrantClient,
524524
tokio::task::JoinHandle<CapturedRequest>,
525525
) {
526-
let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
527526
let mut ca_params = rcgen::CertificateParams::new(Vec::<String>::new()).expect("CA params");
528527
ca_params.is_ca = rcgen::IsCa::Ca(rcgen::BasicConstraints::Unconstrained);
529-
let ca_key = rcgen::KeyPair::generate().expect("CA key");
530-
let ca = ca_params.self_signed(&ca_key).expect("CA certificate");
531-
let key = rcgen::KeyPair::generate().expect("server key");
532-
let certificate = rcgen::CertificateParams::new(vec!["localhost".to_string()])
533-
.expect("server params")
534-
.signed_by(&key, &ca, &ca_key)
528+
let ca_key = openshell_crypto::pki::generate_keypair().expect("CA key");
529+
let ca = openshell_crypto::pki::self_signed(ca_params, &ca_key).expect("CA certificate");
530+
let key = openshell_crypto::pki::generate_keypair().expect("server key");
531+
let params =
532+
rcgen::CertificateParams::new(vec!["localhost".to_string()]).expect("server params");
533+
let certificate = openshell_crypto::pki::signed_by(params, &key, &ca, &ca_key)
535534
.expect("server certificate");
536-
let config = rustls::ServerConfig::builder()
535+
let config = openshell_crypto::tls::server_builder()
537536
.with_no_client_auth()
538537
.with_single_cert(
539538
vec![certificate.der().clone()],
540-
rustls::pki_types::PrivateKeyDer::try_from(key.serialize_der())
541-
.expect("server key"),
539+
rustls::pki_types::PrivateKeyDer::try_from(
540+
key.serialize_der().expect("export server key"),
541+
)
542+
.expect("server key"),
542543
)
543544
.expect("server config");
544545
let acceptor = tokio_rustls::TlsAcceptor::from(Arc::new(config));

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ miette = { workspace = true }
4747
url = { workspace = true }
4848

4949
[dev-dependencies]
50+
openshell-crypto = { workspace = true }
5051
openshell-otel-test-support = { path = "../openshell-otel-test-support" }
5152
opentelemetry_sdk = { workspace = true, features = ["testing"] }
5253
prost-types = { workspace = true }

‎crates/openshell-driver-podman/src/config.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,9 +930,11 @@ mod tests {
930930

931931
/// Generate a real, valid self-signed CA certificate PEM for tests.
932932
fn generate_test_ca_pem() -> String {
933-
let key_pair = rcgen::KeyPair::generate().unwrap();
933+
let key_pair = openshell_crypto::pki::generate_keypair().unwrap();
934934
let params = rcgen::CertificateParams::new(Vec::new()).unwrap();
935-
params.self_signed(&key_pair).unwrap().pem()
935+
openshell_crypto::pki::self_signed(params, &key_pair)
936+
.unwrap()
937+
.pem()
936938
}
937939

938940
#[test]

‎crates/openshell-otel-test-support/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ tracing = { workspace = true }
2020
tracing-subscriber = { workspace = true }
2121

2222
[dev-dependencies]
23+
openshell-crypto = { workspace = true }
2324
rcgen = { workspace = true }
2425
tempfile = "3"
2526

‎crates/openshell-otel-test-support/tests/common/mod.rs‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@
33

44
//! Shared TLS export scenario for the one-test-per-binary TLS tests.
55
6+
use openshell_crypto::pki::{self, Certificate, KeyPair};
67
use openshell_otel::{OtlpExportConfig, ServiceName, provider_for};
78
use openshell_otel_test_support::{OtlpTestServer, ReceivedTraces};
8-
use rcgen::{
9-
BasicConstraints, Certificate, CertificateParams, ExtendedKeyUsagePurpose, IsCa, KeyPair,
10-
};
9+
use rcgen::{BasicConstraints, CertificateParams, ExtendedKeyUsagePurpose, IsCa};
1110
use tonic::transport::Identity;
1211
use tracing_subscriber::layer::SubscriberExt as _;
1312

1413
fn new_ca() -> (Certificate, KeyPair) {
15-
let key = KeyPair::generate().unwrap();
14+
let key = pki::generate_keypair().unwrap();
1615
let mut params = CertificateParams::new(Vec::<String>::new()).unwrap();
1716
params.is_ca = IsCa::Ca(BasicConstraints::Unconstrained);
18-
(params.self_signed(&key).unwrap(), key)
17+
(pki::self_signed(params, &key).unwrap(), key)
1918
}
2019

2120
/// Export one gzip span to a TLS collector and return the flush outcome and
@@ -35,12 +34,10 @@ pub async fn export_span_over_tls(server_trusted: bool) -> (bool, ReceivedTraces
3534
(&other_ca, &other_key)
3635
};
3736

38-
let server_key = KeyPair::generate().unwrap();
37+
let server_key = pki::generate_keypair().unwrap();
3938
let mut server_params = CertificateParams::new(vec!["localhost".to_string()]).unwrap();
4039
server_params.extended_key_usages = vec![ExtendedKeyUsagePurpose::ServerAuth];
41-
let server_cert = server_params
42-
.signed_by(&server_key, signer, signer_key)
43-
.unwrap();
40+
let server_cert = pki::signed_by(server_params, &server_key, signer, signer_key).unwrap();
4441

4542
let roots = tempfile::NamedTempFile::new().unwrap();
4643
std::fs::write(roots.path(), trusted_ca.pem()).unwrap();
@@ -52,7 +49,7 @@ pub async fn export_span_over_tls(server_trusted: bool) -> (bool, ReceivedTraces
5249

5350
let collector = OtlpTestServer::start_tls(Identity::from_pem(
5451
server_cert.pem(),
55-
server_key.serialize_pem(),
52+
server_key.serialize_pem().unwrap(),
5653
))
5754
.await;
5855
let (provider, error) = provider_for(Some(OtlpExportConfig {

‎crates/openshell-sandbox-backend/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,8 @@ libc = "0.2"
4545
[target.'cfg(target_os = "linux")'.dependencies]
4646
rustix = { workspace = true, features = ["fs", "process"] }
4747

48+
[dev-dependencies]
49+
jsonwebtoken = { workspace = true }
50+
4851
[lints]
4952
workspace = true

‎crates/openshell-sandbox-backend/src/runtime/test_support.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -656,14 +656,13 @@ impl super::BoundaryTransportConnector for Connector {
656656
fn client(peer: Peer) -> Arc<BoundaryClient> {
657657
let session_id = "550e8400-e29b-41d4-a716-446655440000".parse().unwrap();
658658
let material = w::generate_sandbox_tls_material(session_id).unwrap();
659-
let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
660659
let certs = rustls_pemfile::certs(&mut material.certificate_chain_pem.as_bytes())
661660
.collect::<Result<Vec<_>, _>>()
662661
.unwrap();
663662
let key = rustls_pemfile::private_key(&mut material.private_key_pem.as_bytes())
664663
.unwrap()
665664
.unwrap();
666-
let mut config = rustls::ServerConfig::builder()
665+
let mut config = openshell_crypto::tls::server_builder()
667666
.with_no_client_auth()
668667
.with_single_cert(certs, key)
669668
.unwrap();

‎crates/openshell-sandbox-backend/tests/crypto_dispatch.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,11 @@ fn request_envelope_uses_selected_digest_and_rejects_backend_failures() {
8484
process_id: "test".into(),
8585
};
8686
let envelope = RequestEnvelope::new(request()).unwrap();
87+
// SHA-256 of protobuf RequestEnvelope { terminate: { process_id: "test" } }
88+
// with an empty request ID: 9a 01 06 0a 04 74 65 73 74.
8789
assert_eq!(
8890
envelope.payload_digest,
89-
"12fa19027b624b79dacb71a241331c6b7a961ae5c8a5084df3559c097cf8ad76"
91+
"6c6d7215ecc2ea064ffeffcefb0a575b2c1387b41e488380c48f9cbcfec062e0"
9092
);
9193
for stage in 1..=3 {
9294
FAILURE.store(stage, Ordering::SeqCst);

‎crates/openshell-supervisor-network/src/l7/tls.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ mod tests {
601601
let leaf = cert_cache.get_or_generate(hostname).unwrap();
602602

603603
let server_config = Arc::new(
604-
ServerConfig::builder()
604+
openshell_crypto::tls::server_builder()
605605
.with_no_client_auth()
606606
.with_single_cert(leaf.cert_chain.clone(), leaf.private_key.clone_key())
607607
.unwrap(),

0 commit comments

Comments
 (0)