core: remove SandboxPolicy from production core

This commit is contained in:
Michael Bolin
2026-05-31 14:53:32 -07:00
parent e93dc98a48
commit 4bb7d67da8
40 changed files with 630 additions and 439 deletions
+56
View File
@@ -16,10 +16,17 @@ use codex_core::CodexThread;
use codex_core::config::Config;
use codex_core::config::ConfigBuilder;
use codex_core::config::ConfigOverrides;
use codex_core::config::ConstraintResult;
use codex_core::config::Permissions;
use codex_protocol::models::PermissionProfile;
use codex_protocol::permissions::FileSystemSandboxPolicy;
use codex_protocol::permissions::NetworkSandboxPolicy;
use codex_protocol::protocol::SandboxPolicy;
use codex_utils_absolute_path::AbsolutePathBuf;
pub use codex_utils_absolute_path::test_support::PathBufExt;
pub use codex_utils_absolute_path::test_support::PathExt;
use regex_lite::Regex;
use std::path::Path;
use std::path::PathBuf;
pub mod apps_test_server;
@@ -111,6 +118,55 @@ pub fn test_absolute_path(unix_path: &str) -> AbsolutePathBuf {
test_absolute_path_with_windows(unix_path, /*windows_path*/ None)
}
pub fn legacy_sandbox_policy_for_config(config: &Config) -> SandboxPolicy {
legacy_sandbox_policy_for_permission_profile(
&config.permissions.effective_permission_profile(),
&config.permissions.file_system_sandbox_policy(),
config.permissions.network_sandbox_policy(),
config.cwd.as_path(),
)
}
pub fn legacy_sandbox_policy_for_permission_profile(
permission_profile: &PermissionProfile,
file_system_sandbox_policy: &FileSystemSandboxPolicy,
network_sandbox_policy: NetworkSandboxPolicy,
cwd: &Path,
) -> SandboxPolicy {
permission_profile
.to_legacy_sandbox_policy(cwd)
.unwrap_or_else(|_| {
permission_profile.compatibility_sandbox_policy(
file_system_sandbox_policy,
network_sandbox_policy,
cwd,
)
})
}
pub fn set_legacy_sandbox_policy_for_config(
config: &mut Config,
sandbox_policy: SandboxPolicy,
) -> ConstraintResult<()> {
let cwd = config.cwd.clone();
set_legacy_sandbox_policy_for_permissions(
&mut config.permissions,
sandbox_policy,
cwd.as_path(),
)
}
pub fn set_legacy_sandbox_policy_for_permissions(
permissions: &mut Permissions,
sandbox_policy: SandboxPolicy,
cwd: &Path,
) -> ConstraintResult<()> {
permissions.set_permission_profile(PermissionProfile::from_legacy_sandbox_policy_for_cwd(
&sandbox_policy,
cwd,
))
}
pub trait TempDirExt {
fn abs(&self) -> AbsolutePathBuf;
}
+13 -6
View File
@@ -1,6 +1,7 @@
use anyhow::Result;
use codex_features::Feature;
use codex_protocol::config_types::ServiceTier;
use core_test_support::legacy_sandbox_policy_for_config;
use core_test_support::responses::WebSocketConnectionConfig;
use core_test_support::responses::ev_assistant_message;
use core_test_support::responses::ev_completed;
@@ -38,8 +39,11 @@ async fn websocket_test_codex_shell_chain() -> Result<()> {
let mut builder = test_codex().with_windows_cmd_shell();
let test = builder.build_with_websocket_server(&server).await?;
test.submit_turn_with_policy("run the echo command", test.config.legacy_sandbox_policy())
.await?;
test.submit_turn_with_policy(
"run the echo command",
legacy_sandbox_policy_for_config(&test.config),
)
.await?;
let connection = server.single_connection();
assert_eq!(connection.len(), 2);
@@ -82,7 +86,7 @@ async fn websocket_first_turn_uses_startup_prewarm_and_create() -> Result<()> {
let mut builder = test_codex();
let test = builder.build_with_websocket_server(&server).await?;
test.submit_turn_with_policy("hello", test.config.legacy_sandbox_policy())
test.submit_turn_with_policy("hello", legacy_sandbox_policy_for_config(&test.config))
.await?;
assert_eq!(server.handshakes().len(), 1);
@@ -145,7 +149,7 @@ async fn websocket_first_turn_handles_handshake_delay_with_startup_prewarm() ->
let mut builder = test_codex();
let test = builder.build_with_websocket_server(&server).await?;
test.submit_turn_with_policy("hello", test.config.legacy_sandbox_policy())
test.submit_turn_with_policy("hello", legacy_sandbox_policy_for_config(&test.config))
.await?;
assert_eq!(server.handshakes().len(), 1);
@@ -198,8 +202,11 @@ async fn websocket_v2_test_codex_shell_chain() -> Result<()> {
});
let test = builder.build_with_websocket_server(&server).await?;
test.submit_turn_with_policy("run the echo command", test.config.legacy_sandbox_policy())
.await?;
test.submit_turn_with_policy(
"run the echo command",
legacy_sandbox_policy_for_config(&test.config),
)
.await?;
let connection = server.single_connection();
assert_eq!(connection.len(), 3);
+16 -20
View File
@@ -37,6 +37,8 @@ use core_test_support::responses::mount_sse_once;
use core_test_support::responses::mount_sse_once_match;
use core_test_support::responses::sse;
use core_test_support::responses::start_mock_server;
use core_test_support::set_legacy_sandbox_policy_for_config;
use core_test_support::set_legacy_sandbox_policy_for_permissions;
use core_test_support::skip_if_no_network;
use core_test_support::test_codex::TestCodex;
use core_test_support::test_codex::test_codex;
@@ -1898,8 +1900,7 @@ async fn run_scenario(scenario: &ScenarioSpec) -> Result<()> {
let mut builder = test_codex().with_model(model).with_config(move |config| {
config.permissions.approval_policy = Constrained::allow_any(approval_policy);
config
.set_legacy_sandbox_policy(sandbox_policy.clone())
set_legacy_sandbox_policy_for_config(config, sandbox_policy.clone())
.expect("set sandbox policy");
for feature in features {
config
@@ -2073,8 +2074,7 @@ async fn approving_apply_patch_for_session_skips_future_prompts_for_same_file()
.with_model("gpt-5.4")
.with_config(move |config| {
config.permissions.approval_policy = Constrained::allow_any(approval_policy);
config
.set_legacy_sandbox_policy(sandbox_policy_for_config)
set_legacy_sandbox_policy_for_config(config, sandbox_policy_for_config)
.expect("set sandbox policy");
config.approvals_reviewer = ApprovalsReviewer::User;
});
@@ -2184,8 +2184,7 @@ async fn approving_execpolicy_amendment_persists_policy_and_skips_future_prompts
let sandbox_policy_for_config = sandbox_policy.clone();
let mut builder = test_codex().with_config(move |config| {
config.permissions.approval_policy = Constrained::allow_any(approval_policy);
config
.set_legacy_sandbox_policy(sandbox_policy_for_config)
set_legacy_sandbox_policy_for_config(config, sandbox_policy_for_config)
.expect("set sandbox policy");
});
let test = builder.build(&server).await?;
@@ -2357,8 +2356,7 @@ async fn spawned_subagent_execpolicy_amendment_propagates_to_parent_session() ->
let sandbox_policy_for_config = sandbox_policy.clone();
let mut builder = test_codex().with_config(move |config| {
config.permissions.approval_policy = Constrained::allow_any(approval_policy);
config
.set_legacy_sandbox_policy(sandbox_policy_for_config)
set_legacy_sandbox_policy_for_config(config, sandbox_policy_for_config)
.expect("set sandbox policy");
config
.features
@@ -2809,8 +2807,7 @@ async fn invalid_requested_prefix_rule_falls_back_for_compound_command() -> Resu
let sandbox_policy_for_config = sandbox_policy.clone();
let mut builder = test_codex().with_config(move |config| {
config.permissions.approval_policy = Constrained::allow_any(approval_policy);
config
.set_legacy_sandbox_policy(sandbox_policy_for_config)
set_legacy_sandbox_policy_for_config(config, sandbox_policy_for_config)
.expect("set sandbox policy");
});
let test = builder.build(&server).await?;
@@ -2862,8 +2859,7 @@ async fn approving_fallback_rule_for_compound_command_works() -> Result<()> {
let sandbox_policy_for_config = sandbox_policy.clone();
let mut builder = test_codex().with_config(move |config| {
config.permissions.approval_policy = Constrained::allow_any(approval_policy);
config
.set_legacy_sandbox_policy(sandbox_policy_for_config)
set_legacy_sandbox_policy_for_config(config, sandbox_policy_for_config)
.expect("set sandbox policy");
});
let test = builder.build(&server).await?;
@@ -3002,8 +2998,7 @@ allow_local_binding = true
.with_cloud_requirements(managed_network_requirements_loader())
.with_config(move |config| {
config.permissions.approval_policy = Constrained::allow_any(approval_policy);
config
.set_legacy_sandbox_policy(sandbox_policy_for_config)
set_legacy_sandbox_policy_for_config(config, sandbox_policy_for_config)
.expect("set sandbox policy");
});
let test = builder.build(&server).await?;
@@ -3488,10 +3483,12 @@ allow_local_binding = true
.with_config(move |config| {
config.permissions.approval_policy = Constrained::allow_any(approval_policy);
let cwd = config.cwd.clone();
config
.permissions
.set_legacy_sandbox_policy(SandboxPolicy::DangerFullAccess, cwd.as_path())
.expect("test setup should allow sandbox policy");
set_legacy_sandbox_policy_for_permissions(
&mut config.permissions,
SandboxPolicy::DangerFullAccess,
cwd.as_path(),
)
.expect("test setup should allow sandbox policy");
});
let test = builder.build(&server).await?;
assert!(
@@ -3611,8 +3608,7 @@ async fn compound_command_with_one_safe_command_still_requires_approval() -> Res
let sandbox_policy_for_config = sandbox_policy.clone();
let mut builder = test_codex().with_config(move |config| {
config.permissions.approval_policy = Constrained::allow_any(approval_policy);
config
.set_legacy_sandbox_policy(sandbox_policy_for_config)
set_legacy_sandbox_policy_for_config(config, sandbox_policy_for_config)
.expect("set sandbox policy");
});
let test = builder.build(&server).await?;
+3 -2
View File
@@ -50,6 +50,7 @@ use codex_protocol::protocol::SessionSource;
use codex_protocol::user_input::UserInput;
use core_test_support::PathBufExt;
use core_test_support::apps_test_server::AppsTestServer;
use core_test_support::legacy_sandbox_policy_for_config;
use core_test_support::load_default_config_for_test;
use core_test_support::responses::ResponsesRequest;
use core_test_support::responses::ev_assistant_message;
@@ -1797,7 +1798,7 @@ async fn user_turn_collaboration_mode_overrides_model_and_effort() -> anyhow::Re
thread_settings: codex_protocol::protocol::ThreadSettingsOverrides {
cwd: Some(config.cwd.to_path_buf()),
approval_policy: Some(config.permissions.approval_policy.value()),
sandbox_policy: Some(config.legacy_sandbox_policy()),
sandbox_policy: Some(legacy_sandbox_policy_for_config(&config)),
summary: Some(
config
.model_reasoning_summary
@@ -1920,7 +1921,7 @@ async fn user_turn_explicit_reasoning_summary_overrides_model_catalog_default()
thread_settings: codex_protocol::protocol::ThreadSettingsOverrides {
cwd: Some(config.cwd.to_path_buf()),
approval_policy: Some(config.permissions.approval_policy.value()),
sandbox_policy: Some(config.legacy_sandbox_policy()),
sandbox_policy: Some(legacy_sandbox_policy_for_config(&config)),
summary: Some(ReasoningSummary::Concise),
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
@@ -7,6 +7,7 @@ use codex_protocol::protocol::COLLABORATION_MODE_OPEN_TAG;
use codex_protocol::protocol::EventMsg;
use codex_protocol::protocol::Op;
use codex_protocol::user_input::UserInput;
use core_test_support::legacy_sandbox_policy_for_config;
use core_test_support::responses::ev_completed;
use core_test_support::responses::ev_response_created;
use core_test_support::responses::mount_sse_once;
@@ -176,7 +177,7 @@ async fn collaboration_instructions_added_on_user_turn() -> Result<()> {
thread_settings: codex_protocol::protocol::ThreadSettingsOverrides {
cwd: Some(test.config.cwd.to_path_buf()),
approval_policy: Some(test.config.permissions.approval_policy.value()),
sandbox_policy: Some(test.config.legacy_sandbox_policy()),
sandbox_policy: Some(legacy_sandbox_policy_for_config(&test.config)),
summary: Some(
test.config
.model_reasoning_summary
@@ -227,7 +228,7 @@ async fn collaboration_instructions_omitted_when_disabled() -> Result<()> {
thread_settings: codex_protocol::protocol::ThreadSettingsOverrides {
cwd: Some(test.config.cwd.to_path_buf()),
approval_policy: Some(test.config.permissions.approval_policy.value()),
sandbox_policy: Some(test.config.legacy_sandbox_policy()),
sandbox_policy: Some(legacy_sandbox_policy_for_config(&test.config)),
summary: Some(
test.config
.model_reasoning_summary
@@ -336,7 +337,7 @@ async fn user_turn_overrides_collaboration_instructions_after_override() -> Resu
thread_settings: codex_protocol::protocol::ThreadSettingsOverrides {
cwd: Some(test.config.cwd.to_path_buf()),
approval_policy: Some(test.config.permissions.approval_policy.value()),
sandbox_policy: Some(test.config.legacy_sandbox_policy()),
sandbox_policy: Some(legacy_sandbox_policy_for_config(&test.config)),
summary: Some(
test.config
.model_reasoning_summary
+2 -2
View File
@@ -17,6 +17,7 @@ use core_test_support::responses::ev_response_created;
use core_test_support::responses::mount_sse_sequence;
use core_test_support::responses::sse;
use core_test_support::responses::start_mock_server;
use core_test_support::set_legacy_sandbox_policy_for_config;
use core_test_support::skip_if_no_network;
use core_test_support::skip_if_sandbox;
use core_test_support::test_codex::test_codex;
@@ -60,8 +61,7 @@ printf '%s\n' "${@: -1}" >> "${payload_path}""#,
let mut builder = test_codex().with_config(move |config| {
config.notify = Some(vec![notify_script_str]);
config.permissions.approval_policy = Constrained::allow_any(approval_policy);
config
.set_legacy_sandbox_policy(sandbox_policy_for_config)
set_legacy_sandbox_policy_for_config(config, sandbox_policy_for_config)
.expect("set sandbox policy");
});
let test = builder.build(&server).await?;
+3 -2
View File
@@ -17,6 +17,7 @@ use codex_protocol::protocol::EventMsg;
use codex_protocol::protocol::Op;
use codex_protocol::user_input::UserInput;
use core_test_support::TempDirExt;
use core_test_support::legacy_sandbox_policy_for_config;
use core_test_support::responses::ev_completed;
use core_test_support::responses::ev_response_created;
use core_test_support::responses::mount_sse_once;
@@ -855,7 +856,7 @@ async fn send_user_turn_with_no_changes_does_not_send_environment_context() -> a
let default_cwd = config.cwd.clone();
let default_approval_policy = config.permissions.approval_policy.value();
let default_sandbox_policy = &config.legacy_sandbox_policy();
let default_sandbox_policy = &legacy_sandbox_policy_for_config(&config);
let default_model = session_configured.model;
let default_effort = config.model_reasoning_effort;
let default_summary = config.model_reasoning_summary;
@@ -996,7 +997,7 @@ async fn send_user_turn_with_changes_sends_environment_context() -> anyhow::Resu
let default_cwd = config.cwd.clone();
let default_approval_policy = config.permissions.approval_policy.value();
let default_sandbox_policy = &config.legacy_sandbox_policy();
let default_sandbox_policy = &legacy_sandbox_policy_for_config(&config);
let default_model = session_configured.model;
let default_effort = config.model_reasoning_effort;
let default_summary = config.model_reasoning_summary;
+2 -1
View File
@@ -15,6 +15,7 @@ use codex_protocol::protocol::TurnStartedEvent;
use codex_protocol::protocol::UserMessageEvent;
use codex_protocol::protocol::WarningEvent;
use core::time::Duration;
use core_test_support::legacy_sandbox_policy_for_config;
use core_test_support::load_default_config_for_test;
use core_test_support::wait_for_event;
use tempfile::TempDir;
@@ -32,7 +33,7 @@ fn resume_history(
current_date: None,
timezone: None,
approval_policy: config.permissions.approval_policy.value(),
sandbox_policy: config.legacy_sandbox_policy(),
sandbox_policy: legacy_sandbox_policy_for_config(config),
permission_profile: None,
network: None,
file_system_sandbox_policy: None,