Select the elevated Windows sandbox for network proxies (#33445)

## Why

Windows firewall enforcement is tied to the logon-user sandbox identities. Proxy-enforced commands therefore need the elevated backend even when the configured sandbox mode is the default restricted-token mode.

## What changed

- Select the elevated Windows sandbox backend whenever a command uses the managed network proxy.
- Remove configuration and startup checks that required users or managed requirements to select the elevated sandbox explicitly.
- Start and expose managed network proxy state consistently on Windows.

## Testing

- Verify that proxy enforcement selects the elevated backend for the restricted-token sandbox mode.

GitOrigin-RevId: e01ac052587721c468a8fbcf4e2c7c5a185a3e05
This commit is contained in:
iceweasel-oai authored and copyberry committed 2026-07-15 23:19:00 +00:00
1 parent 7d1218a997
commit 4bc2c723ef
23 files changed
+58 -496

No files matched your search

+2 -98
View File
@@ -99,92 +99,6 @@ use serde::Deserialize;
use tempfile::tempdir;
use super::*;
async fn load_config_with_elevated_only_windows_sandbox_requirement(
cfg: ConfigToml,
overrides: ConfigOverrides,
codex_home: AbsolutePathBuf,
) -> std::io::Result<Config> {
let requirements_toml = ConfigRequirementsToml {
windows: Some(codex_config::WindowsRequirementsToml {
allowed_sandbox_implementations: Some(vec![WindowsSandboxModeToml::Elevated]),
}),
..Default::default()
};
let mut requirements_with_sources = codex_config::ConfigRequirementsWithSources::default();
requirements_with_sources.merge_unset_fields(
codex_config::RequirementSource::Unknown,
requirements_toml.clone(),
);
let requirements = ConfigRequirements::try_from(requirements_with_sources)?;
let config_layer_stack = ConfigLayerStack::new(Vec::new(), requirements, requirements_toml)?;
Config::load_config_with_layer_stack(
codex_exec_server::LOCAL_FS.as_ref(),
cfg,
overrides,
codex_home,
config_layer_stack,
)
.await
}
#[test]
fn windows_network_proxy_validation() {
let elevated_only = ConfigRequirementsToml {
windows: Some(codex_config::WindowsRequirementsToml {
allowed_sandbox_implementations: Some(vec![WindowsSandboxModeToml::Elevated]),
}),
..Default::default()
};
for (is_windows, requirements, network_proxy_enabled, allowed) in [
(true, ConfigRequirementsToml::default(), true, false),
(true, ConfigRequirementsToml::default(), false, true),
(true, elevated_only, true, true),
(
true,
ConfigRequirementsToml {
windows: Some(codex_config::WindowsRequirementsToml {
allowed_sandbox_implementations: Some(vec![
WindowsSandboxModeToml::Elevated,
WindowsSandboxModeToml::Unelevated,
]),
}),
..Default::default()
},
true,
false,
),
(false, ConfigRequirementsToml::default(), true, true),
] {
assert_eq!(
validate_windows_network_proxy_requirements_for_platform(
is_windows,
&requirements,
network_proxy_enabled,
)
.is_ok(),
allowed
);
}
for (is_windows, sandbox_level, network_proxy_enabled, allowed) in [
(true, WindowsSandboxLevel::Disabled, true, false),
(true, WindowsSandboxLevel::RestrictedToken, true, false),
(true, WindowsSandboxLevel::Elevated, true, true),
(true, WindowsSandboxLevel::RestrictedToken, false, true),
(false, WindowsSandboxLevel::RestrictedToken, true, true),
] {
assert_eq!(
validate_windows_sandbox_network_proxy_compatibility_for_platform(
is_windows,
sandbox_level,
network_proxy_enabled,
)
.is_ok(),
allowed
);
}
}
use core_test_support::PathBufExt;
use core_test_support::PathExt;
use core_test_support::TempDirExt;
@@ -1652,7 +1566,7 @@ async fn network_proxy_feature_matrix_preserves_sandbox_network_semantics() -> s
..Default::default()
},
};
let config = load_config_with_elevated_only_windows_sandbox_requirement(
let config = Config::load_from_base_config_with_overrides(
base_config,
ConfigOverrides {
cwd: Some(cwd.path().to_path_buf()),
@@ -1697,13 +1611,6 @@ sandbox = "elevated"
)?;
let config = ConfigBuilder::without_managed_config_for_tests()
.codex_home(codex_home.path().to_path_buf())
.cloud_config_bundle(
CloudConfigBundleFixture::loader_with_enterprise_requirement(
r#"[windows]
allowed_sandbox_implementations = ["elevated"]
"#,
),
)
.cli_overrides(vec![
(
"features.network_proxy.enabled".to_string(),
@@ -1836,9 +1743,6 @@ async fn experimental_network_requirements_enable_proxy_without_feature() -> std
r#"
[experimental_network]
enabled = true
[windows]
allowed_sandbox_implementations = ["elevated"]
"#,
),
)
@@ -1862,7 +1766,7 @@ allowed_sandbox_implementations = ["elevated"]
async fn network_proxy_feature_uses_profile_network_proxy_settings() -> std::io::Result<()> {
let codex_home = TempDir::new()?;
let cwd = TempDir::new()?;
let config = load_config_with_elevated_only_windows_sandbox_requirement(
let config = Config::load_from_base_config_with_overrides(
ConfigToml {
features: Some(toml::from_str("network_proxy = true").expect("valid features")),
default_permissions: Some("dev".to_string()),