mirror of
https://github.com/openai/codex.git
synced 2026-10-18 17:18:52 +00:00
Michael Bolin
0a00b5ed29
Previous to this PR, `SandboxPolicy` was a bit difficult to work with: https://github.com/openai/codex/blob/237f8a11e11fdcc793a09e787e48215676d9b95b/codex-rs/core/src/protocol.rs#L98-L108 Specifically: * It was an `enum` and therefore options were mutually exclusive as opposed to additive. * It defined things in terms of what the agent _could not_ do as opposed to what they _could_ do. This made things hard to support because we would prefer to build up a sandbox config by starting with something extremely restrictive and only granting permissions for things the user as explicitly allowed. This PR changes things substantially by redefining the policy in terms of two concepts: * A `SandboxPermission` enum that defines permissions that can be granted to the agent/sandbox. * A `SandboxPolicy` that internally stores a `Vec<SandboxPermission>`, but externally exposes a simpler API that can be used to configure Seatbelt/Landlock. Previous to this PR, we supported a `--sandbox` flag that effectively mapped to an enum value in `SandboxPolicy`. Though now that `SandboxPolicy` is a wrapper around `Vec<SandboxPermission>`, the single `--sandbox` flag no longer makes sense. While I could have turned it into a flag that the user can specify multiple times, I think the current values to use with such a flag are long and potentially messy, so for the moment, I have dropped support for `--sandbox` altogether and we can bring it back once we have figured out the naming thing. Since `--sandbox` is gone, users now have to specify `--full-auto` to get a sandbox that allows writes in `cwd`. Admittedly, there is no clean way to specify the equivalent of `--full-auto` in your `config.toml` right now, so we will have to revisit that, as well. Because `Config` presents a `SandboxPolicy` field and `SandboxPolicy` changed considerably, I had to overhaul how config loading works, as well. There are now two distinct concepts, `ConfigToml` and `Config`: * `ConfigToml` is the deserialization of `~/.codex/config.toml`. As one might expect, every field is `Optional` and it is `#[derive(Deserialize, Default)]`. Consistent use of `Optional` makes it clear what the user has specified explicitly. * `Config` is the "normalized config" and is produced by merging `ConfigToml` with `ConfigOverrides`. Where `ConfigToml` contains a raw `Option<Vec<SandboxPermission>>`, `Config` presents only the final `SandboxPolicy`. The changes to `core/src/exec.rs` and `core/src/linux.rs` merit extra special attention to ensure we are faithfully mapping the `SandboxPolicy` to the Seatbelt and Landlock configs, respectively. Also, take note that `core/src/seatbelt_readonly_policy.sbpl` has been renamed to `codex-rs/core/src/seatbelt_base_policy.sbpl` and that `(allow file-read*)` has been removed from the `.sbpl` file as now this is added to the policy in `core/src/exec.rs` when `sandbox_policy.has_full_disk_read_access()` is `true`.
30 lines
673 B
Rust
30 lines
673 B
Rust
//! Root of the `codex-core` library.
|
||
|
||
// Prevent accidental direct writes to stdout/stderr in library code. All
|
||
// user‑visible output must go through the appropriate abstraction (e.g.,
|
||
// the TUI or the tracing stack).
|
||
#![deny(clippy::print_stdout, clippy::print_stderr)]
|
||
|
||
mod client;
|
||
pub mod codex;
|
||
pub mod codex_wrapper;
|
||
pub mod config;
|
||
pub mod error;
|
||
pub mod exec;
|
||
mod flags;
|
||
mod is_safe_command;
|
||
#[cfg(target_os = "linux")]
|
||
pub mod linux;
|
||
mod models;
|
||
pub mod protocol;
|
||
mod safety;
|
||
pub mod util;
|
||
mod zdr_transcript;
|
||
|
||
pub use codex::Codex;
|
||
|
||
#[cfg(feature = "cli")]
|
||
mod approval_mode_cli_arg;
|
||
#[cfg(feature = "cli")]
|
||
pub use approval_mode_cli_arg::ApprovalModeCliArg;
|