mirror of
https://github.com/openai/codex.git
synced 2026-11-03 08:22:30 +00:00
Enforce configured network proxy in codex sandbox (#27035)
## Why `codex sandbox` can start a network proxy from a configured permission profile. Previously, sandbox-level containment was tied to managed network requirements rather than whether a proxy was actually active. This meant config-driven proxy policies were not consistently enforced as the sandbox's only network path. ## What changed - Enable proxy-only network containment whenever `codex sandbox` starts a network proxy. - Apply the same active-proxy check to the macOS and Linux sandbox paths. - Add a Linux regression test that verifies a sandboxed command cannot establish a direct connection while the configured proxy is active. ## Test plan - `just test -p codex-cli debug_sandbox::tests` - `sandbox_with_network_proxy_blocks_direct_loopback_access` runs on Linux to cover the config-driven proxy path end to end.
This commit is contained in:
1 parent
e0ee491df3
commit
85fd52f7e4
7 files changed
+98
-8
No files matched your search
@@ -3,6 +3,9 @@ load("//:defs.bzl", "MACOS_WEBRTC_RUSTC_LINK_FLAGS", "codex_rust_crate", "multip
|
|||||||
codex_rust_crate(
|
codex_rust_crate(
|
||||||
name = "cli",
|
name = "cli",
|
||||||
crate_name = "codex_cli",
|
crate_name = "codex_cli",
|
||||||
|
extra_binaries = [
|
||||||
|
"//codex-rs/bwrap:bwrap",
|
||||||
|
],
|
||||||
rustc_flags_extra = MACOS_WEBRTC_RUSTC_LINK_FLAGS,
|
rustc_flags_extra = MACOS_WEBRTC_RUSTC_LINK_FLAGS,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -258,6 +258,9 @@ async fn run_command_under_sandbox(
|
|||||||
let network = network_proxy
|
let network = network_proxy
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(codex_core::config::StartedNetworkProxy::proxy);
|
.map(codex_core::config::StartedNetworkProxy::proxy);
|
||||||
|
// Proxy containment depends on whether a proxy is active, not whether its
|
||||||
|
// policy came from managed requirements.
|
||||||
|
let enforce_managed_network = network.is_some();
|
||||||
let managed_mitm_ca_trust_bundle_path = match network.as_ref() {
|
let managed_mitm_ca_trust_bundle_path = match network.as_ref() {
|
||||||
Some(network) => network.managed_mitm_ca_trust_bundle_path(),
|
Some(network) => network.managed_mitm_ca_trust_bundle_path(),
|
||||||
None => None,
|
None => None,
|
||||||
@@ -278,7 +281,7 @@ async fn run_command_under_sandbox(
|
|||||||
file_system_sandbox_policy: &file_system_sandbox_policy,
|
file_system_sandbox_policy: &file_system_sandbox_policy,
|
||||||
network_sandbox_policy,
|
network_sandbox_policy,
|
||||||
sandbox_policy_cwd: sandbox_policy_cwd.as_path(),
|
sandbox_policy_cwd: sandbox_policy_cwd.as_path(),
|
||||||
enforce_managed_network: false,
|
enforce_managed_network,
|
||||||
network: network.as_ref(),
|
network: network.as_ref(),
|
||||||
extra_allow_unix_sockets: allow_unix_sockets,
|
extra_allow_unix_sockets: allow_unix_sockets,
|
||||||
});
|
});
|
||||||
@@ -311,7 +314,7 @@ async fn run_command_under_sandbox(
|
|||||||
&runtime_permission_profile,
|
&runtime_permission_profile,
|
||||||
sandbox_policy_cwd.as_path(),
|
sandbox_policy_cwd.as_path(),
|
||||||
use_legacy_landlock,
|
use_legacy_landlock,
|
||||||
allow_network_for_proxy(managed_network_requirements_enabled),
|
allow_network_for_proxy(enforce_managed_network),
|
||||||
);
|
);
|
||||||
spawn_debug_sandbox_child(
|
spawn_debug_sandbox_child(
|
||||||
codex_linux_sandbox_exe,
|
codex_linux_sandbox_exe,
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
#![cfg(target_os = "linux")]
|
||||||
|
|
||||||
|
use std::net::TcpListener;
|
||||||
|
|
||||||
|
use anyhow::Result;
|
||||||
|
use tempfile::TempDir;
|
||||||
|
|
||||||
|
const BWRAP_UNAVAILABLE_ERR: &str = "bubblewrap is unavailable";
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn sandbox_with_network_proxy_blocks_direct_loopback_access() -> Result<()> {
|
||||||
|
let codex_home = TempDir::new()?;
|
||||||
|
let listener = TcpListener::bind("127.0.0.2:0")?;
|
||||||
|
let port = listener.local_addr()?.port();
|
||||||
|
std::fs::write(
|
||||||
|
codex_home.path().join("config.toml"),
|
||||||
|
r#"
|
||||||
|
default_permissions = "network-test"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
network_proxy = true
|
||||||
|
use_legacy_landlock = true
|
||||||
|
|
||||||
|
[permissions.network-test]
|
||||||
|
extends = ":workspace"
|
||||||
|
|
||||||
|
[permissions.network-test.network]
|
||||||
|
enabled = true
|
||||||
|
mode = "full"
|
||||||
|
"#,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
let url = format!("http://127.0.0.2:{port}/");
|
||||||
|
let output = std::process::Command::new(codex_utils_cargo_bin::cargo_bin("codex")?)
|
||||||
|
.env("CODEX_HOME", codex_home.path())
|
||||||
|
.args([
|
||||||
|
"sandbox",
|
||||||
|
"--permissions-profile",
|
||||||
|
"network-test",
|
||||||
|
"--",
|
||||||
|
"curl",
|
||||||
|
"--noproxy",
|
||||||
|
"*",
|
||||||
|
"--silent",
|
||||||
|
"--show-error",
|
||||||
|
"--connect-timeout",
|
||||||
|
"1",
|
||||||
|
"--max-time",
|
||||||
|
"2",
|
||||||
|
url.as_str(),
|
||||||
|
])
|
||||||
|
.output()?;
|
||||||
|
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
if stderr.contains(BWRAP_UNAVAILABLE_ERR) {
|
||||||
|
eprintln!("skipping network proxy sandbox test: bubblewrap is unavailable");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
output.status.code(),
|
||||||
|
Some(7),
|
||||||
|
"expected direct loopback access to be blocked; status={:?}; stdout={}; stderr={}",
|
||||||
|
output.status.code(),
|
||||||
|
String::from_utf8_lossy(&output.stdout),
|
||||||
|
stderr,
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -47,7 +47,8 @@ pub fn create_linux_sandbox_command_args_for_permission_profile(
|
|||||||
"--permission-profile".to_string(),
|
"--permission-profile".to_string(),
|
||||||
permission_profile_json,
|
permission_profile_json,
|
||||||
];
|
];
|
||||||
if use_legacy_landlock {
|
// Proxy-only networking requires bubblewrap's isolated network namespace.
|
||||||
|
if use_legacy_landlock && !allow_network_for_proxy {
|
||||||
linux_cmd.push("--use-legacy-landlock".to_string());
|
linux_cmd.push("--use-legacy-landlock".to_string());
|
||||||
}
|
}
|
||||||
if allow_network_for_proxy {
|
if allow_network_for_proxy {
|
||||||
@@ -83,7 +84,8 @@ fn create_linux_sandbox_command_args(
|
|||||||
"--command-cwd".to_string(),
|
"--command-cwd".to_string(),
|
||||||
command_cwd,
|
command_cwd,
|
||||||
];
|
];
|
||||||
if use_legacy_landlock {
|
// Proxy-only networking requires bubblewrap's isolated network namespace.
|
||||||
|
if use_legacy_landlock && !allow_network_for_proxy {
|
||||||
linux_cmd.push("--use-legacy-landlock".to_string());
|
linux_cmd.push("--use-legacy-landlock".to_string());
|
||||||
}
|
}
|
||||||
if allow_network_for_proxy {
|
if allow_network_for_proxy {
|
||||||
|
|||||||
@@ -33,14 +33,16 @@ fn legacy_landlock_flag_is_included_when_requested() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn proxy_flag_is_included_when_requested() {
|
fn proxy_flag_takes_precedence_over_legacy_landlock() {
|
||||||
let command = vec!["/bin/true".to_string()];
|
let command = vec!["/bin/true".to_string()];
|
||||||
let command_cwd = Path::new("/tmp/link");
|
let command_cwd = Path::new("/tmp/link");
|
||||||
let cwd = Path::new("/tmp");
|
let cwd = Path::new("/tmp");
|
||||||
|
let permission_profile = PermissionProfile::read_only();
|
||||||
|
|
||||||
let args = create_linux_sandbox_command_args(
|
let args = create_linux_sandbox_command_args_for_permission_profile(
|
||||||
command,
|
command,
|
||||||
command_cwd,
|
command_cwd,
|
||||||
|
&permission_profile,
|
||||||
cwd,
|
cwd,
|
||||||
/*use_legacy_landlock*/ true,
|
/*use_legacy_landlock*/ true,
|
||||||
/*allow_network_for_proxy*/ true,
|
/*allow_network_for_proxy*/ true,
|
||||||
@@ -49,6 +51,7 @@ fn proxy_flag_is_included_when_requested() {
|
|||||||
args.contains(&"--allow-network-for-proxy".to_string()),
|
args.contains(&"--allow-network-for-proxy".to_string()),
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
|
assert_eq!(args.contains(&"--use-legacy-landlock".to_string()), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -338,8 +338,8 @@ fn ensure_linux_bubblewrap_is_supported(
|
|||||||
allow_network_for_proxy: bool,
|
allow_network_for_proxy: bool,
|
||||||
is_wsl1: bool,
|
is_wsl1: bool,
|
||||||
) -> Result<(), SandboxTransformError> {
|
) -> Result<(), SandboxTransformError> {
|
||||||
let requires_bubblewrap = !use_legacy_landlock
|
let requires_bubblewrap = allow_network_for_proxy
|
||||||
&& (!file_system_sandbox_policy.has_full_disk_write_access() || allow_network_for_proxy);
|
|| (!use_legacy_landlock && !file_system_sandbox_policy.has_full_disk_write_access());
|
||||||
if is_wsl1 && requires_bubblewrap {
|
if is_wsl1 && requires_bubblewrap {
|
||||||
return Err(SandboxTransformError::Wsl1UnsupportedForBubblewrap);
|
return Err(SandboxTransformError::Wsl1UnsupportedForBubblewrap);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -342,6 +342,15 @@ fn wsl1_rejects_linux_bubblewrap_path() {
|
|||||||
),
|
),
|
||||||
Err(super::SandboxTransformError::Wsl1UnsupportedForBubblewrap)
|
Err(super::SandboxTransformError::Wsl1UnsupportedForBubblewrap)
|
||||||
));
|
));
|
||||||
|
assert!(matches!(
|
||||||
|
super::ensure_linux_bubblewrap_is_supported(
|
||||||
|
&FileSystemSandboxPolicy::unrestricted(),
|
||||||
|
/*use_legacy_landlock*/ true,
|
||||||
|
/*allow_network_for_proxy*/ true,
|
||||||
|
/*is_wsl1*/ true,
|
||||||
|
),
|
||||||
|
Err(super::SandboxTransformError::Wsl1UnsupportedForBubblewrap)
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
|
|||||||
Reference in new issue
Block a user