mirror of
https://github.com/openai/codex.git
synced 2026-05-17 09:43:19 +00:00
## Why Windows sandboxed commands run as a sandbox user, while workspace repositories are usually owned by the real user. The sandbox compensates by injecting a temporary Git `safe.directory` entry into the child environment. That injection was still broken for linked worktrees because the helper followed the `.git` file's `gitdir:` pointer and injected the internal `.git/worktrees/...` location. Git's dubious-ownership check expects the worktree root instead, so sandboxed Git commands still failed in worktree-based Codex checkouts. ## What changed - Treat any `.git` marker, directory or file, as the worktree root for `safe.directory` injection. - Keep the safe-directory logic in `windows-sandbox-rs/src/sandbox_utils.rs` and have the one-shot elevated path reuse it. - Add regression coverage for both normal `.git` directories and gitfile-based worktrees. ## Validation - `cargo test -p codex-windows-sandbox sandbox_utils::tests` - `cargo test -p codex-windows-sandbox` built and ran; the new `sandbox_utils` tests passed, while two pre-existing legacy sandbox tests failed locally with `Access is denied`: `session::tests::legacy_non_tty_cmd_emits_output` and `spawn_prep::tests::legacy_spawn_env_applies_offline_network_rewrite`.
249 lines
8.7 KiB
Rust
249 lines
8.7 KiB
Rust
use std::collections::HashMap;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
|
|
pub struct ElevatedSandboxCaptureRequest<'a> {
|
|
pub policy_json_or_preset: &'a str,
|
|
pub sandbox_policy_cwd: &'a Path,
|
|
pub codex_home: &'a Path,
|
|
pub command: Vec<String>,
|
|
pub cwd: &'a Path,
|
|
pub env_map: HashMap<String, String>,
|
|
pub timeout_ms: Option<u64>,
|
|
pub use_private_desktop: bool,
|
|
pub proxy_enforced: bool,
|
|
pub read_roots_override: Option<&'a [PathBuf]>,
|
|
pub read_roots_include_platform_defaults: bool,
|
|
pub write_roots_override: Option<&'a [PathBuf]>,
|
|
pub deny_write_paths_override: &'a [PathBuf],
|
|
}
|
|
|
|
mod windows_impl {
|
|
use super::ElevatedSandboxCaptureRequest;
|
|
use crate::acl::allow_null_device;
|
|
use crate::cap::load_or_create_cap_sids;
|
|
use crate::env::ensure_non_interactive_pager;
|
|
use crate::env::inherit_path_env;
|
|
use crate::env::normalize_null_device_env;
|
|
use crate::identity::require_logon_sandbox_creds;
|
|
use crate::ipc_framed::Message;
|
|
use crate::ipc_framed::OutputStream;
|
|
use crate::ipc_framed::SpawnRequest;
|
|
use crate::ipc_framed::decode_bytes;
|
|
use crate::ipc_framed::read_frame;
|
|
use crate::logging::log_failure;
|
|
use crate::logging::log_start;
|
|
use crate::logging::log_success;
|
|
use crate::policy::SandboxPolicy;
|
|
use crate::policy::parse_policy;
|
|
use crate::runner_client::spawn_runner_transport;
|
|
use crate::sandbox_utils::ensure_codex_home_exists;
|
|
use crate::sandbox_utils::inject_git_safe_directory;
|
|
use crate::token::convert_string_sid_to_sid;
|
|
use anyhow::Result;
|
|
use std::path::Path;
|
|
|
|
pub use crate::windows_impl::CaptureResult;
|
|
|
|
/// Launches the command runner under the sandbox user and captures its output.
|
|
#[allow(clippy::too_many_arguments)]
|
|
pub fn run_windows_sandbox_capture(
|
|
request: ElevatedSandboxCaptureRequest<'_>,
|
|
) -> Result<CaptureResult> {
|
|
let ElevatedSandboxCaptureRequest {
|
|
policy_json_or_preset,
|
|
sandbox_policy_cwd,
|
|
codex_home,
|
|
command,
|
|
cwd,
|
|
mut env_map,
|
|
timeout_ms,
|
|
use_private_desktop,
|
|
proxy_enforced,
|
|
read_roots_override,
|
|
read_roots_include_platform_defaults,
|
|
write_roots_override,
|
|
deny_write_paths_override,
|
|
} = request;
|
|
let policy = parse_policy(policy_json_or_preset)?;
|
|
normalize_null_device_env(&mut env_map);
|
|
ensure_non_interactive_pager(&mut env_map);
|
|
inherit_path_env(&mut env_map);
|
|
inject_git_safe_directory(&mut env_map, cwd);
|
|
// Use a temp-based log dir that the sandbox user can write.
|
|
let sandbox_base = codex_home.join(".sandbox");
|
|
ensure_codex_home_exists(&sandbox_base)?;
|
|
|
|
let logs_base_dir: Option<&Path> = Some(sandbox_base.as_path());
|
|
log_start(&command, logs_base_dir);
|
|
let sandbox_creds = require_logon_sandbox_creds(
|
|
&policy,
|
|
sandbox_policy_cwd,
|
|
cwd,
|
|
&env_map,
|
|
codex_home,
|
|
read_roots_override,
|
|
read_roots_include_platform_defaults,
|
|
write_roots_override,
|
|
deny_write_paths_override,
|
|
proxy_enforced,
|
|
)?;
|
|
// Build capability SID for ACL grants.
|
|
if matches!(
|
|
&policy,
|
|
SandboxPolicy::DangerFullAccess | SandboxPolicy::ExternalSandbox { .. }
|
|
) {
|
|
anyhow::bail!("DangerFullAccess and ExternalSandbox are not supported for sandboxing")
|
|
}
|
|
let caps = load_or_create_cap_sids(codex_home)?;
|
|
let (psid_to_use, cap_sids) = match &policy {
|
|
SandboxPolicy::ReadOnly { .. } => {
|
|
#[allow(clippy::unwrap_used)]
|
|
let psid = unsafe { convert_string_sid_to_sid(&caps.readonly).unwrap() };
|
|
(psid, vec![caps.readonly])
|
|
}
|
|
SandboxPolicy::WorkspaceWrite { .. } => {
|
|
#[allow(clippy::unwrap_used)]
|
|
let psid = unsafe { convert_string_sid_to_sid(&caps.workspace).unwrap() };
|
|
(
|
|
psid,
|
|
vec![
|
|
caps.workspace,
|
|
crate::cap::workspace_cap_sid_for_cwd(codex_home, cwd)?,
|
|
],
|
|
)
|
|
}
|
|
SandboxPolicy::DangerFullAccess | SandboxPolicy::ExternalSandbox { .. } => {
|
|
unreachable!("DangerFullAccess handled above")
|
|
}
|
|
};
|
|
|
|
unsafe {
|
|
allow_null_device(psid_to_use);
|
|
}
|
|
|
|
(|| -> Result<CaptureResult> {
|
|
let spawn_request = SpawnRequest {
|
|
command: command.clone(),
|
|
cwd: cwd.to_path_buf(),
|
|
env: env_map.clone(),
|
|
policy_json_or_preset: policy_json_or_preset.to_string(),
|
|
sandbox_policy_cwd: sandbox_policy_cwd.to_path_buf(),
|
|
codex_home: sandbox_base.clone(),
|
|
real_codex_home: codex_home.to_path_buf(),
|
|
cap_sids,
|
|
timeout_ms,
|
|
tty: false,
|
|
stdin_open: false,
|
|
use_private_desktop,
|
|
};
|
|
let transport = spawn_runner_transport(
|
|
codex_home,
|
|
cwd,
|
|
&sandbox_creds,
|
|
logs_base_dir,
|
|
spawn_request,
|
|
)?;
|
|
let (pipe_write, mut pipe_read) = transport.into_files();
|
|
drop(pipe_write);
|
|
|
|
let mut stdout = Vec::new();
|
|
let mut stderr = Vec::new();
|
|
let (exit_code, timed_out) = loop {
|
|
let msg = read_frame(&mut pipe_read)?
|
|
.ok_or_else(|| anyhow::anyhow!("runner pipe closed before exit"))?;
|
|
match msg.message {
|
|
Message::SpawnReady { .. } => {}
|
|
Message::Output { payload } => {
|
|
let bytes = decode_bytes(&payload.data_b64)?;
|
|
match payload.stream {
|
|
OutputStream::Stdout => stdout.extend_from_slice(&bytes),
|
|
OutputStream::Stderr => stderr.extend_from_slice(&bytes),
|
|
}
|
|
}
|
|
Message::Exit { payload } => break (payload.exit_code, payload.timed_out),
|
|
Message::Error { payload } => {
|
|
return Err(anyhow::anyhow!("runner error: {}", payload.message));
|
|
}
|
|
other => {
|
|
return Err(anyhow::anyhow!(
|
|
"unexpected runner message during capture: {other:?}"
|
|
));
|
|
}
|
|
}
|
|
};
|
|
|
|
if exit_code == 0 {
|
|
log_success(&command, logs_base_dir);
|
|
} else {
|
|
log_failure(&command, &format!("exit code {exit_code}"), logs_base_dir);
|
|
}
|
|
|
|
Ok(CaptureResult {
|
|
exit_code,
|
|
stdout,
|
|
stderr,
|
|
timed_out,
|
|
})
|
|
})()
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::policy::SandboxPolicy;
|
|
|
|
fn workspace_policy(network_access: bool) -> SandboxPolicy {
|
|
SandboxPolicy::WorkspaceWrite {
|
|
writable_roots: Vec::new(),
|
|
network_access,
|
|
exclude_tmpdir_env_var: false,
|
|
exclude_slash_tmp: false,
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn applies_network_block_when_access_is_disabled() {
|
|
assert!(!workspace_policy(/*network_access*/ false).has_full_network_access());
|
|
}
|
|
|
|
#[test]
|
|
fn skips_network_block_when_access_is_allowed() {
|
|
assert!(workspace_policy(/*network_access*/ true).has_full_network_access());
|
|
}
|
|
|
|
#[test]
|
|
fn applies_network_block_for_read_only() {
|
|
assert!(!SandboxPolicy::new_read_only_policy().has_full_network_access());
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(target_os = "windows")]
|
|
pub use windows_impl::run_windows_sandbox_capture;
|
|
|
|
#[cfg(not(target_os = "windows"))]
|
|
mod stub {
|
|
use super::ElevatedSandboxCaptureRequest;
|
|
use anyhow::Result;
|
|
use anyhow::bail;
|
|
|
|
#[derive(Debug, Default)]
|
|
pub struct CaptureResult {
|
|
pub exit_code: i32,
|
|
pub stdout: Vec<u8>,
|
|
pub stderr: Vec<u8>,
|
|
pub timed_out: bool,
|
|
}
|
|
|
|
/// Stub implementation for non-Windows targets; sandboxing only works on Windows.
|
|
#[allow(clippy::too_many_arguments)]
|
|
pub fn run_windows_sandbox_capture(
|
|
_request: ElevatedSandboxCaptureRequest<'_>,
|
|
) -> Result<CaptureResult> {
|
|
bail!("Windows sandbox is only available on Windows")
|
|
}
|
|
}
|
|
|
|
#[cfg(not(target_os = "windows"))]
|
|
pub use stub::run_windows_sandbox_capture;
|