mirror of
https://github.com/openai/codex.git
synced 2026-11-20 22:40:37 +00:00
Fix daemon socket isolation checks for private tmp mounts (#46125)
## Why Private `/tmp` bind mounts can leave hidden entries in `/proc/self/mountinfo`, causing the Linux sandbox to reject layouts that safely isolate daemon sockets. The proc-mount preflight also needs the main sandbox's WSL masks when checking aliases. ## What changed - Identify the opened socket directory's mount using `fdinfo`, with a `statx` fallback, and follow its mount ancestry to distinguish hidden paths from exposed aliases. - Accept safe private and stacked mounts while rejecting covered mounts, exposed aliases, and nested mounts. Retain conservative checks when no mount ID is available. - Preserve WSL interop and WSLg masks in the proc-mount preflight. - Heap-allocate large lifecycle futures in the TUI approval-gated MCP tool test to reduce Windows test-thread stack usage. ## Testing Add mount-layout regression cases and a namespace integration test that verifies daemon sockets remain inaccessible under private `/tmp`, unrelated sockets remain reachable, and an exposed alias prevents startup. Add a preflight test for preserving WSL masks. GitOrigin-RevId: 289b4446ba7776a7dd57ef5ff09e87bda19b069c
This commit is contained in:
@@ -1091,11 +1091,12 @@ async fn local_daemon_registers_approval_gated_mcp_tools_for_both_start_paths()
|
||||
codex_home.path().join("config.toml"),
|
||||
"web_search = \"disabled\"\n",
|
||||
)?;
|
||||
let (mut app_server, mut requests, mut proxy) = start_recording_app_server(
|
||||
// Keep the large lifecycle futures off the Windows test thread's stack.
|
||||
let (mut app_server, mut requests, mut proxy) = Box::pin(start_recording_app_server(
|
||||
&app.config,
|
||||
/*blocked_thread_list*/ None,
|
||||
/*failed_thread_name*/ None,
|
||||
)
|
||||
))
|
||||
.await?;
|
||||
app_server
|
||||
.start_dynamic_tool_mcp(
|
||||
@@ -1190,14 +1191,13 @@ async fn local_daemon_registers_approval_gated_mcp_tools_for_both_start_paths()
|
||||
ThreadHistoryMode::Legacy,
|
||||
"Approved task source",
|
||||
)?;
|
||||
app_server
|
||||
.resume_thread(
|
||||
&app.local_settings,
|
||||
app.config.clone(),
|
||||
delegation_source,
|
||||
crate::app_server_session::ResumeModelSettings::RestoreFromThread,
|
||||
)
|
||||
.await?;
|
||||
Box::pin(app_server.resume_thread(
|
||||
&app.local_settings,
|
||||
app.config.clone(),
|
||||
delegation_source,
|
||||
crate::app_server_session::ResumeModelSettings::RestoreFromThread,
|
||||
))
|
||||
.await?;
|
||||
let resumed = recorded_params(&requests, "thread/resume")
|
||||
.pop()
|
||||
.expect("resumed task request");
|
||||
@@ -1205,14 +1205,13 @@ async fn local_daemon_registers_approval_gated_mcp_tools_for_both_start_paths()
|
||||
resumed["config"]["mcp_servers.codex_tui"],
|
||||
starts[0]["config"]["mcp_servers.codex_tui"]
|
||||
);
|
||||
app_server
|
||||
.resume_thread(
|
||||
&app.local_settings,
|
||||
app.config.clone(),
|
||||
delegation_source,
|
||||
crate::app_server_session::ResumeModelSettings::PreserveExistingThread,
|
||||
)
|
||||
.await?;
|
||||
Box::pin(app_server.resume_thread(
|
||||
&app.local_settings,
|
||||
app.config.clone(),
|
||||
delegation_source,
|
||||
crate::app_server_session::ResumeModelSettings::PreserveExistingThread,
|
||||
))
|
||||
.await?;
|
||||
let reattached = recorded_params(&requests, "thread/resume")
|
||||
.pop()
|
||||
.expect("reattached task request");
|
||||
@@ -1220,8 +1219,7 @@ async fn local_daemon_registers_approval_gated_mcp_tools_for_both_start_paths()
|
||||
reattached["config"]["mcp_servers.codex_tui"],
|
||||
starts[0]["config"]["mcp_servers.codex_tui"]
|
||||
);
|
||||
app_server
|
||||
.fork_thread(&app.local_settings, app.config.clone(), delegation_source)
|
||||
Box::pin(app_server.fork_thread(&app.local_settings, app.config.clone(), delegation_source))
|
||||
.await?;
|
||||
let forked = recorded_params(&requests, "thread/fork")
|
||||
.pop()
|
||||
@@ -1272,12 +1270,13 @@ async fn local_daemon_registers_approval_gated_mcp_tools_for_both_start_paths()
|
||||
paused.contains("TUI is reconnecting; tool was not sent"),
|
||||
"{paused}"
|
||||
);
|
||||
let (replacement, replacement_requests, replacement_proxy) = start_recording_app_server(
|
||||
&app.config,
|
||||
/*blocked_thread_list*/ None,
|
||||
/*failed_thread_name*/ None,
|
||||
)
|
||||
.await?;
|
||||
let (replacement, replacement_requests, replacement_proxy) =
|
||||
Box::pin(start_recording_app_server(
|
||||
&app.config,
|
||||
/*blocked_thread_list*/ None,
|
||||
/*failed_thread_name*/ None,
|
||||
))
|
||||
.await?;
|
||||
let (new_tx, new_rx) = mpsc::unbounded_channel();
|
||||
let new_sender = AppEventSender::new(new_tx);
|
||||
drop(events);
|
||||
|
||||
Reference in New Issue
Block a user