openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-13 11:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(windows-sandbox): inline provisioning payload

Browse Source 
Co-authored-by: Codex noreply@openai.com
This commit is contained in:
viyatb-oai
2026-07-06 10:48:54 -07:00
parent b4da9f3690
commit 645b752bc0
1 changed files with 17 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
codex-rs/windows-sandbox-rs/src/setup.rs
View File

@@ -903,30 +903,6 @@ fn run_elevated_setup_inner(
run_setup_exe(&payload, needs_elevation, request.codex_home)
}
fn build_provisioning_payload(
codex_home: &Path,
real_user: &str,
settings: crate::WindowsSandboxProvisioningSettings,
) -> ElevationPayload {
ElevationPayload {
version: SETUP_VERSION,
offline_username: OFFLINE_USERNAME.to_string(),
online_username: ONLINE_USERNAME.to_string(),
codex_home: codex_home.to_path_buf(),
command_cwd: codex_home.to_path_buf(),
read_roots: Vec::new(),
write_roots: Vec::new(),
deny_read_paths: Vec::new(),
deny_write_paths: Vec::new(),
proxy_ports: settings.proxy_ports,
allow_local_binding: settings.allow_local_binding,
otel: codex_otel::global_statsig_metrics_settings(),
real_user: real_user.to_string(),
mode: SetupMode::ProvisionOnly,
refresh_only: false,
}
}
pub fn run_elevated_provisioning_setup(
codex_home: &Path,
real_user: &str,
@@ -950,7 +926,23 @@ pub fn run_elevated_provisioning_setup(
"sandbox provisioning setup must be run from an elevated process",
));
}
let payload = build_provisioning_payload(codex_home, real_user, settings);
let payload = ElevationPayload {
version: SETUP_VERSION,
offline_username: OFFLINE_USERNAME.to_string(),
online_username: ONLINE_USERNAME.to_string(),
codex_home: codex_home.to_path_buf(),
command_cwd: codex_home.to_path_buf(),
read_roots: Vec::new(),
write_roots: Vec::new(),
deny_read_paths: Vec::new(),
deny_write_paths: Vec::new(),
proxy_ports: settings.proxy_ports,
allow_local_binding: settings.allow_local_binding,
otel: codex_otel::global_statsig_metrics_settings(),
real_user: real_user.to_string(),
mode: SetupMode::ProvisionOnly,
refresh_only: false,
};
run_setup_exe(&payload, /*needs_elevation*/ false, codex_home)
}
@@ -1251,23 +1243,6 @@ mod tests {
);
}
#[test]
fn provisioning_payload_forwards_managed_proxy_settings() {
let codex_home = Path::new(r"C:\Users\test\.codex");
let payload = super::build_provisioning_payload(
codex_home,
"test-user",
crate::WindowsSandboxProvisioningSettings {
proxy_ports: vec![3128, 8081],
allow_local_binding: true,
},
);
assert_eq!(payload.proxy_ports, vec![3128, 8081]);
assert!(payload.allow_local_binding);
assert!(matches!(payload.mode, super::SetupMode::ProvisionOnly));
}
#[test]
fn report_helper_failure_uses_setup_error_report_when_clear_succeeded() {
let tmp = TempDir::new().expect("tempdir");