## Stacked PRs This work is now effectively split across two steps: - #14178: add custom CA support for browser and device-code login flows, docs, and hermetic subprocess tests - #14239: extend that shared custom CA handling across Codex HTTPS clients and secure websocket TLS Note: #14240 was merged into this branch while it was stacked on top of this PR. This PR now subsumes that websocket follow-up and should be treated as the combined change. Builds on top of #14178. ## Problem Custom CA support landed first in the login path, but the real requirement is broader. Codex constructs outbound TLS clients in multiple places, and both HTTPS and secure websocket paths can fail behind enterprise TLS interception if they do not honor `CODEX_CA_CERTIFICATE` or `SSL_CERT_FILE` consistently. This PR broadens the shared custom-CA logic beyond login and applies the same policy to websocket TLS, so the enterprise-proxy story is no longer split between “HTTPS works” and “websockets still fail”. ## What This Delivers Custom CA support is no longer limited to login. Codex outbound HTTPS clients and secure websocket connections can now honor the same `CODEX_CA_CERTIFICATE` / `SSL_CERT_FILE` configuration, so enterprise proxy/intercept setups work more consistently end-to-end. For users and operators, nothing new needs to be configured beyond the same CA env vars introduced in #14178. The change is that more of Codex now respects them, including websocket-backed flows that were previously still using default trust roots. I also manually validated the proxy path locally with mitmproxy using: `CODEX_CA_CERTIFICATE=~/.mitmproxy/mitmproxy-ca-cert.pem HTTPS_PROXY=http://127.0.0.1:8080 just codex` with mitmproxy installed via `brew install mitmproxy` and configured as the macOS system proxy. ## Mental model `codex-client` is now the owner of shared custom-CA policy for outbound TLS client construction. Reqwest callers start from the builder configuration they already need, then pass that builder through `build_reqwest_client_with_custom_ca(...)`. Websocket callers ask the same module for a rustls client config when a custom CA bundle is configured. The env precedence is the same everywhere: - `CODEX_CA_CERTIFICATE` wins - otherwise fall back to `SSL_CERT_FILE` - otherwise use system roots The helper is intentionally narrow. It loads every usable certificate from the configured PEM bundle into the appropriate root store and returns either a configured transport or a typed error that explains what went wrong. ## Non-goals This does not add handshake-level integration tests against a live TLS endpoint. It does not validate that the configured bundle forms a meaningful certificate chain. It also does not try to force every transport in the repo through one abstraction; it extends the shared CA policy across the reqwest and websocket paths that actually needed it. ## Tradeoffs The main tradeoff is centralizing CA behavior in `codex-client` while still leaving adoption up to call sites. That keeps the implementation additive and reviewable, but it means the rule "outbound Codex TLS that should honor enterprise roots must use the shared helper" is still partly enforced socially rather than by types. For websockets, the shared helper only builds an explicit rustls config when a custom CA bundle is configured. When no override env var is set, websocket callers still use their ordinary default connector path. ## Architecture `codex-client::custom_ca` now owns CA bundle selection, PEM normalization, mixed-section parsing, certificate extraction, typed CA-loading errors, and optional rustls client-config construction for websocket TLS. The affected consumers now call into that shared helper directly rather than carrying login-local CA behavior: - backend-client - cloud-tasks - RMCP client paths that use `reqwest` - TUI voice HTTP paths - `codex-core` default reqwest client construction - `codex-api` websocket clients for both responses and realtime websocket connections The subprocess CA probe, env-sensitive integration tests, and shared PEM fixtures also live in `codex-client`, which is now the actual owner of the behavior they exercise. ## Observability The shared CA path logs: - which environment variable selected the bundle - which path was loaded - how many certificates were accepted - when `TRUSTED CERTIFICATE` labels were normalized - when CRLs were ignored - where client construction failed Returned errors remain user-facing and include the relevant env var, path, and remediation hint. That same error model now applies whether the failure surfaced while building a reqwest client or websocket TLS configuration. ## Tests Pure unit tests in `codex-client` cover env precedence and PEM normalization behavior. Real client construction remains in subprocess tests so the suite can control process env and avoid the macOS seatbelt panic path that motivated the hermetic test split. The subprocess coverage verifies: - `CODEX_CA_CERTIFICATE` precedence over `SSL_CERT_FILE` - fallback to `SSL_CERT_FILE` - single-cert and multi-cert bundles - malformed and empty-file errors - OpenSSL `TRUSTED CERTIFICATE` handling - CRL tolerance for well-formed CRL sections The websocket side is covered by the existing `codex-api` / `codex-core` websocket test suites plus the manual mitmproxy validation above. --------- Co-authored-by: Ivan Zakharchanka <3axap4eHko@gmail.com> Co-authored-by: Codex <noreply@openai.com>
145 lines
5 KiB
Rust
145 lines
5 KiB
Rust
//! Subprocess coverage for custom CA behavior that must build a real reqwest client.
|
|
//!
|
|
//! These tests intentionally run through `custom_ca_probe` and
|
|
//! `build_reqwest_client_for_subprocess_tests` instead of calling the helper in-process. The
|
|
//! detailed explanation of what "hermetic" means here lives in `codex_client::custom_ca`; these
|
|
//! tests add the process-level half of that contract by scrubbing inherited CA environment
|
|
//! variables before each subprocess launch. They still stop at client construction: the
|
|
//! assertions here cover CA file selection, PEM parsing, and user-facing errors, not a full TLS
|
|
//! handshake.
|
|
|
|
use codex_utils_cargo_bin::cargo_bin;
|
|
use std::fs;
|
|
use std::path::Path;
|
|
use std::process::Command;
|
|
use tempfile::TempDir;
|
|
|
|
const CODEX_CA_CERT_ENV: &str = "CODEX_CA_CERTIFICATE";
|
|
const SSL_CERT_FILE_ENV: &str = "SSL_CERT_FILE";
|
|
|
|
const TEST_CERT_1: &str = include_str!("fixtures/test-ca.pem");
|
|
const TEST_CERT_2: &str = include_str!("fixtures/test-intermediate.pem");
|
|
const TRUSTED_TEST_CERT: &str = include_str!("fixtures/test-ca-trusted.pem");
|
|
|
|
fn write_cert_file(temp_dir: &TempDir, name: &str, contents: &str) -> std::path::PathBuf {
|
|
let path = temp_dir.path().join(name);
|
|
fs::write(&path, contents).unwrap_or_else(|error| {
|
|
panic!("write cert fixture failed for {}: {error}", path.display())
|
|
});
|
|
path
|
|
}
|
|
|
|
fn run_probe(envs: &[(&str, &Path)]) -> std::process::Output {
|
|
let mut cmd = Command::new(
|
|
cargo_bin("custom_ca_probe")
|
|
.unwrap_or_else(|error| panic!("failed to locate custom_ca_probe: {error}")),
|
|
);
|
|
// `Command` inherits the parent environment by default, so scrub CA-related variables first or
|
|
// these tests can accidentally pass/fail based on the developer shell or CI runner.
|
|
cmd.env_remove(CODEX_CA_CERT_ENV);
|
|
cmd.env_remove(SSL_CERT_FILE_ENV);
|
|
for (key, value) in envs {
|
|
cmd.env(key, value);
|
|
}
|
|
cmd.output()
|
|
.unwrap_or_else(|error| panic!("failed to run custom_ca_probe: {error}"))
|
|
}
|
|
|
|
#[test]
|
|
fn uses_codex_ca_cert_env() {
|
|
let temp_dir = TempDir::new().expect("tempdir");
|
|
let cert_path = write_cert_file(&temp_dir, "ca.pem", TEST_CERT_1);
|
|
|
|
let output = run_probe(&[(CODEX_CA_CERT_ENV, cert_path.as_path())]);
|
|
|
|
assert!(output.status.success());
|
|
}
|
|
|
|
#[test]
|
|
fn falls_back_to_ssl_cert_file() {
|
|
let temp_dir = TempDir::new().expect("tempdir");
|
|
let cert_path = write_cert_file(&temp_dir, "ssl.pem", TEST_CERT_1);
|
|
|
|
let output = run_probe(&[(SSL_CERT_FILE_ENV, cert_path.as_path())]);
|
|
|
|
assert!(output.status.success());
|
|
}
|
|
|
|
#[test]
|
|
fn prefers_codex_ca_cert_over_ssl_cert_file() {
|
|
let temp_dir = TempDir::new().expect("tempdir");
|
|
let cert_path = write_cert_file(&temp_dir, "ca.pem", TEST_CERT_1);
|
|
let bad_path = write_cert_file(&temp_dir, "bad.pem", "");
|
|
|
|
let output = run_probe(&[
|
|
(CODEX_CA_CERT_ENV, cert_path.as_path()),
|
|
(SSL_CERT_FILE_ENV, bad_path.as_path()),
|
|
]);
|
|
|
|
assert!(output.status.success());
|
|
}
|
|
|
|
#[test]
|
|
fn handles_multi_certificate_bundle() {
|
|
let temp_dir = TempDir::new().expect("tempdir");
|
|
let bundle = format!("{TEST_CERT_1}\n{TEST_CERT_2}");
|
|
let cert_path = write_cert_file(&temp_dir, "bundle.pem", &bundle);
|
|
|
|
let output = run_probe(&[(CODEX_CA_CERT_ENV, cert_path.as_path())]);
|
|
|
|
assert!(output.status.success());
|
|
}
|
|
|
|
#[test]
|
|
fn rejects_empty_pem_file_with_hint() {
|
|
let temp_dir = TempDir::new().expect("tempdir");
|
|
let cert_path = write_cert_file(&temp_dir, "empty.pem", "");
|
|
|
|
let output = run_probe(&[(CODEX_CA_CERT_ENV, cert_path.as_path())]);
|
|
|
|
assert!(!output.status.success());
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
assert!(stderr.contains("no certificates found in PEM file"));
|
|
assert!(stderr.contains("CODEX_CA_CERTIFICATE"));
|
|
assert!(stderr.contains("SSL_CERT_FILE"));
|
|
}
|
|
|
|
#[test]
|
|
fn rejects_malformed_pem_with_hint() {
|
|
let temp_dir = TempDir::new().expect("tempdir");
|
|
let cert_path = write_cert_file(
|
|
&temp_dir,
|
|
"malformed.pem",
|
|
"-----BEGIN CERTIFICATE-----\nMIIBroken",
|
|
);
|
|
|
|
let output = run_probe(&[(CODEX_CA_CERT_ENV, cert_path.as_path())]);
|
|
|
|
assert!(!output.status.success());
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
assert!(stderr.contains("failed to parse PEM file"));
|
|
assert!(stderr.contains("CODEX_CA_CERTIFICATE"));
|
|
assert!(stderr.contains("SSL_CERT_FILE"));
|
|
}
|
|
|
|
#[test]
|
|
fn accepts_openssl_trusted_certificate() {
|
|
let temp_dir = TempDir::new().expect("tempdir");
|
|
let cert_path = write_cert_file(&temp_dir, "trusted.pem", TRUSTED_TEST_CERT);
|
|
|
|
let output = run_probe(&[(CODEX_CA_CERT_ENV, cert_path.as_path())]);
|
|
|
|
assert!(output.status.success());
|
|
}
|
|
|
|
#[test]
|
|
fn accepts_bundle_with_crl() {
|
|
let temp_dir = TempDir::new().expect("tempdir");
|
|
let crl = "-----BEGIN X509 CRL-----\nMIIC\n-----END X509 CRL-----";
|
|
let bundle = format!("{TEST_CERT_1}\n{crl}");
|
|
let cert_path = write_cert_file(&temp_dir, "bundle_crl.pem", &bundle);
|
|
|
|
let output = run_probe(&[(CODEX_CA_CERT_ENV, cert_path.as_path())]);
|
|
|
|
assert!(output.status.success());
|
|
}
|