mirror of
https://github.com/openai/codex.git
synced 2026-10-21 17:48:44 +00:00
zm-oai
ed59a6c1cd
## Why Executor config reads omitted the startup `features.prefer_mxc` override, so clients could not see the CLI sandbox preference. ## What changed - Include the explicit CLI `features.prefer_mxc` value in `environmentConfig/read` as a `session-flags` layer, above project config and below legacy managed file and MDM config. - Retain only this preference from startup overrides. - Expose `windows_mxc_allowed_by_config` to share MXC eligibility checks after callers resolve the active permission profile. ## Testing Add CLI and remote executor coverage for preference propagation and filtering, plus a unit test verifying that both legacy managed config sources retain precedence. GitOrigin-RevId: 5ac6f5257f1e807c2f197dcf5dcb2385cedca0ea
83 lines
3.3 KiB
Rust
83 lines
3.3 KiB
Rust
//! Executor-local paths and trusted startup settings used when preparing execution.
|
|
|
|
use std::path::PathBuf;
|
|
|
|
use codex_sandboxing::LinuxSandboxPidNamespace;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
|
|
/// Paths and sandbox settings initialized when creating an executor.
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub struct ExecServerRuntimeOptions {
|
|
/// Stable path to the Codex executable used to launch hidden helper modes.
|
|
pub codex_self_exe: AbsolutePathBuf,
|
|
/// Path to the Linux sandbox helper alias used when the platform sandbox
|
|
/// needs to re-enter Codex by argv0.
|
|
pub codex_linux_sandbox_exe: Option<AbsolutePathBuf>,
|
|
/// Trusted startup policy; requests and repository config cannot change PID isolation.
|
|
pub linux_sandbox_pid_namespace: LinuxSandboxPidNamespace,
|
|
/// Trusted startup routing; request policy still controls destination access.
|
|
pub proxy_private_ips_via_upstream: bool,
|
|
/// Only the sandbox preference from CLI flags, never other startup config or secrets.
|
|
pub prefer_mxc: Option<bool>,
|
|
/// User-config opt-out of writable-root symlink checks beneath this host's home.
|
|
#[cfg(target_os = "macos")]
|
|
pub allowed_symlinked_codex_home: Option<AbsolutePathBuf>,
|
|
}
|
|
|
|
impl ExecServerRuntimeOptions {
|
|
pub fn from_optional_paths(
|
|
codex_self_exe: Option<PathBuf>,
|
|
codex_linux_sandbox_exe: Option<PathBuf>,
|
|
) -> std::io::Result<Self> {
|
|
let codex_self_exe = codex_self_exe.ok_or_else(|| {
|
|
std::io::Error::new(
|
|
std::io::ErrorKind::InvalidInput,
|
|
"Codex executable path is not configured",
|
|
)
|
|
})?;
|
|
Self::new(codex_self_exe, codex_linux_sandbox_exe)
|
|
}
|
|
|
|
pub fn new(
|
|
codex_self_exe: PathBuf,
|
|
codex_linux_sandbox_exe: Option<PathBuf>,
|
|
) -> std::io::Result<Self> {
|
|
Ok(Self {
|
|
linux_sandbox_pid_namespace: LinuxSandboxPidNamespace::default(),
|
|
proxy_private_ips_via_upstream: false,
|
|
prefer_mxc: None,
|
|
codex_self_exe: absolute_path(codex_self_exe)?,
|
|
codex_linux_sandbox_exe: codex_linux_sandbox_exe.map(absolute_path).transpose()?,
|
|
#[cfg(target_os = "macos")]
|
|
allowed_symlinked_codex_home: None,
|
|
})
|
|
}
|
|
|
|
/// Applies the PID namespace policy chosen by trusted executor provisioning.
|
|
pub fn with_linux_sandbox_pid_namespace(mut self, mode: LinuxSandboxPidNamespace) -> Self {
|
|
self.linux_sandbox_pid_namespace = mode;
|
|
self
|
|
}
|
|
|
|
/// Routes permitted private IPs through the executor's configured upstream proxy.
|
|
pub fn with_proxy_private_ips_via_upstream(mut self, enabled: bool) -> Self {
|
|
self.proxy_private_ips_via_upstream = enabled;
|
|
self
|
|
}
|
|
|
|
/// Applies the symlink opt-in resolved by the execution host's config loader.
|
|
#[cfg(target_os = "macos")]
|
|
pub fn with_allowed_symlinked_codex_home(
|
|
mut self,
|
|
allowed_symlinked_codex_home: Option<AbsolutePathBuf>,
|
|
) -> Self {
|
|
self.allowed_symlinked_codex_home = allowed_symlinked_codex_home;
|
|
self
|
|
}
|
|
}
|
|
|
|
fn absolute_path(path: PathBuf) -> std::io::Result<AbsolutePathBuf> {
|
|
AbsolutePathBuf::from_absolute_path(path.as_path())
|
|
.map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidInput, err))
|
|
}
|