Skip to content

Commit 0c11066

Browse files
committed
fix(network): port additional CA test fixtures to the crypto interface
Route the gateway TLS isolation test PKI, the destination CA source fixtures, and the gateway startup trust tests through openshell_crypto::pki now that rcgen access is centralized there: generate_keypair/self_signed/signed_by replace the direct rcgen calls and CertifiedKey field access follows the wrapper's shape. Signed-off-by: Jesse Jaggars <[email protected]>
1 parent 328feff commit 0c11066

5 files changed

Lines changed: 16 additions & 15 deletions

File tree

‎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.

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ impl Drop for ClientSpanStatus {
305305
#[cfg(test)]
306306
mod gateway_tls_isolation_tests {
307307
use super::*;
308-
use rcgen::{CertificateParams, IsCa, KeyPair};
308+
use rcgen::{CertificateParams, IsCa};
309309
use rustls::pki_types::{CertificateDer, PrivateKeyDer};
310310
use std::io::Cursor;
311311
use tokio::net::TcpListener;
@@ -325,18 +325,17 @@ mod gateway_tls_isolation_tests {
325325
rcgen::KeyUsagePurpose::KeyCertSign,
326326
rcgen::KeyUsagePurpose::CrlSign,
327327
];
328-
let ca_key = KeyPair::generate().unwrap();
329-
let ca = ca_params.self_signed(&ca_key).unwrap();
328+
let ca_key = openshell_crypto::pki::generate_keypair().unwrap();
329+
let ca = openshell_crypto::pki::self_signed(ca_params, &ca_key).unwrap();
330330

331-
let server_key = KeyPair::generate().unwrap();
332-
let server = CertificateParams::new(vec![server_name.to_string()])
333-
.unwrap()
334-
.signed_by(&server_key, &ca, &ca_key)
335-
.unwrap();
331+
let server_key = openshell_crypto::pki::generate_keypair().unwrap();
332+
let server_params = CertificateParams::new(vec![server_name.to_string()]).unwrap();
333+
let server =
334+
openshell_crypto::pki::signed_by(server_params, &server_key, &ca, &ca_key).unwrap();
336335
TestPki {
337336
ca_pem: ca.pem().into_bytes(),
338337
server_cert_pem: server.pem().into_bytes(),
339-
server_key_pem: server_key.serialize_pem().into_bytes(),
338+
server_key_pem: server_key.serialize_pem().unwrap().into_bytes(),
340339
}
341340
}
342341

‎crates/openshell-gateway/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ vendored-z3 = ["openshell-server/vendored-z3"]
7979
workspace = true
8080

8181
[dev-dependencies]
82+
openshell-crypto = { workspace = true, default-features = false, features = ["aws-lc"] }
8283
rcgen = { workspace = true }
8384
tempfile = "3"
8485
toml = { workspace = true }

‎crates/openshell-gateway/tests/network_trust_startup.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::fs;
99
use std::path::{Path, PathBuf};
1010
use std::process::{Command, Output};
1111

12-
use rcgen::generate_simple_self_signed;
12+
use openshell_crypto::pki::generate_simple_self_signed;
1313
use tempfile::TempDir;
1414

1515
const CONFIG_FIELD: &str = "openshell.supervisor.network.additional_ca_bundle";
@@ -117,7 +117,7 @@ fn contains_wrapped(haystack: &str, needle: &str) -> bool {
117117
squash(haystack).contains(&squash(needle))
118118
}
119119

120-
fn generated_certificate() -> rcgen::CertifiedKey {
120+
fn generated_certificate() -> openshell_crypto::pki::CertifiedKey {
121121
generate_simple_self_signed(vec!["destination.example".to_string()])
122122
.expect("generate certificate fixture")
123123
}
@@ -163,7 +163,7 @@ fn valid_bundle_reports_only_redacted_metadata_before_custom_driver_rejection()
163163
fn invalid_bundles_fail_startup_with_actionable_redacted_errors() {
164164
let source_dir = tempfile::tempdir().expect("create source directory");
165165
let generated = generated_certificate();
166-
let private_key = generated.key_pair.serialize_pem();
166+
let private_key = generated.key_pair.serialize_pem().unwrap();
167167
let cases = [
168168
(
169169
source_dir.path().join("missing.pem"),

‎crates/openshell-server/src/network_trust.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ fn config_error(path: &Path, detail: impl std::fmt::Display) -> Error {
472472
#[cfg(test)]
473473
mod tests {
474474
use super::*;
475-
use rcgen::generate_simple_self_signed;
475+
use openshell_crypto::pki::generate_simple_self_signed;
476476
use std::fs;
477477
use tempfile::tempdir;
478478

@@ -1027,7 +1027,7 @@ mod tests {
10271027
let source = write_source(
10281028
source_dir.path(),
10291029
"private-key.pem",
1030-
generated.key_pair.serialize_pem(),
1030+
generated.key_pair.serialize_pem().unwrap(),
10311031
);
10321032
assert_rejected(&source, state_dir.path(), "non-certificate PEM block");
10331033
}
@@ -1044,7 +1044,7 @@ mod tests {
10441044
format!(
10451045
"{}\n{}",
10461046
generated.cert.pem(),
1047-
generated.key_pair.serialize_pem()
1047+
generated.key_pair.serialize_pem().unwrap()
10481048
),
10491049
);
10501050
assert_rejected(&source, state_dir.path(), "non-certificate PEM block");

0 commit comments

Comments
 (0)