Normalize mapped-drive cwd in legacy sandbox entrypoints

This commit is contained in:
David Wiesen
2026-04-25 20:43:50 -07:00
parent 6d4c2ae753
commit 73d8c18fd5
+4 -3
View File
@@ -378,7 +378,8 @@ mod windows_impl {
#[allow(clippy::expect_used)]
let psid_generic =
convert_string_sid_to_sid(&caps.workspace).expect("valid workspace SID");
let ws_sid = workspace_cap_sid_for_cwd(codex_home, cwd)?;
let normalized_cwd = super::path_normalization::normalize_command_cwd(cwd);
let ws_sid = workspace_cap_sid_for_cwd(codex_home, &normalized_cwd)?;
#[allow(clippy::expect_used)]
let psid_workspace =
convert_string_sid_to_sid(&ws_sid).expect("valid workspace SID");
@@ -607,11 +608,11 @@ mod windows_impl {
#[allow(clippy::expect_used)]
let psid_generic =
unsafe { convert_string_sid_to_sid(&caps.workspace) }.expect("valid workspace SID");
let ws_sid = workspace_cap_sid_for_cwd(codex_home, cwd)?;
let current_dir = super::path_normalization::normalize_command_cwd(cwd);
let ws_sid = workspace_cap_sid_for_cwd(codex_home, &current_dir)?;
#[allow(clippy::expect_used)]
let psid_workspace =
unsafe { convert_string_sid_to_sid(&ws_sid) }.expect("valid workspace SID");
let current_dir = cwd.to_path_buf();
let AllowDenyPaths { allow, deny } =
compute_allow_paths(sandbox_policy, sandbox_policy_cwd, &current_dir, env_map);
let canonical_cwd = canonicalize_path(&current_dir);