From 9fa22ca31e61fe79b5fef6483a6fb80b93aeffdf Mon Sep 17 00:00:00 2001 From: Winston Howes Date: Fri, 15 May 2026 10:12:05 -0700 Subject: [PATCH] Fix MITM CA trust build failures --- .../app-server/src/config/external_agent_config.rs | 10 ++++++---- codex-rs/network-proxy/src/upstream.rs | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/codex-rs/app-server/src/config/external_agent_config.rs b/codex-rs/app-server/src/config/external_agent_config.rs index 18c276f07d..00c1431722 100644 --- a/codex-rs/app-server/src/config/external_agent_config.rs +++ b/codex-rs/app-server/src/config/external_agent_config.rs @@ -1491,10 +1491,12 @@ fn json_object_to_env_toml_table( object: &serde_json::Map, ) -> toml::map::Map { let mut table = toml::map::Map::new(); - for (key, value) in object { - if let Some(value) = json_env_value_to_string(value) { - table.insert(key.clone(), TomlValue::String(value)); - } + for (key, value) in object + .iter() + .filter_map(|(key, value)| json_env_value_to_string(value).map(|value| (key, value))) + .collect::>() + { + table.insert(key.clone(), TomlValue::String(value)); } table } diff --git a/codex-rs/network-proxy/src/upstream.rs b/codex-rs/network-proxy/src/upstream.rs index 72b7290f12..3437b0d32d 100644 --- a/codex-rs/network-proxy/src/upstream.rs +++ b/codex-rs/network-proxy/src/upstream.rs @@ -1,5 +1,6 @@ use crate::connect_policy::TargetCheckedTcpConnector; use crate::state::NetworkProxyState; +use codex_utils_rustls_provider::ensure_rustls_crypto_provider; use rama_core::Layer; use rama_core::Service; use rama_core::error::BoxError; @@ -225,6 +226,7 @@ fn build_http_connector( EstablishedClientConnection, Request>, BoxError, > { + ensure_rustls_crypto_provider(); let proxy = HttpProxyConnectorLayer::optional().into_layer(transport); let tls_config = TlsConnectorDataBuilder::new() .with_alpn_protocols_http_auto()