mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
d5a8117e08
## Why Some enterprise TLS proxies issue certificate chains signed with `ecdsa_secp521r1_sha512` / `ECDSA_NISTP521_SHA512`. Custom CA configuration such as `SSL_CERT_FILE` can add the right trust root, but it cannot make `rustls`'s `ring` verifier support a certificate signature algorithm it does not advertise. That can still break TLS after the CA bundle is configured, including on Rust websocket paths that call the shared `ensure_rustls_crypto_provider()` helper, such as the Responses websocket connector and remote app-server client: - [`codex-api/src/endpoint/responses_websocket.rs`](https://github.com/openai/codex/blob/eddc5c75ed527a8348bfcaa85692e53189600833/codex-rs/codex-api/src/endpoint/responses_websocket.rs#L441) - [`app-server-client/src/remote.rs`](https://github.com/openai/codex/blob/eddc5c75ed527a8348bfcaa85692e53189600833/codex-rs/app-server-client/src/remote.rs#L718) The `aws-lc-rs` `rustls` provider supports this P-521/SHA-512 certificate signature scheme, so use it as Codex's process-wide `rustls` provider. ## What Changed - Switch the workspace `rustls` feature from `ring` to `aws_lc_rs`. - Update `codex-utils-rustls-provider` to install `rustls::crypto::aws_lc_rs::default_provider()`. - Add an assertion and integration test that the installed provider supports `ECDSA_NISTP521_SHA512`. ## Verification ```shell just fmt just test -p codex-utils-rustls-provider just bazel-lock-update just bazel-lock-check ```
40 lines
1.5 KiB
Rust
40 lines
1.5 KiB
Rust
use std::sync::Once;
|
|
|
|
const REQUIRED_SIGNATURE_SCHEME: rustls::SignatureScheme =
|
|
rustls::SignatureScheme::ECDSA_NISTP521_SHA512;
|
|
|
|
/// Ensures a process-wide rustls crypto provider is installed.
|
|
///
|
|
/// rustls cannot auto-select a provider when both `ring` and `aws-lc-rs`
|
|
/// features are enabled in the dependency graph.
|
|
pub fn ensure_rustls_crypto_provider() {
|
|
static RUSTLS_PROVIDER_INIT: Once = Once::new();
|
|
RUSTLS_PROVIDER_INIT.call_once(|| {
|
|
// aws-lc-rs supports a broader WebPKI signature set than ring, including
|
|
// ECDSA P-521/SHA-512 certs used by some enterprise TLS proxies.
|
|
if rustls::crypto::aws_lc_rs::default_provider()
|
|
.install_default()
|
|
.is_err()
|
|
{
|
|
// Preserve the previous best-effort behavior for embedded hosts that
|
|
// install a process-global provider before Codex can install one.
|
|
return;
|
|
}
|
|
|
|
let Some(provider) = rustls::crypto::CryptoProvider::get_default() else {
|
|
panic!("aws-lc-rs rustls crypto provider should be installed");
|
|
};
|
|
assert!(
|
|
provider_supports_required_signature_scheme(provider),
|
|
"installed rustls crypto provider must support {REQUIRED_SIGNATURE_SCHEME:?}"
|
|
);
|
|
});
|
|
}
|
|
|
|
fn provider_supports_required_signature_scheme(provider: &rustls::crypto::CryptoProvider) -> bool {
|
|
provider
|
|
.signature_verification_algorithms
|
|
.supported_schemes()
|
|
.contains(&REQUIRED_SIGNATURE_SCHEME)
|
|
}
|