Skip to content

Always use private desktops for legacy Windows sandboxes #46554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copyberry merged 1 commit into from
Sep 19, 2026
Merged

Always use private desktops for legacy Windows sandboxes #46554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst
View file
Open in desktop
Binary file not shown.
Binary file modified codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion codex-rs/app-server-protocol/schema/typescript/v2/ConfigRequirements.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion codex-rs/app-server-protocol/src/protocol/v2/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,6 @@ pub struct ConfigRequirements {
pub check_for_update_on_startup: Option<bool>,
pub allow_login_shell: Option<bool>,
pub feedback: Option<FeedbackRequirements>,
pub windows_sandbox_private_desktop: Option<bool>,
}

#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
Expand Down
1 change: 0 additions & 1 deletion codex-rs/app-server-protocol/src/protocol/v2/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2159,7 +2159,6 @@ fn config_requirements_granular_allowed_approval_policy_is_marked_experimental()
check_for_update_on_startup: None,
allow_login_shell: None,
feedback: None,
windows_sandbox_private_desktop: None,
});

assert_eq!(reason, Some("askForApproval.granular"));
Expand Down
3 changes: 0 additions & 3 deletions codex-rs/app-server/src/command_exec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,6 @@ mod tests {
SandboxType::WindowsRestrictedToken,
vec![cwd],
WindowsSandboxLevel::Disabled,
/*windows_sandbox_private_desktop*/ false,
PermissionProfile::read_only(),
/*arg0*/ None,
)
Expand Down Expand Up @@ -837,7 +836,6 @@ mod tests {
SandboxType::None,
vec![cwd.clone()],
WindowsSandboxLevel::Disabled,
/*windows_sandbox_private_desktop*/ false,
PermissionProfile::read_only(),
/*arg0*/ None,
),
Expand Down Expand Up @@ -931,7 +929,6 @@ mod tests {
SandboxType::None,
vec![cwd],
WindowsSandboxLevel::Disabled,
/*windows_sandbox_private_desktop*/ false,
PermissionProfile::read_only(),
/*arg0*/ None,
),
Expand Down
7 changes: 3 additions & 4 deletions codex-rs/app-server/src/config_manager_service_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1696,7 +1696,7 @@ async fn read_materializes_default_allow_login_shell() {
}

#[tokio::test]
async fn write_value_allows_unmanaged_sibling_of_exact_requirement() {
async fn write_value_allows_unmanaged_setting_with_exact_requirement() {
let tmp = tempdir().expect("tempdir");
let path = tmp.path().join(CONFIG_TOML_FILE);
std::fs::write(&path, "").unwrap();
Expand All @@ -1707,8 +1707,7 @@ async fn write_value_allows_unmanaged_sibling_of_exact_requirement() {
LoaderOverrides::without_managed_config_for_tests(),
CloudConfigBundleFixture::loader_with_enterprise_requirement(
r#"
[windows]
sandbox_private_desktop = false
allow_login_shell = false
"#,
),
);
Expand All @@ -1722,7 +1721,7 @@ sandbox_private_desktop = false
expected_version: None,
})
.await
.expect("unmanaged sibling should remain writable");
.expect("unmanaged setting should remain writable");

assert!(
std::fs::read_to_string(path)
Expand Down
4 changes: 0 additions & 4 deletions codex-rs/app-server/src/request_processors/command_exec_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,6 @@ impl CommandExecRequestProcessor {
network_environment_id: None,
sandbox_permissions: SandboxPermissions::UseDefault,
windows_sandbox_level,
windows_sandbox_private_desktop: self
.config
.permissions
.windows_sandbox_private_desktop,
justification: None,
arg0: None,
};
Expand Down
7 changes: 0 additions & 7 deletions codex-rs/app-server/src/request_processors/config_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,6 @@ fn map_requirements_to_api(
}
None => ConfigRequirementsToml::default(),
};
let windows_sandbox_private_desktop = requirements
.windows
.as_ref()
.and_then(|windows| windows.sandbox_private_desktop);

Some(ConfigRequirements {
model_provider: requirements.model_provider,
Expand Down Expand Up @@ -539,7 +535,6 @@ fn map_requirements_to_api(
feedback: requirements.feedback.map(|feedback| FeedbackRequirements {
enabled: feedback.enabled,
}),
windows_sandbox_private_desktop,
})
}

Expand Down Expand Up @@ -1105,7 +1100,6 @@ mod tests {
codex_config::WindowsSandboxImplementationToml::Elevated,
codex_config::WindowsSandboxImplementationToml::Unelevated,
]),
sandbox_private_desktop: Some(false),
}),
..ConfigRequirementsToml::default()
});
Expand All @@ -1117,7 +1111,6 @@ mod tests {
WindowsSandboxImplementation::Unelevated,
])
);
assert_eq!(mapped.windows_sandbox_private_desktop, Some(false));
}

#[test]
Expand Down
2 changes: 0 additions & 2 deletions codex-rs/cli/src/debug_sandbox.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,6 @@ async fn run_command_under_sandbox(
sandbox_exe: Some(codex_self_exe.as_path()),
use_legacy_landlock: false,
windows_sandbox_level: codex_protocol::config_types::WindowsSandboxLevel::Disabled,
windows_sandbox_private_desktop: false,
})?;
let (program, args) = request
.command
Expand Down Expand Up @@ -587,7 +586,6 @@ async fn run_command_under_windows_session(
deny_write_paths_override: empty_paths,
tty: false,
stdin_open: true,
use_private_desktop: config.permissions.windows_sandbox_private_desktop,
})
.await;

Expand Down
Loading
Loading