openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-09 15:58:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve real-user write ACLs in Windows sandbox

Browse Source
This commit is contained in:
David Wiesen
2026-04-09 08:55:11 -07:00
parent 598d6ff056
commit 0d1e6bf00a
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
codex-rs/windows-sandbox-rs/src/setup_main_win.rs
View File

@@ -638,6 +638,22 @@ fn run_setup_full(payload: &Payload, log: &mut File, sbx_dir: &Path) -> Result<(
let cap_sid_str = caps.workspace;
let sandbox_group_sid_str =
string_from_sid_bytes(&sandbox_group_sid).map_err(anyhow::Error::msg)?;
let real_user_sid = resolve_sid(&payload.real_user).map_err(|err| {
anyhow::Error::new(SetupFailure::new(
SetupErrorCode::HelperSidResolveFailed,
format!(
"resolve SID for real user {} failed: {err}",
payload.real_user
),
))
})?;
let real_user_psid = sid_bytes_to_psid(&real_user_sid).map_err(|err| {
anyhow::Error::new(SetupFailure::new(
SetupErrorCode::HelperSidResolveFailed,
format!("convert real user SID to PSID failed: {err}"),
))
})?;
let real_user_sid_str = string_from_sid_bytes(&real_user_sid).map_err(anyhow::Error::msg)?;
let write_mask =
FILE_GENERIC_READ | FILE_GENERIC_WRITE | FILE_GENERIC_EXECUTE | DELETE | FILE_DELETE_CHILD;
let mut grant_tasks: Vec<PathBuf> = Vec::new();
@@ -671,6 +687,7 @@ fn run_setup_full(payload: &Payload, log: &mut File, sbx_dir: &Path) -> Result<(
for (label, psid) in [
("sandbox_group", sandbox_group_psid),
(cap_label, cap_psid_for_root),
("real_user", real_user_psid),
] {
let has =
match path_mask_allows(root, &[psid], write_mask, /*require_all_bits*/ true) {
@@ -700,7 +717,7 @@ fn run_setup_full(payload: &Payload, log: &mut File, sbx_dir: &Path) -> Result<(
log_line(
log,
&format!(
"granting write ACE to {} for sandbox group and capability SID",
"granting write ACE to {} for sandbox group, capability SID, and real user",
root.display()
),
)?;
@@ -713,9 +730,17 @@ fn run_setup_full(payload: &Payload, log: &mut File, sbx_dir: &Path) -> Result<(
for root in grant_tasks {
let is_command_cwd = is_command_cwd_root(&root, &canonical_command_cwd);
let sid_strings = if is_command_cwd {
vec![sandbox_group_sid_str.clone(), workspace_sid_str.clone()]
vec![
sandbox_group_sid_str.clone(),
workspace_sid_str.clone(),
real_user_sid_str.clone(),
]
} else {
vec![sandbox_group_sid_str.clone(), cap_sid_str.clone()]
vec![
sandbox_group_sid_str.clone(),
cap_sid_str.clone(),
real_user_sid_str.clone(),
]
};
let tx = tx.clone();
scope.spawn(move || {