Review terminal input against retained permissions (#41328)

## Why

An existing terminal keeps the sandbox, network settings, and grants it had at launch. Later `write_stdin` calls must account for that retained authority, including when permissions change between turns.

## What changed

- Capture each terminal's effective launch permissions and compare them with the current environment before accepting non-empty input.
- Request approval when the terminal bypassed the sandbox, retains additional grants, strict auto-review is active, or its sandbox or network settings differ from the current policy.
- Reject input when current denied-read or environment-owned network restrictions cannot be enforced by the existing terminal, while keeping empty polls and non-TTY interrupts available without review.
- Include the effective sandbox mode and user-visible additional grants in `write_stdin` approval actions without exposing host-owned grant paths.

## Testing

Added unit and end-to-end coverage for retained cross-turn grants, strict auto-review, sandbox and network policy changes, denied reads, Windows sandbox backends, and private grant redaction.

GitOrigin-RevId: e2d71daf9358474c885998786c4928069100711c
This commit is contained in:
jif authored and copyberry committed 2026-08-28 11:38:03 +00:00
1 parent 31d338a1ea
commit 5eea8d0dd3
17 files changed
+959 -61

No files matched your search

@@ -34,6 +34,8 @@ pub(crate) enum GuardianApprovalRequest {
input: String,
cwd: PathUri,
tty: bool,
sandbox_permissions: crate::sandboxing::SandboxPermissions,
additional_permissions: Option<AdditionalPermissionProfile>,
},
#[cfg(unix)]
Execve {
@@ -128,6 +130,8 @@ struct WriteStdinApprovalAction<'a> {
chars: &'a str,
cwd: LegacyAppPathString,
sandbox_permissions: crate::sandboxing::SandboxPermissions,
#[serde(skip_serializing_if = "Option::is_none")]
additional_permissions: Option<&'a AdditionalPermissionProfile>,
tty: bool,
}
@@ -300,6 +304,8 @@ pub(crate) fn guardian_approval_request_to_json(
input,
cwd,
tty,
sandbox_permissions,
additional_permissions,
..
} => serialize_guardian_action(WriteStdinApprovalAction {
tool: "write_stdin",
@@ -307,7 +313,8 @@ pub(crate) fn guardian_approval_request_to_json(
session_id: *process_id,
chars: input,
cwd: cwd.clone().into(),
sandbox_permissions: crate::sandboxing::SandboxPermissions::RequireEscalated,
sandbox_permissions: *sandbox_permissions,
additional_permissions: additional_permissions.as_ref(),
tty: *tty,
}),
#[cfg(unix)]
+30 -14
View File
@@ -45,6 +45,7 @@ use codex_protocol::models::ContentItem;
use codex_protocol::models::FunctionCallOutputContentItem;
use codex_protocol::models::PermissionProfile;
use codex_protocol::models::ResponseItem;
use codex_protocol::models::SandboxPermissions;
use codex_protocol::openai_models::ModelsResponse;
use codex_protocol::openai_models::ReasoningEffort;
use codex_protocol::permissions::FileSystemAccessMode;
@@ -1364,10 +1365,22 @@ async fn build_guardian_prompt_items_explains_network_access_review_scope() -> a
Ok(())
}
#[test]
fn guardian_write_stdin_preserves_input_and_foreign_cwd() -> serde_json::Result<()> {
#[test_case::test_case(SandboxPermissions::UseDefault)]
#[test_case::test_case(SandboxPermissions::RequireEscalated)]
#[test_case::test_case(SandboxPermissions::WithAdditionalPermissions)]
fn guardian_write_stdin_preserves_input_and_foreign_cwd(
sandbox_permissions: SandboxPermissions,
) -> serde_json::Result<()> {
let cwd = PathUri::parse("file:///C:/workspace").expect("valid executor cwd");
let input = "confirm\n";
let additional_permissions =
if sandbox_permissions == SandboxPermissions::WithAdditionalPermissions {
Some(serde_json::from_value(
serde_json::json!({"network":{"enabled":true}}),
)?)
} else {
None
};
let action = GuardianApprovalRequest::WriteStdin {
id: "terminal-open".to_string(),
approval_id: "terminal-write".to_string(),
@@ -1376,20 +1389,23 @@ fn guardian_write_stdin_preserves_input_and_foreign_cwd() -> serde_json::Result<
input: input.to_string(),
cwd: cwd.clone(),
tty: true,
sandbox_permissions,
additional_permissions: additional_permissions.clone(),
};
assert_eq!(
guardian_approval_request_to_json(&action)?,
serde_json::json!({
"tool": "write_stdin",
"environment_id": "windows-executor",
"session_id": 1000,
"chars": input,
"cwd": r"C:\workspace",
"sandbox_permissions": "require_escalated",
"tty": true,
}),
);
let mut expected = serde_json::json!({
"tool": "write_stdin",
"environment_id": "windows-executor",
"session_id": 1000,
"chars": input,
"cwd": r"C:\workspace",
"sandbox_permissions": sandbox_permissions,
"tty": true,
});
if let Some(permissions) = additional_permissions {
expected["additional_permissions"] = serde_json::to_value(permissions)?;
}
assert_eq!(guardian_approval_request_to_json(&action)?, expected);
assert_eq!(
guardian_assessment_action(&action),
GuardianAssessmentAction::WriteStdin {