mirror of
https://github.com/openai/codex.git
synced 2026-09-07 15:40:00 +00:00
Merge 3c80d7da71 into sapling-pr-archive-bolinfest
This commit is contained in:
@@ -29,6 +29,14 @@ use crate::rpc::internal_error;
|
||||
use crate::rpc::invalid_request;
|
||||
|
||||
const FS_HELPER_ENV_ALLOWLIST: &[&str] = &["PATH", "TMPDIR", "TMP", "TEMP"];
|
||||
const FS_HELPER_BAZEL_BWRAP_ENV_ALLOWLIST: &[&str] = &[
|
||||
"CARGO_BIN_EXE_bwrap",
|
||||
"RUNFILES_DIR",
|
||||
"RUNFILES_MANIFEST_FILE",
|
||||
"RUNFILES_MANIFEST_ONLY",
|
||||
"TEST_SRCDIR",
|
||||
"TEST_WORKSPACE",
|
||||
];
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub(crate) struct FileSystemSandboxRunner {
|
||||
@@ -220,7 +228,10 @@ fn helper_env_from_vars(
|
||||
}
|
||||
|
||||
fn helper_env_key_is_allowed(key: &str) -> bool {
|
||||
FS_HELPER_ENV_ALLOWLIST.contains(&key) || (cfg!(windows) && key.eq_ignore_ascii_case("PATH"))
|
||||
FS_HELPER_ENV_ALLOWLIST.contains(&key)
|
||||
|| (option_env!("BAZEL_PACKAGE").is_some()
|
||||
&& FS_HELPER_BAZEL_BWRAP_ENV_ALLOWLIST.contains(&key))
|
||||
|| (cfg!(windows) && key.eq_ignore_ascii_case("PATH"))
|
||||
}
|
||||
|
||||
async fn run_command(
|
||||
|
||||
Reference in New Issue
Block a user