mirror of
https://github.com/openai/codex.git
synced 2026-11-02 00:18:52 +00:00
## Summary - make bubblewrap the default Linux sandbox and keep `use_legacy_landlock` as the only override - remove `use_linux_sandbox_bwrap` from feature, config, schema, and docs surfaces - update Linux sandbox selection, CLI/config plumbing, and related tests/docs to match the new default - fold in the follow-up CI fixes for request-permissions responses and Linux read-only sandbox error text
223 lines
7.5 KiB
Rust
223 lines
7.5 KiB
Rust
use crate::protocol::SandboxPolicy;
|
|
use crate::spawn::SpawnChildRequest;
|
|
use crate::spawn::StdioPolicy;
|
|
use crate::spawn::spawn_child_async;
|
|
use codex_network_proxy::NetworkProxy;
|
|
use codex_protocol::permissions::FileSystemSandboxPolicy;
|
|
use codex_protocol::permissions::NetworkSandboxPolicy;
|
|
use std::collections::HashMap;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
use tokio::process::Child;
|
|
|
|
/// Spawn a shell tool command under the Linux sandbox helper
|
|
/// (codex-linux-sandbox), which defaults to bubblewrap for filesystem
|
|
/// isolation plus seccomp for network restrictions.
|
|
///
|
|
/// Unlike macOS Seatbelt where we directly embed the policy text, the Linux
|
|
/// helper is a separate executable. We pass the legacy [`SandboxPolicy`] plus
|
|
/// split filesystem/network policies as JSON so the helper can migrate
|
|
/// incrementally without breaking older call sites.
|
|
#[allow(clippy::too_many_arguments)]
|
|
pub async fn spawn_command_under_linux_sandbox<P>(
|
|
codex_linux_sandbox_exe: P,
|
|
command: Vec<String>,
|
|
command_cwd: PathBuf,
|
|
sandbox_policy: &SandboxPolicy,
|
|
sandbox_policy_cwd: &Path,
|
|
use_legacy_landlock: bool,
|
|
stdio_policy: StdioPolicy,
|
|
network: Option<&NetworkProxy>,
|
|
env: HashMap<String, String>,
|
|
) -> std::io::Result<Child>
|
|
where
|
|
P: AsRef<Path>,
|
|
{
|
|
let file_system_sandbox_policy =
|
|
FileSystemSandboxPolicy::from_legacy_sandbox_policy(sandbox_policy, sandbox_policy_cwd);
|
|
let network_sandbox_policy = NetworkSandboxPolicy::from(sandbox_policy);
|
|
let args = create_linux_sandbox_command_args_for_policies(
|
|
command,
|
|
sandbox_policy,
|
|
&file_system_sandbox_policy,
|
|
network_sandbox_policy,
|
|
sandbox_policy_cwd,
|
|
use_legacy_landlock,
|
|
allow_network_for_proxy(false),
|
|
);
|
|
let arg0 = Some("codex-linux-sandbox");
|
|
spawn_child_async(SpawnChildRequest {
|
|
program: codex_linux_sandbox_exe.as_ref().to_path_buf(),
|
|
args,
|
|
arg0,
|
|
cwd: command_cwd,
|
|
network_sandbox_policy,
|
|
network,
|
|
stdio_policy,
|
|
env,
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub(crate) fn allow_network_for_proxy(enforce_managed_network: bool) -> bool {
|
|
// When managed network requirements are active, request proxy-only
|
|
// networking from the Linux sandbox helper. Without managed requirements,
|
|
// preserve existing behavior.
|
|
enforce_managed_network
|
|
}
|
|
|
|
/// Converts the sandbox policies into the CLI invocation for
|
|
/// `codex-linux-sandbox`.
|
|
///
|
|
/// The helper performs the actual sandboxing (bubblewrap by default + seccomp) after
|
|
/// parsing these arguments. Policy JSON flags are emitted before helper feature
|
|
/// flags so the argv order matches the helper's CLI shape. See
|
|
/// `docs/linux_sandbox.md` for the Linux semantics.
|
|
#[allow(clippy::too_many_arguments)]
|
|
pub(crate) fn create_linux_sandbox_command_args_for_policies(
|
|
command: Vec<String>,
|
|
sandbox_policy: &SandboxPolicy,
|
|
file_system_sandbox_policy: &FileSystemSandboxPolicy,
|
|
network_sandbox_policy: NetworkSandboxPolicy,
|
|
sandbox_policy_cwd: &Path,
|
|
use_legacy_landlock: bool,
|
|
allow_network_for_proxy: bool,
|
|
) -> Vec<String> {
|
|
let sandbox_policy_json = serde_json::to_string(sandbox_policy)
|
|
.unwrap_or_else(|err| panic!("failed to serialize sandbox policy: {err}"));
|
|
let file_system_policy_json = serde_json::to_string(file_system_sandbox_policy)
|
|
.unwrap_or_else(|err| panic!("failed to serialize filesystem sandbox policy: {err}"));
|
|
let network_policy_json = serde_json::to_string(&network_sandbox_policy)
|
|
.unwrap_or_else(|err| panic!("failed to serialize network sandbox policy: {err}"));
|
|
let sandbox_policy_cwd = sandbox_policy_cwd
|
|
.to_str()
|
|
.unwrap_or_else(|| panic!("cwd must be valid UTF-8"))
|
|
.to_string();
|
|
|
|
let mut linux_cmd: Vec<String> = vec![
|
|
"--sandbox-policy-cwd".to_string(),
|
|
sandbox_policy_cwd,
|
|
"--sandbox-policy".to_string(),
|
|
sandbox_policy_json,
|
|
"--file-system-sandbox-policy".to_string(),
|
|
file_system_policy_json,
|
|
"--network-sandbox-policy".to_string(),
|
|
network_policy_json,
|
|
];
|
|
if use_legacy_landlock {
|
|
linux_cmd.push("--use-legacy-landlock".to_string());
|
|
}
|
|
if allow_network_for_proxy {
|
|
linux_cmd.push("--allow-network-for-proxy".to_string());
|
|
}
|
|
linux_cmd.push("--".to_string());
|
|
linux_cmd.extend(command);
|
|
linux_cmd
|
|
}
|
|
|
|
/// Converts the sandbox cwd and execution options into the CLI invocation for
|
|
/// `codex-linux-sandbox`.
|
|
#[cfg(test)]
|
|
pub(crate) fn create_linux_sandbox_command_args(
|
|
command: Vec<String>,
|
|
sandbox_policy_cwd: &Path,
|
|
use_legacy_landlock: bool,
|
|
allow_network_for_proxy: bool,
|
|
) -> Vec<String> {
|
|
let sandbox_policy_cwd = sandbox_policy_cwd
|
|
.to_str()
|
|
.unwrap_or_else(|| panic!("cwd must be valid UTF-8"))
|
|
.to_string();
|
|
|
|
let mut linux_cmd: Vec<String> = vec!["--sandbox-policy-cwd".to_string(), sandbox_policy_cwd];
|
|
if use_legacy_landlock {
|
|
linux_cmd.push("--use-legacy-landlock".to_string());
|
|
}
|
|
if allow_network_for_proxy {
|
|
linux_cmd.push("--allow-network-for-proxy".to_string());
|
|
}
|
|
|
|
// Separator so that command arguments starting with `-` are not parsed as
|
|
// options of the helper itself.
|
|
linux_cmd.push("--".to_string());
|
|
|
|
// Append the original tool command.
|
|
linux_cmd.extend(command);
|
|
|
|
linux_cmd
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
#[test]
|
|
fn legacy_landlock_flag_is_included_when_requested() {
|
|
let command = vec!["/bin/true".to_string()];
|
|
let cwd = Path::new("/tmp");
|
|
|
|
let default_bwrap = create_linux_sandbox_command_args(command.clone(), cwd, false, false);
|
|
assert_eq!(
|
|
default_bwrap.contains(&"--use-legacy-landlock".to_string()),
|
|
false
|
|
);
|
|
|
|
let legacy_landlock = create_linux_sandbox_command_args(command, cwd, true, false);
|
|
assert_eq!(
|
|
legacy_landlock.contains(&"--use-legacy-landlock".to_string()),
|
|
true
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn proxy_flag_is_included_when_requested() {
|
|
let command = vec!["/bin/true".to_string()];
|
|
let cwd = Path::new("/tmp");
|
|
|
|
let args = create_linux_sandbox_command_args(command, cwd, true, true);
|
|
assert_eq!(
|
|
args.contains(&"--allow-network-for-proxy".to_string()),
|
|
true
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn split_policy_flags_are_included() {
|
|
let command = vec!["/bin/true".to_string()];
|
|
let cwd = Path::new("/tmp");
|
|
let sandbox_policy = SandboxPolicy::new_read_only_policy();
|
|
let file_system_sandbox_policy = FileSystemSandboxPolicy::from(&sandbox_policy);
|
|
let network_sandbox_policy = NetworkSandboxPolicy::from(&sandbox_policy);
|
|
|
|
let args = create_linux_sandbox_command_args_for_policies(
|
|
command,
|
|
&sandbox_policy,
|
|
&file_system_sandbox_policy,
|
|
network_sandbox_policy,
|
|
cwd,
|
|
true,
|
|
false,
|
|
);
|
|
|
|
assert_eq!(
|
|
args.windows(2).any(|window| {
|
|
window[0] == "--file-system-sandbox-policy" && !window[1].is_empty()
|
|
}),
|
|
true
|
|
);
|
|
assert_eq!(
|
|
args.windows(2)
|
|
.any(|window| window[0] == "--network-sandbox-policy"
|
|
&& window[1] == "\"restricted\""),
|
|
true
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn proxy_network_requires_managed_requirements() {
|
|
assert_eq!(allow_network_for_proxy(false), false);
|
|
assert_eq!(allow_network_for_proxy(true), true);
|
|
}
|
|
}
|