clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(core): allow on-request network retry approvals on sandbox denial"

Browse Source 
This reverts commit 79573f1224.
This commit is contained in:
viyatb-oai
2026-02-11 15:18:53 -08:00
parent 87d68c24c9
commit 1a5c8f46bf
1 changed files with 7 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
codex-rs/core/src/tools/orchestrator.rs
View File

@@ -135,19 +135,9 @@ impl ToolOrchestrator {
output,
})));
}
let retry_details = build_denial_reason_from_output(
output.as_ref(),
should_prompt_for_network_approval(turn_ctx),
);
// Most tools disallow no-sandbox retry under OnRequest. However, for managed
// network denials with extracted network approval context, we still allow
// prompting so the user can explicitly approve the specific host/protocol access.
if !can_retry_without_sandbox(
tool.wants_no_sandbox_approval(approval_policy),
approval_policy,
retry_details.network_approval_context.is_some(),
) {
// Under `Never` or `OnRequest`, do not retry without sandbox; surface a concise
// sandbox denial that preserves the original output.
if !tool.wants_no_sandbox_approval(approval_policy) {
return Err(ToolError::Codex(CodexErr::Sandbox(SandboxErr::Denied {
output,
})));
@@ -155,6 +145,10 @@ impl ToolOrchestrator {
// Ask for approval before retrying with the escalated sandbox.
if !tool.should_bypass_approval(approval_policy, already_approved) {
let retry_details = build_denial_reason_from_output(
output.as_ref(),
should_prompt_for_network_approval(turn_ctx),
);
let approval_ctx = ApprovalCtx {
session: tool_ctx.session,
turn: turn_ctx,
@@ -239,15 +233,6 @@ fn should_prompt_for_network_approval(turn_ctx: &crate::codex::TurnContext) -> b
)
}
fn can_retry_without_sandbox(
tool_wants_no_sandbox_approval: bool,
approval_policy: AskForApproval,
has_network_approval_context: bool,
) -> bool {
tool_wants_no_sandbox_approval
|| (matches!(approval_policy, AskForApproval::OnRequest) && has_network_approval_context)
}
fn extract_network_approval_context(output: &ExecToolCallOutput) -> Option<NetworkApprovalContext> {
[
output.stderr.text.as_str(),
@@ -353,40 +338,4 @@ mod tests {
assert_eq!(extract_network_approval_context_from_text(text), None);
}
#[test]
fn can_retry_without_sandbox_respects_default_on_request_gate() {
assert!(!can_retry_without_sandbox(
false,
AskForApproval::OnRequest,
false
));
}
#[test]
fn can_retry_without_sandbox_allows_on_request_for_network_context() {
assert!(can_retry_without_sandbox(
false,
AskForApproval::OnRequest,
true
));
}
#[test]
fn can_retry_without_sandbox_still_blocks_never_without_tool_override() {
assert!(!can_retry_without_sandbox(
false,
AskForApproval::Never,
true
));
}
#[test]
fn can_retry_without_sandbox_honors_tool_override() {
assert!(can_retry_without_sandbox(
true,
AskForApproval::OnRequest,
false
));
}
}