mirror of
https://github.com/openai/codex.git
synced 2026-11-10 21:00:47 +00:00
Normalize mapped-drive cwd in legacy sandbox entrypoints
This commit is contained in:
@@ -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, ¤t_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, ¤t_dir, env_map);
|
||||
let canonical_cwd = canonicalize_path(¤t_dir);
|
||||
|
||||
Reference in New Issue
Block a user