mirror of
https://github.com/openai/codex.git
synced 2026-04-25 23:24:55 +00:00
revert: remove pre-Landlock bind mounts apply (#9300)
**Description** This removes the pre‑Landlock read‑only bind‑mount step from the Linux sandbox so filesystem restrictions rely solely on Landlock again. `mounts.rs` is kept in place but left unused. The linux‑sandbox README is updated to match the new behavior and manual test expectations.
This commit is contained in:
@@ -13,7 +13,6 @@ use pretty_assertions::assert_eq;
|
||||
use std::collections::HashMap;
|
||||
use std::path::PathBuf;
|
||||
use tempfile::NamedTempFile;
|
||||
use tokio::process::Command;
|
||||
|
||||
// At least on GitHub CI, the arm64 tests appear to need longer timeouts.
|
||||
|
||||
@@ -91,51 +90,6 @@ async fn run_cmd_output(
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
#[expect(clippy::expect_used)]
|
||||
async fn assert_write_blocked(cmd: &[&str], writable_roots: &[PathBuf], timeout_ms: u64) {
|
||||
let cwd = std::env::current_dir().expect("cwd should exist");
|
||||
let sandbox_cwd = cwd.clone();
|
||||
let params = ExecParams {
|
||||
command: cmd.iter().copied().map(str::to_owned).collect(),
|
||||
cwd,
|
||||
expiration: timeout_ms.into(),
|
||||
env: create_env_from_core_vars(),
|
||||
sandbox_permissions: SandboxPermissions::UseDefault,
|
||||
justification: None,
|
||||
arg0: None,
|
||||
};
|
||||
|
||||
let sandbox_policy = SandboxPolicy::WorkspaceWrite {
|
||||
writable_roots: writable_roots
|
||||
.iter()
|
||||
.map(|p| AbsolutePathBuf::try_from(p.as_path()).unwrap())
|
||||
.collect(),
|
||||
network_access: false,
|
||||
exclude_tmpdir_env_var: true,
|
||||
exclude_slash_tmp: true,
|
||||
};
|
||||
let sandbox_program = env!("CARGO_BIN_EXE_codex-linux-sandbox");
|
||||
let codex_linux_sandbox_exe = Some(PathBuf::from(sandbox_program));
|
||||
let result = process_exec_tool_call(
|
||||
params,
|
||||
&sandbox_policy,
|
||||
sandbox_cwd.as_path(),
|
||||
&codex_linux_sandbox_exe,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
|
||||
match result {
|
||||
Ok(output) => {
|
||||
if output.exit_code == 0 {
|
||||
panic!("expected command to fail, but exit code was 0");
|
||||
}
|
||||
}
|
||||
Err(CodexErr::Sandbox(SandboxErr::Denied { .. })) => {}
|
||||
Err(err) => panic!("expected sandbox denial, got: {err:?}"),
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_root_read() {
|
||||
run_cmd(&["ls", "-l", "/bin"], &[], SHORT_TIMEOUT_MS).await;
|
||||
@@ -201,134 +155,6 @@ async fn test_no_new_privs_is_enabled() {
|
||||
assert_eq!(line.trim(), "NoNewPrivs:\t1");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_git_dir_write_blocked() {
|
||||
let tmpdir = tempfile::tempdir().unwrap();
|
||||
let repo_root = tmpdir.path();
|
||||
Command::new("git")
|
||||
.arg("init")
|
||||
.arg(".")
|
||||
.current_dir(repo_root)
|
||||
.output()
|
||||
.await
|
||||
.expect("git init .");
|
||||
|
||||
let git_config = repo_root.join(".git").join("config");
|
||||
let git_index_lock = repo_root.join(".git").join("index.lock");
|
||||
|
||||
assert_write_blocked(
|
||||
&[
|
||||
"bash",
|
||||
"-lc",
|
||||
&format!("echo pwned > {}", git_config.to_string_lossy()),
|
||||
],
|
||||
&[repo_root.to_path_buf()],
|
||||
LONG_TIMEOUT_MS,
|
||||
)
|
||||
.await;
|
||||
|
||||
assert_write_blocked(
|
||||
&[
|
||||
"bash",
|
||||
"-lc",
|
||||
&format!("echo pwned > {}", git_index_lock.to_string_lossy()),
|
||||
],
|
||||
&[repo_root.to_path_buf()],
|
||||
LONG_TIMEOUT_MS,
|
||||
)
|
||||
.await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_git_dir_move_blocked() {
|
||||
let tmpdir = tempfile::tempdir().unwrap();
|
||||
let repo_root = tmpdir.path();
|
||||
Command::new("git")
|
||||
.arg("init")
|
||||
.arg(".")
|
||||
.current_dir(repo_root)
|
||||
.output()
|
||||
.await
|
||||
.expect("git init .");
|
||||
|
||||
let git_dir = repo_root.join(".git");
|
||||
let git_dir_backup = repo_root.join(".git.bak");
|
||||
|
||||
assert_write_blocked(
|
||||
&[
|
||||
"bash",
|
||||
"-lc",
|
||||
&format!(
|
||||
"mv {} {}",
|
||||
git_dir.to_string_lossy(),
|
||||
git_dir_backup.to_string_lossy()
|
||||
),
|
||||
],
|
||||
&[repo_root.to_path_buf()],
|
||||
LONG_TIMEOUT_MS,
|
||||
)
|
||||
.await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_codex_dir_write_blocked() {
|
||||
let tmpdir = tempfile::tempdir().unwrap();
|
||||
let repo_root = tmpdir.path();
|
||||
std::fs::create_dir_all(repo_root.join(".codex")).unwrap();
|
||||
|
||||
let codex_config = repo_root.join(".codex").join("config.toml");
|
||||
|
||||
assert_write_blocked(
|
||||
&[
|
||||
"bash",
|
||||
"-lc",
|
||||
&format!("echo pwned > {}", codex_config.to_string_lossy()),
|
||||
],
|
||||
&[repo_root.to_path_buf()],
|
||||
LONG_TIMEOUT_MS,
|
||||
)
|
||||
.await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_git_pointer_file_blocks_gitdir_writes() {
|
||||
let tmpdir = tempfile::tempdir().unwrap();
|
||||
let repo_root = tmpdir.path();
|
||||
let gitdir = repo_root.join("actual-gitdir");
|
||||
std::fs::create_dir_all(&gitdir).unwrap();
|
||||
|
||||
let gitdir_config = gitdir.join("config");
|
||||
std::fs::write(&gitdir_config, "[core]\n\trepositoryformatversion = 0\n").unwrap();
|
||||
|
||||
std::fs::write(
|
||||
repo_root.join(".git"),
|
||||
format!("gitdir: {}\n", gitdir.to_string_lossy()),
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
assert_write_blocked(
|
||||
&[
|
||||
"bash",
|
||||
"-lc",
|
||||
&format!("echo pwned > {}", gitdir_config.to_string_lossy()),
|
||||
],
|
||||
&[repo_root.to_path_buf()],
|
||||
LONG_TIMEOUT_MS,
|
||||
)
|
||||
.await;
|
||||
|
||||
assert_write_blocked(
|
||||
&[
|
||||
"bash",
|
||||
"-lc",
|
||||
&format!("echo pwned > {}", repo_root.join(".git").to_string_lossy()),
|
||||
],
|
||||
&[repo_root.to_path_buf()],
|
||||
LONG_TIMEOUT_MS,
|
||||
)
|
||||
.await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[should_panic(expected = "Sandbox(Timeout")]
|
||||
async fn test_timeout() {
|
||||
|
||||
Reference in New Issue
Block a user