diff --git a/codex-rs/core/src/apply_patch.rs b/codex-rs/core/src/apply_patch.rs
index 38dc45ec1f..960d8b29a8 100644
--- a/codex-rs/core/src/apply_patch.rs
+++ b/codex-rs/core/src/apply_patch.rs
@@ -6,7 +6,7 @@ use crate::tools::sandboxing::ExecApprovalRequirement;
use codex_apply_patch::ApplyPatchAction;
use codex_apply_patch::ApplyPatchFileChange;
use codex_protocol::protocol::FileChange;
-use codex_protocol::protocol::FileSystemSandboxPolicy;
+use codex_sandboxing::EffectiveFilesystemPermissions;
use std::collections::HashMap;
use std::path::PathBuf;
@@ -32,14 +32,14 @@ pub(crate) struct ApplyPatchRuntimeInvocation {
pub(crate) async fn apply_patch(
turn_context: &TurnContext,
- file_system_sandbox_policy: &FileSystemSandboxPolicy,
+ effective_filesystem_permissions: &EffectiveFilesystemPermissions,
action: ApplyPatchAction,
) -> InternalApplyPatchInvocation {
match assess_patch_safety(
&action,
turn_context.approval_policy.value(),
&turn_context.permission_profile(),
- file_system_sandbox_policy,
+ effective_filesystem_permissions,
&action.cwd,
turn_context.windows_sandbox_level,
) {
diff --git a/codex-rs/core/src/exec.rs b/codex-rs/core/src/exec.rs
index 5cec3b49bb..3f1b8bd02b 100644
--- a/codex-rs/core/src/exec.rs
+++ b/codex-rs/core/src/exec.rs
@@ -39,11 +39,15 @@ use codex_protocol::protocol::EventMsg;
use codex_protocol::protocol::ExecCommandOutputDeltaEvent;
use codex_protocol::protocol::ExecOutputStream;
use codex_protocol::protocol::SandboxPolicy;
+use codex_sandboxing::EffectiveFilesystemPermissions;
+#[cfg(test)]
+use codex_sandboxing::FilesystemPermissionsContext;
use codex_sandboxing::SandboxCommand;
use codex_sandboxing::SandboxManager;
use codex_sandboxing::SandboxTransformRequest;
use codex_sandboxing::SandboxType;
use codex_sandboxing::SandboxablePreference;
+use codex_sandboxing::compatibility_sandbox_policy_for_permission_profile;
use codex_utils_absolute_path::AbsolutePathBuf;
use codex_utils_pty::DEFAULT_OUTPUT_BYTES_CAP;
use codex_utils_pty::process_group::kill_child_process_group;
@@ -371,7 +375,7 @@ pub fn build_exec_request(
expiration,
capture_policy,
};
- let mut exec_req = manager
+ let request = manager
.transform(SandboxTransformRequest {
command,
permissions: permission_profile,
@@ -384,37 +388,44 @@ pub fn build_exec_request(
windows_sandbox_level,
windows_sandbox_private_desktop,
})
- .map(|request| {
- let windows_sandbox_policy_cwd = AbsolutePathBuf::try_from(sandbox_cwd.to_path_buf())
- .unwrap_or_else(|_| request.cwd.clone());
- ExecRequest::from_sandbox_exec_request(request, options, windows_sandbox_policy_cwd)
- })
.map_err(CodexErr::from)?;
let use_windows_elevated_backend = windows_sandbox_uses_elevated_backend(
- exec_req.windows_sandbox_level,
- exec_req.network.is_some(),
+ request.windows_sandbox_level,
+ request.network.is_some(),
);
- let sandbox_policy = exec_req.compatibility_sandbox_policy();
- exec_req.windows_sandbox_filesystem_overrides = if use_windows_elevated_backend {
- resolve_windows_elevated_filesystem_overrides(
- exec_req.sandbox,
+ let sandbox_policy = compatibility_sandbox_policy_for_permission_profile(
+ &request.permission_profile,
+ &request.file_system_sandbox_policy,
+ request.network_sandbox_policy,
+ sandbox_cwd.as_path(),
+ );
+ let windows_sandbox_filesystem_overrides = if use_windows_elevated_backend {
+ resolve_windows_elevated_filesystem_overrides_from_effective_permissions(
+ request.sandbox,
&sandbox_policy,
- &exec_req.file_system_sandbox_policy,
- exec_req.network_sandbox_policy,
+ &request.file_system_sandbox_policy,
+ &request.effective_filesystem_permissions,
+ request.network_sandbox_policy,
sandbox_cwd,
use_windows_elevated_backend,
)
} else {
- resolve_windows_restricted_token_filesystem_overrides(
- exec_req.sandbox,
+ resolve_windows_restricted_token_filesystem_overrides_from_effective_permissions(
+ request.sandbox,
&sandbox_policy,
- &exec_req.file_system_sandbox_policy,
- exec_req.network_sandbox_policy,
+ &request.file_system_sandbox_policy,
+ &request.effective_filesystem_permissions,
+ request.network_sandbox_policy,
sandbox_cwd,
- exec_req.windows_sandbox_level,
+ request.windows_sandbox_level,
)
}
.map_err(CodexErr::UnsupportedOperation)?;
+ let windows_sandbox_policy_cwd = AbsolutePathBuf::try_from(sandbox_cwd.to_path_buf())
+ .unwrap_or_else(|_| request.cwd.clone());
+ let mut exec_req =
+ ExecRequest::from_sandbox_exec_request(request, options, windows_sandbox_policy_cwd);
+ exec_req.windows_sandbox_filesystem_overrides = windows_sandbox_filesystem_overrides;
Ok(exec_req)
}
@@ -976,7 +987,7 @@ fn should_use_windows_restricted_token_sandbox(
)
}
-#[cfg_attr(not(test), allow(dead_code))]
+#[cfg(test)]
pub(crate) fn unsupported_windows_restricted_token_sandbox_reason(
sandbox: SandboxType,
sandbox_policy: &SandboxPolicy,
@@ -1008,6 +1019,7 @@ pub(crate) fn unsupported_windows_restricted_token_sandbox_reason(
}
}
+#[cfg(test)]
pub(crate) fn resolve_windows_restricted_token_filesystem_overrides(
sandbox: SandboxType,
sandbox_policy: &SandboxPolicy,
@@ -1015,6 +1027,31 @@ pub(crate) fn resolve_windows_restricted_token_filesystem_overrides(
network_sandbox_policy: NetworkSandboxPolicy,
sandbox_policy_cwd: &AbsolutePathBuf,
windows_sandbox_level: WindowsSandboxLevel,
+) -> std::result::Result