clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-06-01 19:02:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MITM CA trust build failures

Browse Source
This commit is contained in:
Winston Howes
2026-05-15 10:12:05 -07:00
parent a4101509c5
commit 9fa22ca31e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
codex-rs/app-server/src/config/external_agent_config.rs
View File

@@ -1491,10 +1491,12 @@ fn json_object_to_env_toml_table(
object: &serde_json::Map<String, JsonValue>, object: &serde_json::Map<String, JsonValue>,
) -> toml::map::Map<String, TomlValue> { ) -> toml::map::Map<String, TomlValue> {
let mut table = toml::map::Map::new(); let mut table = toml::map::Map::new();
for (key, value) in object { for (key, value) in object
if let Some(value) = json_env_value_to_string(value) { .iter()
table.insert(key.clone(), TomlValue::String(value)); .filter_map(|(key, value)| json_env_value_to_string(value).map(|value| (key, value)))
} .collect::<BTreeMap<_, _>>()
{
table.insert(key.clone(), TomlValue::String(value));
} }
table table
} }

2
codex-rs/network-proxy/src/upstream.rs
View File

@@ -1,5 +1,6 @@
use crate::connect_policy::TargetCheckedTcpConnector; use crate::connect_policy::TargetCheckedTcpConnector;
use crate::state::NetworkProxyState; use crate::state::NetworkProxyState;
use codex_utils_rustls_provider::ensure_rustls_crypto_provider;
use rama_core::Layer; use rama_core::Layer;
use rama_core::Service; use rama_core::Service;
use rama_core::error::BoxError; use rama_core::error::BoxError;
@@ -225,6 +226,7 @@ fn build_http_connector(
EstablishedClientConnection<HttpClientService<Body>, Request<Body>>, EstablishedClientConnection<HttpClientService<Body>, Request<Body>>,
BoxError, BoxError,
> { > {
ensure_rustls_crypto_provider();
let proxy = HttpProxyConnectorLayer::optional().into_layer(transport); let proxy = HttpProxyConnectorLayer::optional().into_layer(transport);
let tls_config = TlsConnectorDataBuilder::new() let tls_config = TlsConnectorDataBuilder::new()
.with_alpn_protocols_http_auto() .with_alpn_protocols_http_auto()