openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-05 15:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Respect explicit Windows sandbox mode config

Browse Source
This commit is contained in:
David Wiesen
2026-05-21 09:51:06 -07:00
parent de80fa6e31
commit dd1d88ff26
2 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
codex-rs/core/src/windows_sandbox.rs
View File

@@ -60,19 +60,21 @@ pub fn resolve_windows_sandbox_mode(
cfg: &ConfigToml,
profile: &ConfigProfile,
) -> Option<WindowsSandboxModeToml> {
if let Some(mode) = profile
.windows
.as_ref()
.and_then(|windows| windows.sandbox)
.or_else(|| cfg.windows.as_ref().and_then(|windows| windows.sandbox))
{
return Some(mode);
}
if let Some(mode) = legacy_windows_sandbox_mode(profile.features.as_ref()) {
return Some(mode);
}
if legacy_windows_sandbox_keys_present(profile.features.as_ref()) {
return None;
}
profile
.windows
.as_ref()
.and_then(|windows| windows.sandbox)
.or_else(|| cfg.windows.as_ref().and_then(|windows| windows.sandbox))
.or_else(|| legacy_windows_sandbox_mode(cfg.features.as_ref()))
legacy_windows_sandbox_mode(cfg.features.as_ref())
}
pub fn resolve_windows_sandbox_private_desktop(cfg: &ConfigToml, profile: &ConfigProfile) -> bool {

41
codex-rs/core/src/windows_sandbox_tests.rs
View File

@@ -101,6 +101,47 @@ fn resolve_windows_sandbox_mode_prefers_profile_windows() {
);
}
#[test]
fn resolve_windows_sandbox_mode_explicit_profile_windows_beats_profile_legacy() {
let mut entries = BTreeMap::new();
entries.insert("elevated_windows_sandbox".to_string(), /*value*/ true);
let profile = ConfigProfile {
windows: Some(WindowsToml {
sandbox: Some(WindowsSandboxModeToml::Unelevated),
..Default::default()
}),
features: Some(FeaturesToml::from(entries)),
..Default::default()
};
assert_eq!(
resolve_windows_sandbox_mode(&ConfigToml::default(), &profile),
Some(WindowsSandboxModeToml::Unelevated)
);
}
#[test]
fn resolve_windows_sandbox_mode_explicit_cfg_windows_beats_profile_legacy() {
let cfg = ConfigToml {
windows: Some(WindowsToml {
sandbox: Some(WindowsSandboxModeToml::Unelevated),
..Default::default()
}),
..Default::default()
};
let mut entries = BTreeMap::new();
entries.insert("elevated_windows_sandbox".to_string(), /*value*/ true);
let profile = ConfigProfile {
features: Some(FeaturesToml::from(entries)),
..Default::default()
};
assert_eq!(
resolve_windows_sandbox_mode(&cfg, &profile),
Some(WindowsSandboxModeToml::Unelevated)
);
}
#[test]
fn resolve_windows_sandbox_mode_falls_back_to_legacy_keys() {
let mut entries = BTreeMap::new();