mirrors/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-27 18:01:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

inlining base_approval_requirequirements

Browse Source
This commit is contained in:
kevin zhao
2025-11-13 21:30:53 -05:00
parent 40b8a6e311
commit 9a15ae1286
2 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
codex-rs/core/src/tools/runtimes/shell.rs
View File

@@ -71,24 +71,6 @@ impl ShellRuntime {
tx_event: ctx.session.get_tx_event(),
})
}
fn base_approval_requirement(
&self,
req: &ShellRequest,
policy: AskForApproval,
sandbox_policy: &SandboxPolicy,
) -> ApprovalRequirement {
if requires_initial_appoval(
policy,
sandbox_policy,
&req.command,
req.with_escalated_permissions.unwrap_or(false),
) {
ApprovalRequirement::NeedsApproval { reason: None }
} else {
ApprovalRequirement::Skip
}
}
}
impl Sandboxable for ShellRuntime {
@@ -146,10 +128,17 @@ impl Approvable<ShellRequest> for ShellRuntime {
if let Some(exec_policy) = &req.exec_policy
&& let Some(requirement) = evaluate_with_policy(exec_policy, &req.command, policy)
{
return requirement;
requirement
} else if requires_initial_appoval(
policy,
sandbox_policy,
&req.command,
req.with_escalated_permissions.unwrap_or(false),
) {
ApprovalRequirement::NeedsApproval { reason: None }
} else {
ApprovalRequirement::Skip
}
self.base_approval_requirement(req, policy, sandbox_policy)
}
fn wants_escalated_first_attempt(&self, req: &ShellRequest) -> bool {

21
codex-rs/core/src/tools/runtimes/unified_exec.rs
View File

@@ -87,19 +87,6 @@ impl<'a> UnifiedExecRuntime<'a> {
pub fn new(manager: &'a UnifiedExecSessionManager) -> Self {
Self { manager }
}
fn base_approval_requirement(
&self,
req: &UnifiedExecRequest,
policy: AskForApproval,
sandbox_policy: &SandboxPolicy,
) -> ApprovalRequirement {
if requires_initial_appoval(policy, sandbox_policy, &req.command, false) {
ApprovalRequirement::NeedsApproval { reason: None }
} else {
ApprovalRequirement::Skip
}
}
}
impl Sandboxable for UnifiedExecRuntime<'_> {
@@ -158,10 +145,12 @@ impl Approvable<UnifiedExecRequest> for UnifiedExecRuntime<'_> {
if let Some(exec_policy) = &req.exec_policy
&& let Some(requirement) = evaluate_with_policy(exec_policy, &req.command, policy)
{
return requirement;
requirement
} else if requires_initial_appoval(policy, sandbox_policy, &req.command, false) {
ApprovalRequirement::NeedsApproval { reason: None }
} else {
ApprovalRequirement::Skip
}
self.base_approval_requirement(req, policy, sandbox_policy)
}
fn wants_escalated_first_attempt(&self, req: &UnifiedExecRequest) -> bool {