mirror of
https://github.com/openai/codex.git
synced 2026-11-19 22:30:42 +00:00
Clean up Windows fs helper tests
This commit is contained in:
@@ -157,197 +157,5 @@ impl Drop for WindowsSandboxWrapperRequestFile {
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::collections::HashMap;
|
||||
use std::ffi::OsString;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use codex_protocol::config_types::WindowsSandboxLevel;
|
||||
use codex_protocol::models::PermissionProfile;
|
||||
use codex_protocol::permissions::FileSystemSandboxPolicy;
|
||||
use codex_protocol::permissions::NetworkSandboxPolicy;
|
||||
use codex_sandboxing::SandboxExecRequest;
|
||||
use codex_sandboxing::SandboxType;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
use pretty_assertions::assert_eq;
|
||||
|
||||
use super::WindowsSandboxWrapperRequestFile;
|
||||
use super::add_wrapper_setup_env_from_vars;
|
||||
use super::materialize_sandboxed_helper;
|
||||
use super::wrapper_request_dir;
|
||||
|
||||
struct EnvVarGuard {
|
||||
key: &'static str,
|
||||
original: Option<OsString>,
|
||||
}
|
||||
|
||||
impl EnvVarGuard {
|
||||
fn set(key: &'static str, value: &std::ffi::OsStr) -> Self {
|
||||
let original = std::env::var_os(key);
|
||||
unsafe {
|
||||
std::env::set_var(key, value);
|
||||
}
|
||||
Self { key, original }
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for EnvVarGuard {
|
||||
fn drop(&mut self) {
|
||||
unsafe {
|
||||
match &self.original {
|
||||
Some(value) => std::env::set_var(self.key, value),
|
||||
None => std::env::remove_var(self.key),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapper_setup_env_preserves_only_setup_identity() {
|
||||
let mut env = HashMap::from([("PATH".to_string(), r"C:\Windows\System32".to_string())]);
|
||||
|
||||
add_wrapper_setup_env_from_vars(
|
||||
&mut env,
|
||||
[
|
||||
("USERNAME", "alice"),
|
||||
("USERPROFILE", r"C:\Users\alice"),
|
||||
("OPENAI_API_KEY", "secret"),
|
||||
]
|
||||
.map(|(key, value)| (OsString::from(key), OsString::from(value))),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
env,
|
||||
HashMap::from([
|
||||
("PATH".to_string(), r"C:\Windows\System32".to_string()),
|
||||
("USERNAME".to_string(), "alice".to_string()),
|
||||
("USERPROFILE".to_string(), r"C:\Users\alice".to_string()),
|
||||
])
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapper_request_dir_uses_sandbox_secrets() {
|
||||
let codex_home = std::env::temp_dir().join("codex-home");
|
||||
let sandbox_dir = codex_windows_sandbox::sandbox_dir(&codex_home);
|
||||
let secrets_dir = codex_windows_sandbox::sandbox_secrets_dir(&codex_home);
|
||||
let request_dir = wrapper_request_dir(&codex_home);
|
||||
|
||||
assert!(!request_dir.starts_with(sandbox_dir));
|
||||
assert!(request_dir.starts_with(secrets_dir));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapper_request_file_is_removed_on_drop() {
|
||||
let codex_home = tempfile::TempDir::new().expect("codex home");
|
||||
let command_cwd =
|
||||
AbsolutePathBuf::from_absolute_path(codex_home.path()).expect("absolute command cwd");
|
||||
let request =
|
||||
codex_windows_sandbox::create_windows_sandbox_wrapper_request_for_permission_profile(
|
||||
vec!["helper.exe".to_string()],
|
||||
command_cwd,
|
||||
HashMap::new(),
|
||||
PermissionProfile::External {
|
||||
network: NetworkSandboxPolicy::Restricted,
|
||||
},
|
||||
WindowsSandboxLevel::RestrictedToken,
|
||||
/*windows_sandbox_private_desktop*/ false,
|
||||
codex_home.path().to_path_buf(),
|
||||
);
|
||||
|
||||
let request_file = WindowsSandboxWrapperRequestFile::create(codex_home.path(), &request)
|
||||
.expect("create wrapper request file");
|
||||
let path = request_file.path.clone();
|
||||
assert!(path.exists());
|
||||
|
||||
drop(request_file);
|
||||
|
||||
assert!(!path.exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn materialized_helper_rewrites_inner_command_path() {
|
||||
let codex_home = tempfile::TempDir::new().expect("codex home");
|
||||
let _guard = EnvVarGuard::set("CODEX_HOME", codex_home.path().as_os_str());
|
||||
let helper_dir = tempfile::TempDir::new().expect("helper dir");
|
||||
let configured_helper = helper_dir.path().join("configured-codex-helper.exe");
|
||||
std::fs::write(&configured_helper, b"helper").expect("write configured helper");
|
||||
let configured_helper =
|
||||
AbsolutePathBuf::from_absolute_path(&configured_helper).expect("absolute helper");
|
||||
let cwd = AbsolutePathBuf::from_absolute_path(helper_dir.path()).expect("absolute cwd");
|
||||
let file_system_sandbox_policy = FileSystemSandboxPolicy::read_only();
|
||||
let mut request = SandboxExecRequest {
|
||||
command: vec![
|
||||
configured_helper.as_path().display().to_string(),
|
||||
"--codex-run-as-fs-helper".to_string(),
|
||||
],
|
||||
cwd,
|
||||
env: HashMap::new(),
|
||||
network: None,
|
||||
sandbox: SandboxType::WindowsRestrictedToken,
|
||||
windows_sandbox_level: WindowsSandboxLevel::RestrictedToken,
|
||||
windows_sandbox_private_desktop: false,
|
||||
permission_profile: PermissionProfile::read_only(),
|
||||
file_system_sandbox_policy,
|
||||
network_sandbox_policy: NetworkSandboxPolicy::Restricted,
|
||||
arg0: None,
|
||||
};
|
||||
|
||||
materialize_sandboxed_helper(&mut request, &configured_helper)
|
||||
.expect("materialize sandboxed helper");
|
||||
|
||||
let materialized_helper = PathBuf::from(&request.command[0]);
|
||||
assert_eq!(
|
||||
materialized_helper.file_name(),
|
||||
configured_helper.as_path().file_name()
|
||||
);
|
||||
assert_eq!(
|
||||
materialized_helper
|
||||
.parent()
|
||||
.and_then(std::path::Path::file_name),
|
||||
Some(std::ffi::OsStr::new(".sandbox-bin"))
|
||||
);
|
||||
assert!(materialized_helper.exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapper_request_preserves_elevated_level() {
|
||||
let codex_home = tempfile::TempDir::new().expect("codex home");
|
||||
let _guard = EnvVarGuard::set("CODEX_HOME", codex_home.path().as_os_str());
|
||||
let command_cwd =
|
||||
AbsolutePathBuf::from_absolute_path(codex_home.path()).expect("absolute command cwd");
|
||||
let file_system_sandbox_policy = FileSystemSandboxPolicy::read_only();
|
||||
let mut request = SandboxExecRequest {
|
||||
command: vec![
|
||||
"helper.exe".to_string(),
|
||||
"--codex-run-as-fs-helper".to_string(),
|
||||
],
|
||||
cwd: command_cwd,
|
||||
env: HashMap::new(),
|
||||
network: None,
|
||||
sandbox: SandboxType::WindowsRestrictedToken,
|
||||
windows_sandbox_level: WindowsSandboxLevel::Elevated,
|
||||
windows_sandbox_private_desktop: true,
|
||||
permission_profile: PermissionProfile::read_only(),
|
||||
file_system_sandbox_policy,
|
||||
network_sandbox_policy: NetworkSandboxPolicy::Restricted,
|
||||
arg0: None,
|
||||
};
|
||||
let wrapper = AbsolutePathBuf::from_absolute_path(codex_home.path().join("codex.exe"))
|
||||
.expect("absolute wrapper");
|
||||
|
||||
let request_file = super::wrap_sandbox_exec_request(&mut request, &wrapper)
|
||||
.expect("wrap sandbox exec request");
|
||||
let wrapper_request: codex_windows_sandbox::WindowsSandboxWrapperRequest =
|
||||
serde_json::from_slice(
|
||||
&std::fs::read(&request_file.path).expect("read wrapper request"),
|
||||
)
|
||||
.expect("decode wrapper request");
|
||||
|
||||
assert_eq!(
|
||||
wrapper_request.windows_sandbox_level,
|
||||
WindowsSandboxLevel::Elevated
|
||||
);
|
||||
assert_eq!(wrapper_request.windows_sandbox_private_desktop, true);
|
||||
}
|
||||
}
|
||||
#[path = "fs_sandbox_windows_tests.rs"]
|
||||
mod tests;
|
||||
|
||||
@@ -0,0 +1,193 @@
|
||||
use std::collections::HashMap;
|
||||
use std::ffi::OsString;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use codex_protocol::config_types::WindowsSandboxLevel;
|
||||
use codex_protocol::models::PermissionProfile;
|
||||
use codex_protocol::permissions::FileSystemSandboxPolicy;
|
||||
use codex_protocol::permissions::NetworkSandboxPolicy;
|
||||
use codex_sandboxing::SandboxExecRequest;
|
||||
use codex_sandboxing::SandboxType;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
use pretty_assertions::assert_eq;
|
||||
use serial_test::serial;
|
||||
|
||||
use super::WindowsSandboxWrapperRequestFile;
|
||||
use super::add_wrapper_setup_env_from_vars;
|
||||
use super::materialize_sandboxed_helper;
|
||||
use super::wrapper_request_dir;
|
||||
|
||||
struct EnvVarGuard {
|
||||
key: &'static str,
|
||||
original: Option<OsString>,
|
||||
}
|
||||
|
||||
impl EnvVarGuard {
|
||||
fn set(key: &'static str, value: &std::ffi::OsStr) -> Self {
|
||||
let original = std::env::var_os(key);
|
||||
unsafe {
|
||||
std::env::set_var(key, value);
|
||||
}
|
||||
Self { key, original }
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for EnvVarGuard {
|
||||
fn drop(&mut self) {
|
||||
unsafe {
|
||||
match &self.original {
|
||||
Some(value) => std::env::set_var(self.key, value),
|
||||
None => std::env::remove_var(self.key),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapper_setup_env_preserves_only_setup_identity() {
|
||||
let mut env = HashMap::from([("PATH".to_string(), r"C:\Windows\System32".to_string())]);
|
||||
|
||||
add_wrapper_setup_env_from_vars(
|
||||
&mut env,
|
||||
[
|
||||
("USERNAME", "alice"),
|
||||
("USERPROFILE", r"C:\Users\alice"),
|
||||
("OPENAI_API_KEY", "secret"),
|
||||
]
|
||||
.map(|(key, value)| (OsString::from(key), OsString::from(value))),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
env,
|
||||
HashMap::from([
|
||||
("PATH".to_string(), r"C:\Windows\System32".to_string()),
|
||||
("USERNAME".to_string(), "alice".to_string()),
|
||||
("USERPROFILE".to_string(), r"C:\Users\alice".to_string()),
|
||||
])
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapper_request_dir_uses_sandbox_secrets() {
|
||||
let codex_home = std::env::temp_dir().join("codex-home");
|
||||
let sandbox_dir = codex_windows_sandbox::sandbox_dir(&codex_home);
|
||||
let secrets_dir = codex_windows_sandbox::sandbox_secrets_dir(&codex_home);
|
||||
let request_dir = wrapper_request_dir(&codex_home);
|
||||
|
||||
assert!(!request_dir.starts_with(sandbox_dir));
|
||||
assert!(request_dir.starts_with(secrets_dir));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapper_request_file_is_removed_on_drop() {
|
||||
let codex_home = tempfile::TempDir::new().expect("codex home");
|
||||
let command_cwd =
|
||||
AbsolutePathBuf::from_absolute_path(codex_home.path()).expect("absolute command cwd");
|
||||
let request =
|
||||
codex_windows_sandbox::create_windows_sandbox_wrapper_request_for_permission_profile(
|
||||
vec!["helper.exe".to_string()],
|
||||
command_cwd,
|
||||
HashMap::new(),
|
||||
PermissionProfile::External {
|
||||
network: NetworkSandboxPolicy::Restricted,
|
||||
},
|
||||
WindowsSandboxLevel::RestrictedToken,
|
||||
/*windows_sandbox_private_desktop*/ false,
|
||||
codex_home.path().to_path_buf(),
|
||||
);
|
||||
|
||||
let request_file = WindowsSandboxWrapperRequestFile::create(codex_home.path(), &request)
|
||||
.expect("create wrapper request file");
|
||||
let path = request_file.path.clone();
|
||||
assert!(path.exists());
|
||||
|
||||
drop(request_file);
|
||||
|
||||
assert!(!path.exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[serial(codex_home)]
|
||||
fn materialized_helper_rewrites_inner_command_path() {
|
||||
let codex_home = tempfile::TempDir::new().expect("codex home");
|
||||
let _guard = EnvVarGuard::set("CODEX_HOME", codex_home.path().as_os_str());
|
||||
let helper_dir = tempfile::TempDir::new().expect("helper dir");
|
||||
let configured_helper = helper_dir.path().join("configured-codex-helper.exe");
|
||||
std::fs::write(&configured_helper, b"helper").expect("write configured helper");
|
||||
let configured_helper =
|
||||
AbsolutePathBuf::from_absolute_path(&configured_helper).expect("absolute helper");
|
||||
let cwd = AbsolutePathBuf::from_absolute_path(helper_dir.path()).expect("absolute cwd");
|
||||
let file_system_sandbox_policy = FileSystemSandboxPolicy::read_only();
|
||||
let mut request = SandboxExecRequest {
|
||||
command: vec![
|
||||
configured_helper.as_path().display().to_string(),
|
||||
"--codex-run-as-fs-helper".to_string(),
|
||||
],
|
||||
cwd,
|
||||
env: HashMap::new(),
|
||||
network: None,
|
||||
sandbox: SandboxType::WindowsRestrictedToken,
|
||||
windows_sandbox_level: WindowsSandboxLevel::RestrictedToken,
|
||||
windows_sandbox_private_desktop: false,
|
||||
permission_profile: PermissionProfile::read_only(),
|
||||
file_system_sandbox_policy,
|
||||
network_sandbox_policy: NetworkSandboxPolicy::Restricted,
|
||||
arg0: None,
|
||||
};
|
||||
|
||||
materialize_sandboxed_helper(&mut request, &configured_helper)
|
||||
.expect("materialize sandboxed helper");
|
||||
|
||||
let materialized_helper = PathBuf::from(&request.command[0]);
|
||||
assert_eq!(
|
||||
materialized_helper.file_name(),
|
||||
configured_helper.as_path().file_name()
|
||||
);
|
||||
assert_eq!(
|
||||
materialized_helper
|
||||
.parent()
|
||||
.and_then(std::path::Path::file_name),
|
||||
Some(std::ffi::OsStr::new(".sandbox-bin"))
|
||||
);
|
||||
assert!(materialized_helper.exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[serial(codex_home)]
|
||||
fn wrapper_request_preserves_elevated_level() {
|
||||
let codex_home = tempfile::TempDir::new().expect("codex home");
|
||||
let _guard = EnvVarGuard::set("CODEX_HOME", codex_home.path().as_os_str());
|
||||
let command_cwd =
|
||||
AbsolutePathBuf::from_absolute_path(codex_home.path()).expect("absolute command cwd");
|
||||
let file_system_sandbox_policy = FileSystemSandboxPolicy::read_only();
|
||||
let mut request = SandboxExecRequest {
|
||||
command: vec![
|
||||
"helper.exe".to_string(),
|
||||
"--codex-run-as-fs-helper".to_string(),
|
||||
],
|
||||
cwd: command_cwd,
|
||||
env: HashMap::new(),
|
||||
network: None,
|
||||
sandbox: SandboxType::WindowsRestrictedToken,
|
||||
windows_sandbox_level: WindowsSandboxLevel::Elevated,
|
||||
windows_sandbox_private_desktop: true,
|
||||
permission_profile: PermissionProfile::read_only(),
|
||||
file_system_sandbox_policy,
|
||||
network_sandbox_policy: NetworkSandboxPolicy::Restricted,
|
||||
arg0: None,
|
||||
};
|
||||
let wrapper = AbsolutePathBuf::from_absolute_path(codex_home.path().join("codex.exe"))
|
||||
.expect("absolute wrapper");
|
||||
|
||||
let request_file = super::wrap_sandbox_exec_request(&mut request, &wrapper)
|
||||
.expect("wrap sandbox exec request");
|
||||
let wrapper_request: codex_windows_sandbox::WindowsSandboxWrapperRequest =
|
||||
serde_json::from_slice(&std::fs::read(&request_file.path).expect("read wrapper request"))
|
||||
.expect("decode wrapper request");
|
||||
|
||||
assert_eq!(
|
||||
wrapper_request.windows_sandbox_level,
|
||||
WindowsSandboxLevel::Elevated
|
||||
);
|
||||
assert_eq!(wrapper_request.windows_sandbox_private_desktop, true);
|
||||
}
|
||||
@@ -75,18 +75,6 @@ fn sandboxed_file_system_with_codex_exe(
|
||||
})
|
||||
}
|
||||
|
||||
fn process_is_elevated() -> bool {
|
||||
let status = std::process::Command::new("powershell.exe")
|
||||
.args([
|
||||
"-NoProfile",
|
||||
"-NonInteractive",
|
||||
"-Command",
|
||||
"$principal = [Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent(); if ($principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) { exit 0 } else { exit 1 }",
|
||||
])
|
||||
.status();
|
||||
status.is_ok_and(|status| status.success())
|
||||
}
|
||||
|
||||
fn stage_windows_sandbox_helpers_next_to_codex_exe(codex_exe: &Path) -> Result<()> {
|
||||
let helper_dir = codex_exe
|
||||
.parent()
|
||||
@@ -302,13 +290,9 @@ async fn elevated_fs_helper_rejects_unenforceable_reopened_writable_descendant()
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||
#[ignore = "requires an elevated Windows test process"]
|
||||
#[serial(codex_home)]
|
||||
async fn elevated_fs_helper_allows_writable_path_when_setup_is_available() -> Result<()> {
|
||||
if !process_is_elevated() {
|
||||
eprintln!("skipping elevated fs-helper write: test process is not elevated");
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let helper_dir = TempDir::new()?;
|
||||
let configured_helper = helper_dir.path().join("codex.exe");
|
||||
std::fs::copy(std::env::current_exe()?, &configured_helper)?;
|
||||
|
||||
Reference in New Issue
Block a user