mirror of
https://github.com/openai/codex.git
synced 2026-10-30 19:18:49 +00:00
Adam Perry @ OpenAI
5a56caf18c
## Why First-party async traits should expose their `Send` contracts explicitly without requiring `async_trait`. This completes the migration pattern established in #27303 and #27304. ## What changed - Replaced the remaining first-party `async_trait` traits with native return-position `impl Future + Send` where statically dispatched and explicit boxed `Send` futures where object safety is required. - Kept implementations behavior-preserving, outlining existing async bodies into inherent methods where that keeps the diff reviewable. - Removed all direct first-party `async-trait` dependencies and the workspace dependency declaration. - Added a cargo-deny policy that permits `async-trait` only through the remaining transitive wrapper crates. - Updated `rand` from 0.8.5 to 0.8.6 to resolve RUSTSEC-2026-0097 and keep the full cargo-deny check passing. ## Validation - `just test -p codex-exec-server`: 216 passed, 2 skipped. - `just test -p codex-model-provider`: 39 passed. - `just test -p codex-core` and `just test`: changed tests passed; remaining failures are environment-sensitive suites unrelated to this migration. - `cargo deny check` - `just fix` - `just fmt` - `cargo shear` - `just bazel-lock-check`
82 lines
3.0 KiB
Rust
82 lines
3.0 KiB
Rust
//! Unix shell-escalation protocol implementation.
|
|
//!
|
|
//! A patched shell invokes an exec wrapper on every `exec()` attempt. The wrapper sends an
|
|
//! `EscalateRequest` over the inherited `CODEX_ESCALATE_SOCKET`, and the server decides whether to
|
|
//! run the command directly (`Run`) or execute it on the server side (`Escalate`).
|
|
//!
|
|
//! Of key importance is the `EscalateRequest` includes a file descriptor for a socket
|
|
//! that the server can use to send the response to the execve wrapper. In this
|
|
//! way, all descendents of the Server process can use the file descriptor
|
|
//! specified by the `CODEX_ESCALATE_SOCKET` environment variable to _send_ escalation requests,
|
|
//! but responses are read from a separate socket that is created for each request, which
|
|
//! allows the server to handle multiple concurrent escalation requests.
|
|
//!
|
|
//! ### Escalation flow
|
|
//!
|
|
//! Command Server Shell Execve Wrapper
|
|
//! |
|
|
//! o----->o
|
|
//! | |
|
|
//! | o--(exec)-->o
|
|
//! | | |
|
|
//! |o<-(EscalateReq)--o
|
|
//! || | |
|
|
//! |o--(Escalate)---->o
|
|
//! || | |
|
|
//! |o<---------(fds)--o
|
|
//! || | |
|
|
//! o<------o | |
|
|
//! | || | |
|
|
//! x------>o | |
|
|
//! || | |
|
|
//! |x--(exit code)--->o
|
|
//! | | |
|
|
//! | o<--(exit)--x
|
|
//! | |
|
|
//! o<-----x
|
|
//!
|
|
//! ### Non-escalation flow
|
|
//!
|
|
//! Server Shell Execve Wrapper Command
|
|
//! |
|
|
//! o----->o
|
|
//! | |
|
|
//! | o--(exec)-->o
|
|
//! | | |
|
|
//! |o<-(EscalateReq)--o
|
|
//! || | |
|
|
//! |o-(Run)---------->o
|
|
//! | | |
|
|
//! | | x--(exec)-->o
|
|
//! | | |
|
|
//! | o<--------------(exit)--x
|
|
//! | |
|
|
//! o<-----x
|
|
//!
|
|
pub(crate) mod escalate_client;
|
|
pub(crate) mod escalate_protocol;
|
|
pub(crate) mod escalate_server;
|
|
pub(crate) mod escalation_policy;
|
|
pub(crate) mod execve_wrapper;
|
|
pub(crate) mod socket;
|
|
pub(crate) mod stopwatch;
|
|
|
|
pub use self::escalate_client::run_shell_escalation_execve_wrapper;
|
|
pub use self::escalate_protocol::ESCALATE_SOCKET_ENV_VAR;
|
|
pub use self::escalate_protocol::EscalateAction;
|
|
pub use self::escalate_protocol::EscalationDecision;
|
|
pub use self::escalate_protocol::EscalationExecution;
|
|
pub use self::escalate_server::EscalateServer;
|
|
pub use self::escalate_server::EscalationSession;
|
|
pub use self::escalate_server::ExecParams;
|
|
pub use self::escalate_server::ExecResult;
|
|
pub use self::escalate_server::PreparedExec;
|
|
pub use self::escalate_server::ShellCommandExecutor;
|
|
pub use self::escalate_server::ShellCommandExecutorFuture;
|
|
pub use self::escalation_policy::EscalationPolicy;
|
|
pub use self::escalation_policy::EscalationPolicyFuture;
|
|
pub use self::execve_wrapper::main_execve_wrapper;
|
|
pub use self::stopwatch::Stopwatch;
|
|
pub use codex_protocol::approvals::EscalationPermissions;
|
|
pub use codex_protocol::approvals::ResolvedPermissionProfile;
|