clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-29 08:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

explicitly name controls

Browse Source
This commit is contained in:
viyatb-oai
2025-12-23 23:26:26 -08:00
parent 10abb38b53
commit 9b2a353e6e
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
codex-rs/network-proxy/src/config.rs
View File

@@ -20,7 +20,7 @@ pub struct NetworkProxyConfig {
#[serde(default = "default_admin_url")]
pub admin_url: String,
#[serde(default)]
pub dangerously_allow_non_loopback: bool,
pub dangerously_allow_non_loopback_proxy: bool,
#[serde(default)]
pub dangerously_allow_non_loopback_admin: bool,
#[serde(default)]
@@ -37,7 +37,7 @@ impl Default for NetworkProxyConfig {
enabled: false,
proxy_url: default_proxy_url(),
admin_url: default_admin_url(),
dangerously_allow_non_loopback: false,
dangerously_allow_non_loopback_proxy: false,
dangerously_allow_non_loopback_admin: false,
mode: NetworkMode::default(),
policy: NetworkPolicy::default(),
@@ -123,7 +123,7 @@ fn clamp_non_loopback(addr: SocketAddr, allow_non_loopback: bool, name: &str) ->
}
warn!(
"{name} requested non-loopback bind ({addr}); clamping to 127.0.0.1:{port} (set the corresponding dangerously_allow_non_loopback* flag to override)",
"{name} requested non-loopback bind ({addr}); clamping to 127.0.0.1:{port} (set dangerously_allow_non_loopback_proxy or dangerously_allow_non_loopback_admin to override)",
port = addr.port()
);
SocketAddr::from(([127, 0, 0, 1], addr.port()))
@@ -140,7 +140,7 @@ pub fn resolve_runtime(cfg: &Config) -> RuntimeConfig {
let admin_addr = resolve_addr(&cfg.network_proxy.admin_url, 8080);
let http_addr = clamp_non_loopback(
http_addr,
cfg.network_proxy.dangerously_allow_non_loopback,
cfg.network_proxy.dangerously_allow_non_loopback_proxy,
"HTTP proxy",
);
let admin_addr = clamp_non_loopback(
@@ -155,9 +155,9 @@ pub fn resolve_runtime(cfg: &Config) -> RuntimeConfig {
// reachable from outside the machine, it can become a remote bridge into local daemons
// (e.g. docker.sock). To avoid footguns, enforce loopback binding whenever unix sockets
// are enabled.
if cfg.network_proxy.dangerously_allow_non_loopback && !http_addr.ip().is_loopback() {
if cfg.network_proxy.dangerously_allow_non_loopback_proxy && !http_addr.ip().is_loopback() {
warn!(
"unix socket proxying is enabled; ignoring dangerously_allow_non_loopback and clamping HTTP proxy to loopback"
"unix socket proxying is enabled; ignoring dangerously_allow_non_loopback_proxy and clamping HTTP proxy to loopback"
);
}
if cfg.network_proxy.dangerously_allow_non_loopback_admin && !admin_addr.ip().is_loopback()

15
codex-rs/network-proxy/src/state.rs
View File

@@ -360,7 +360,7 @@ struct PartialConfig {
struct PartialNetworkProxyConfig {
enabled: Option<bool>,
mode: Option<NetworkMode>,
dangerously_allow_non_loopback: Option<bool>,
dangerously_allow_non_loopback_proxy: Option<bool>,
dangerously_allow_non_loopback_admin: Option<bool>,
#[serde(default)]
policy: PartialNetworkPolicy,
@@ -382,7 +382,7 @@ struct PartialNetworkPolicy {
struct NetworkProxyConstraints {
enabled: Option<bool>,
mode: Option<NetworkMode>,
dangerously_allow_non_loopback: Option<bool>,
dangerously_allow_non_loopback_proxy: Option<bool>,
dangerously_allow_non_loopback_admin: Option<bool>,
allowed_domains: Option<Vec<String>>,
denied_domains: Option<Vec<String>>,
@@ -425,10 +425,11 @@ fn network_proxy_constraints_from_trusted_layers(
if let Some(mode) = partial.network_proxy.mode {
constraints.mode = Some(mode);
}
if let Some(dangerously_allow_non_loopback) =
partial.network_proxy.dangerously_allow_non_loopback
if let Some(dangerously_allow_non_loopback_proxy) =
partial.network_proxy.dangerously_allow_non_loopback_proxy
{
constraints.dangerously_allow_non_loopback = Some(dangerously_allow_non_loopback);
constraints.dangerously_allow_non_loopback_proxy =
Some(dangerously_allow_non_loopback_proxy);
}
if let Some(dangerously_allow_non_loopback_admin) =
partial.network_proxy.dangerously_allow_non_loopback_admin
@@ -511,9 +512,9 @@ fn validate_policy_against_constraints(
},
)?;
let allow_non_loopback_proxy = constraints.dangerously_allow_non_loopback;
let allow_non_loopback_proxy = constraints.dangerously_allow_non_loopback_proxy;
let _ = Constrained::new(
config.network_proxy.dangerously_allow_non_loopback,
config.network_proxy.dangerously_allow_non_loopback_proxy,
move |candidate| match allow_non_loopback_proxy {
Some(true) | None => Ok(()),
Some(false) => {