mirror of
https://github.com/openai/codex.git
synced 2026-11-01 19:33:35 +00:00
## What
This change introduces a new `ReadOnlyAccess` model and threads it through
sandbox policy consumers so read access is explicit instead of implicit.
- Added `ReadOnlyAccess` to protocol:
- `Restricted { include_platform_defaults, readable_roots }`
- `FullAccess`
- Changed `SandboxPolicy` shape:
- `ReadOnly` is now `ReadOnly { access: ReadOnlyAccess }`
- `WorkspaceWrite` now carries `read_only_access: ReadOnlyAccess`
- Kept existing behavior for now by defaulting to `ReadOnlyAccess::FullAccess`
in constructors and current config/app-server mappings.
- Added helper methods to compute effective readable roots (including optional
platform defaults + cwd) and to detect full read access.
- Updated seatbelt policy generation to honor restricted read roots by emitting
scoped `(allow file-read* ...)` entries when full read access is not granted.
- Updated Linux backends (`bwrap`, legacy landlock path) to fail closed with an
explicit `UnsupportedOperation` when restricted read access is requested but
not yet implemented there.
- Updated Windows sandbox backends (standard, elevated, and runner paths) to
fail closed in the same way for restricted read access.
- Updated all call sites/tests/pattern matches for the new structured variants
and regenerated app-server protocol schema/types.
## Why
The previous `SandboxPolicy::ReadOnly` implied full-disk read access and left
no way to express a narrower read surface.
This refactor establishes the policy model needed to support user-configurable
read restrictions in a follow-up without changing current runtime behavior.
It also ensures we do not silently ignore future restricted-read policies on
platform backends that do not support them yet. Failing closed keeps sandbox
semantics predictable and avoids accidental over-permission.
## Compatibility and rollout notes
- Existing behavior is preserved by default (`FullAccess`).
- Existing config/app-server flows continue to serialize/deserialize cleanly.
- New schema artifacts are included to keep generated protocol outputs in sync.
## Validation
- `just fmt`
- `just fix -p codex-protocol -p codex-core -p codex-linux-sandbox -p codex-windows-sandbox -p codex-app-server-protocol`
- `cargo check -p codex-windows-sandbox`
- Targeted crate/test runs were executed during development for protocol/core/
sandbox-related crates.
211 lines
6.7 KiB
Rust
211 lines
6.7 KiB
Rust
#![allow(clippy::unwrap_used)]
|
|
|
|
use codex_core::features::Feature;
|
|
use codex_core::protocol::SandboxPolicy;
|
|
use codex_protocol::config_types::WebSearchMode;
|
|
use core_test_support::responses;
|
|
use core_test_support::responses::start_mock_server;
|
|
use core_test_support::skip_if_no_network;
|
|
use core_test_support::test_codex::test_codex;
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::Value;
|
|
|
|
#[allow(clippy::expect_used)]
|
|
fn find_web_search_tool(body: &Value) -> &Value {
|
|
body["tools"]
|
|
.as_array()
|
|
.expect("request body should include tools array")
|
|
.iter()
|
|
.find(|tool| tool.get("type").and_then(Value::as_str) == Some("web_search"))
|
|
.expect("tools should include a web_search tool")
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn web_search_mode_cached_sets_external_web_access_false() {
|
|
skip_if_no_network!();
|
|
|
|
let server = start_mock_server().await;
|
|
let sse = responses::sse(vec![
|
|
responses::ev_response_created("resp-1"),
|
|
responses::ev_completed("resp-1"),
|
|
]);
|
|
let resp_mock = responses::mount_sse_once(&server, sse).await;
|
|
|
|
let mut builder = test_codex()
|
|
.with_model("gpt-5-codex")
|
|
.with_config(|config| {
|
|
config
|
|
.web_search_mode
|
|
.set(WebSearchMode::Cached)
|
|
.expect("test web_search_mode should satisfy constraints");
|
|
});
|
|
let test = builder
|
|
.build(&server)
|
|
.await
|
|
.expect("create test Codex conversation");
|
|
|
|
test.submit_turn_with_policy(
|
|
"hello cached web search",
|
|
SandboxPolicy::new_read_only_policy(),
|
|
)
|
|
.await
|
|
.expect("submit turn");
|
|
|
|
let body = resp_mock.single_request().body_json();
|
|
let tool = find_web_search_tool(&body);
|
|
assert_eq!(
|
|
tool.get("external_web_access").and_then(Value::as_bool),
|
|
Some(false),
|
|
"web_search cached mode should force external_web_access=false"
|
|
);
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn web_search_mode_takes_precedence_over_legacy_flags() {
|
|
skip_if_no_network!();
|
|
|
|
let server = start_mock_server().await;
|
|
let sse = responses::sse(vec![
|
|
responses::ev_response_created("resp-1"),
|
|
responses::ev_completed("resp-1"),
|
|
]);
|
|
let resp_mock = responses::mount_sse_once(&server, sse).await;
|
|
|
|
let mut builder = test_codex()
|
|
.with_model("gpt-5-codex")
|
|
.with_config(|config| {
|
|
config.features.enable(Feature::WebSearchRequest);
|
|
config
|
|
.web_search_mode
|
|
.set(WebSearchMode::Cached)
|
|
.expect("test web_search_mode should satisfy constraints");
|
|
});
|
|
let test = builder
|
|
.build(&server)
|
|
.await
|
|
.expect("create test Codex conversation");
|
|
|
|
test.submit_turn_with_policy(
|
|
"hello cached+live flags",
|
|
SandboxPolicy::new_read_only_policy(),
|
|
)
|
|
.await
|
|
.expect("submit turn");
|
|
|
|
let body = resp_mock.single_request().body_json();
|
|
let tool = find_web_search_tool(&body);
|
|
assert_eq!(
|
|
tool.get("external_web_access").and_then(Value::as_bool),
|
|
Some(false),
|
|
"web_search mode should win over legacy web_search_request"
|
|
);
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn web_search_mode_defaults_to_cached_when_features_disabled() {
|
|
skip_if_no_network!();
|
|
|
|
let server = start_mock_server().await;
|
|
let sse = responses::sse(vec![
|
|
responses::ev_response_created("resp-1"),
|
|
responses::ev_completed("resp-1"),
|
|
]);
|
|
let resp_mock = responses::mount_sse_once(&server, sse).await;
|
|
|
|
let mut builder = test_codex()
|
|
.with_model("gpt-5-codex")
|
|
.with_config(|config| {
|
|
config
|
|
.web_search_mode
|
|
.set(WebSearchMode::Cached)
|
|
.expect("test web_search_mode should satisfy constraints");
|
|
config.features.disable(Feature::WebSearchCached);
|
|
config.features.disable(Feature::WebSearchRequest);
|
|
});
|
|
let test = builder
|
|
.build(&server)
|
|
.await
|
|
.expect("create test Codex conversation");
|
|
|
|
test.submit_turn_with_policy(
|
|
"hello default cached web search",
|
|
SandboxPolicy::new_read_only_policy(),
|
|
)
|
|
.await
|
|
.expect("submit turn");
|
|
|
|
let body = resp_mock.single_request().body_json();
|
|
let tool = find_web_search_tool(&body);
|
|
assert_eq!(
|
|
tool.get("external_web_access").and_then(Value::as_bool),
|
|
Some(false),
|
|
"default web_search should be cached when unset"
|
|
);
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn web_search_mode_updates_between_turns_with_sandbox_policy() {
|
|
skip_if_no_network!();
|
|
|
|
let server = start_mock_server().await;
|
|
let resp_mock = responses::mount_sse_sequence(
|
|
&server,
|
|
vec![
|
|
responses::sse(vec![
|
|
responses::ev_response_created("resp-1"),
|
|
responses::ev_completed("resp-1"),
|
|
]),
|
|
responses::sse(vec![
|
|
responses::ev_response_created("resp-2"),
|
|
responses::ev_completed("resp-2"),
|
|
]),
|
|
],
|
|
)
|
|
.await;
|
|
|
|
let mut builder = test_codex()
|
|
.with_model("gpt-5-codex")
|
|
.with_config(|config| {
|
|
config
|
|
.web_search_mode
|
|
.set(WebSearchMode::Cached)
|
|
.expect("test web_search_mode should satisfy constraints");
|
|
config.features.disable(Feature::WebSearchCached);
|
|
config.features.disable(Feature::WebSearchRequest);
|
|
});
|
|
let test = builder
|
|
.build(&server)
|
|
.await
|
|
.expect("create test Codex conversation");
|
|
|
|
test.submit_turn_with_policy("hello cached", SandboxPolicy::new_read_only_policy())
|
|
.await
|
|
.expect("submit first turn");
|
|
test.submit_turn_with_policy("hello live", SandboxPolicy::DangerFullAccess)
|
|
.await
|
|
.expect("submit second turn");
|
|
|
|
let requests = resp_mock.requests();
|
|
assert_eq!(requests.len(), 2, "expected two response requests");
|
|
|
|
let first_body = requests[0].body_json();
|
|
let first_tool = find_web_search_tool(&first_body);
|
|
assert_eq!(
|
|
first_tool
|
|
.get("external_web_access")
|
|
.and_then(Value::as_bool),
|
|
Some(false),
|
|
"read-only policy should default web_search to cached"
|
|
);
|
|
|
|
let second_body = requests[1].body_json();
|
|
let second_tool = find_web_search_tool(&second_body);
|
|
assert_eq!(
|
|
second_tool
|
|
.get("external_web_access")
|
|
.and_then(Value::as_bool),
|
|
Some(true),
|
|
"danger-full-access policy should default web_search to live"
|
|
);
|
|
}
|