mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
iceweasel-oaiandGitHub
fbbe7706d6
## Why This is the second PR in the Windows fs-helper sandbox stack. The fs-helper path needs a Windows sandbox launcher that has the same argv-shaped contract as macOS `sandbox-exec` and `codex-linux-sandbox`, but this PR only introduces that hidden launcher. It does not route fs-helper through it yet. The hidden launcher still needs to be policy-complete before later direct-spawn callers use it. In particular, it has to carry the same Windows sandbox policy details that the existing spawn paths already understand: proxy enforcement, read/write root overrides, and deny-read/deny-write overrides. ## What Changed - Added the hidden `codex.exe --run-as-windows-sandbox` arg1 dispatch path. - Added `windows-sandbox-rs/src/wrapper.rs`, which parses the wrapper argv, launches the requested command through the shared Windows sandbox session runner from PR1, and forwards stdio. - Added `create_windows_sandbox_command_args_for_permission_profile()` so later direct-spawn callers can build the wrapper argv consistently. - Made the wrapper argv round-trip the full Windows sandbox policy surface it needs later: workspace roots, environment, permission profile, sandbox level, private desktop, proxy enforcement, read/write root overrides, and deny-read/deny-write overrides. - Carried `proxy_enforced` through the shared Windows session request so proxy-managed executions continue to use the offline/elevated sandbox identity. - Added wrapper argument round-trip coverage for the full policy fields. ## Verification - `just test -p codex-windows-sandbox windows_wrapper_args_round_trip` - `just test -p codex-arg0` - `just test -p codex-core exec::tests::windows_` - `just fix -p codex-windows-sandbox -p codex-core -p codex-cli` Local note: the full `just fmt` command still fails on this workstation in non-Rust formatter setup (`uv` cache access denied and missing `dotslash`/buildifier), but the Rust formatter phase completed.
107 lines
4.4 KiB
Rust
107 lines
4.4 KiB
Rust
use std::collections::HashMap;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
|
|
use codex_protocol::config_types::WindowsSandboxLevel;
|
|
use codex_protocol::models::PermissionProfile;
|
|
use codex_protocol::permissions::NetworkSandboxPolicy;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
use super::CODEX_HOME_FLAG;
|
|
use super::CODEX_WINDOWS_SANDBOX_ARG1;
|
|
use super::COMMAND_CWD_FLAG;
|
|
use super::DENY_READ_PATHS_JSON_FLAG;
|
|
use super::DENY_WRITE_PATHS_JSON_FLAG;
|
|
use super::ENV_JSON_FLAG;
|
|
use super::PERMISSION_PROFILE_FLAG;
|
|
use super::PRIVATE_DESKTOP_FLAG;
|
|
use super::PROXY_ENFORCED_FLAG;
|
|
use super::READ_ROOTS_INCLUDE_PLATFORM_DEFAULTS_FLAG;
|
|
use super::READ_ROOTS_JSON_FLAG;
|
|
use super::SANDBOX_LEVEL_FLAG;
|
|
use super::WORKSPACE_ROOT_FLAG;
|
|
use super::WRITE_ROOTS_JSON_FLAG;
|
|
use super::create_windows_sandbox_command_args_for_permission_profile;
|
|
use super::parse_windows_sandbox_wrapper_args;
|
|
|
|
#[test]
|
|
fn windows_wrapper_args_round_trip() {
|
|
let command_cwd = AbsolutePathBuf::from_absolute_path(Path::new(r"C:\workspace"))
|
|
.expect("absolute command cwd");
|
|
let workspace_roots = vec![
|
|
command_cwd.clone(),
|
|
AbsolutePathBuf::from_absolute_path(Path::new(r"D:\other-workspace"))
|
|
.expect("absolute workspace root"),
|
|
];
|
|
let env = HashMap::from([("Path".to_string(), r"C:\Windows\System32".to_string())]);
|
|
let permission_profile = PermissionProfile::External {
|
|
network: NetworkSandboxPolicy::Restricted,
|
|
};
|
|
let read_roots_override = vec![PathBuf::from(r"C:\read")];
|
|
let write_roots_override = vec![PathBuf::from(r"C:\write")];
|
|
let deny_read_paths_override = vec![
|
|
AbsolutePathBuf::from_absolute_path(Path::new(r"C:\blocked-read"))
|
|
.expect("absolute deny-read"),
|
|
];
|
|
let deny_write_paths_override = vec![
|
|
AbsolutePathBuf::from_absolute_path(Path::new(r"C:\blocked-write"))
|
|
.expect("absolute deny-write"),
|
|
];
|
|
|
|
let args = create_windows_sandbox_command_args_for_permission_profile(
|
|
vec![
|
|
"codex.exe".to_string(),
|
|
"--codex-run-as-fs-helper".to_string(),
|
|
],
|
|
&command_cwd,
|
|
workspace_roots.as_slice(),
|
|
&env,
|
|
&permission_profile,
|
|
WindowsSandboxLevel::Elevated,
|
|
/*windows_sandbox_private_desktop*/ true,
|
|
/*proxy_enforced*/ true,
|
|
Some(read_roots_override.as_slice()),
|
|
/*read_roots_include_platform_defaults*/ true,
|
|
Some(write_roots_override.as_slice()),
|
|
deny_read_paths_override.as_slice(),
|
|
deny_write_paths_override.as_slice(),
|
|
Path::new(r"C:\Users\me\.codex"),
|
|
);
|
|
|
|
assert_eq!(args[0], CODEX_WINDOWS_SANDBOX_ARG1);
|
|
assert!(args.contains(&CODEX_HOME_FLAG.to_string()));
|
|
assert!(args.contains(&COMMAND_CWD_FLAG.to_string()));
|
|
assert!(args.contains(&WORKSPACE_ROOT_FLAG.to_string()));
|
|
assert!(args.contains(&PERMISSION_PROFILE_FLAG.to_string()));
|
|
assert!(args.contains(&ENV_JSON_FLAG.to_string()));
|
|
assert!(args.contains(&SANDBOX_LEVEL_FLAG.to_string()));
|
|
assert!(args.contains(&PRIVATE_DESKTOP_FLAG.to_string()));
|
|
assert!(args.contains(&PROXY_ENFORCED_FLAG.to_string()));
|
|
assert!(args.contains(&READ_ROOTS_JSON_FLAG.to_string()));
|
|
assert!(args.contains(&READ_ROOTS_INCLUDE_PLATFORM_DEFAULTS_FLAG.to_string()));
|
|
assert!(args.contains(&WRITE_ROOTS_JSON_FLAG.to_string()));
|
|
assert!(args.contains(&DENY_READ_PATHS_JSON_FLAG.to_string()));
|
|
assert!(args.contains(&DENY_WRITE_PATHS_JSON_FLAG.to_string()));
|
|
|
|
let parsed =
|
|
parse_windows_sandbox_wrapper_args(args[1..].to_vec()).expect("parse wrapper args");
|
|
|
|
assert_eq!(
|
|
parsed.command,
|
|
vec!["codex.exe", "--codex-run-as-fs-helper"]
|
|
);
|
|
assert_eq!(parsed.command_cwd, command_cwd);
|
|
assert_eq!(parsed.workspace_roots, workspace_roots);
|
|
assert_eq!(parsed.env_map, env);
|
|
assert_eq!(parsed.permission_profile, permission_profile);
|
|
assert_eq!(parsed.windows_sandbox_level, WindowsSandboxLevel::Elevated);
|
|
assert_eq!(parsed.windows_sandbox_private_desktop, true);
|
|
assert_eq!(parsed.proxy_enforced, true);
|
|
assert_eq!(parsed.read_roots_override, Some(read_roots_override));
|
|
assert_eq!(parsed.read_roots_include_platform_defaults, true);
|
|
assert_eq!(parsed.write_roots_override, Some(write_roots_override));
|
|
assert_eq!(parsed.deny_read_paths_override, deny_read_paths_override);
|
|
assert_eq!(parsed.deny_write_paths_override, deny_write_paths_override);
|
|
}
|