Skip to content

Commit 03b1beb

Browse files
fix(desktop-mcp): harden cross-window drag and bridge socket path
Reject overlapping-window element drags and refuse symlink bridge directories so background drag and Unix socket setup fail closed. Co-authored-by: Cursor <[email protected]>
1 parent 0616bb1 commit 03b1beb

2 files changed

Lines changed: 47 additions & 6 deletions

File tree

‎native/t3-desktop-mcp-rs/src/browser.rs‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,45 @@ fn bridge_socket_path() -> Option<PathBuf> {
5252
std::env::temp_dir().join(format!("t3-desktop-mcp-{uid}"))
5353
};
5454

55-
if let Err(error) = std::fs::create_dir_all(&dir) {
56-
eprintln!("t3-desktop-mcp: bridge dir create failed: {error}");
57-
return None;
58-
}
5955
use std::os::unix::fs::{MetadataExt, PermissionsExt};
60-
let metadata = match std::fs::metadata(&dir) {
56+
57+
// `create_dir_all` / `metadata` / `set_permissions` follow symlinks. A
58+
// pre-planted `/tmp/t3-desktop-mcp-{uid}` → victim-dir symlink would let us
59+
// chmod someone else's directory and drop `bridge.sock` there. Reject
60+
// symlinks via `symlink_metadata` before and after create.
61+
match std::fs::symlink_metadata(&dir) {
62+
Ok(meta) if meta.file_type().is_symlink() => {
63+
eprintln!("t3-desktop-mcp: bridge dir is a symlink; refusing");
64+
return None;
65+
}
66+
Ok(_) => {}
67+
Err(error) if error.kind() == std::io::ErrorKind::NotFound => {
68+
if let Err(error) = std::fs::create_dir_all(&dir) {
69+
eprintln!("t3-desktop-mcp: bridge dir create failed: {error}");
70+
return None;
71+
}
72+
}
73+
Err(error) => {
74+
eprintln!("t3-desktop-mcp: bridge dir metadata failed: {error}");
75+
return None;
76+
}
77+
}
78+
79+
let metadata = match std::fs::symlink_metadata(&dir) {
80+
Ok(meta) if meta.file_type().is_symlink() => {
81+
eprintln!("t3-desktop-mcp: bridge dir became a symlink; refusing");
82+
return None;
83+
}
6184
Ok(metadata) => metadata,
6285
Err(error) => {
6386
eprintln!("t3-desktop-mcp: bridge dir metadata failed: {error}");
6487
return None;
6588
}
6689
};
90+
if !metadata.is_dir() {
91+
eprintln!("t3-desktop-mcp: bridge path is not a directory");
92+
return None;
93+
}
6794
if metadata.uid() != unsafe { libc::getuid() } {
6895
eprintln!("t3-desktop-mcp: bridge dir not owned by current user");
6996
return None;
@@ -73,7 +100,11 @@ fn bridge_socket_path() -> Option<PathBuf> {
73100
return None;
74101
}
75102
// Re-check mode after chmod — refuse a sticky/world-writable directory.
76-
let mode = match std::fs::metadata(&dir) {
103+
let mode = match std::fs::symlink_metadata(&dir) {
104+
Ok(meta) if meta.file_type().is_symlink() => {
105+
eprintln!("t3-desktop-mcp: bridge dir became a symlink after chmod; refusing");
106+
return None;
107+
}
77108
Ok(metadata) => metadata.mode() & 0o777,
78109
Err(error) => {
79110
eprintln!("t3-desktop-mcp: bridge dir re-stat failed: {error}");

‎native/t3-desktop-mcp/Sources/main.swift‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,16 @@ func toolDrag(_ args: [String: Any]) -> String {
12781278
} else {
12791279
target = underStart
12801280
}
1281+
// Reject element→element drags across windows even when the destination
1282+
// center still lies inside the source frame (overlapping windows).
1283+
if let target,
1284+
let toElementID = args["to_element_id"] as? String,
1285+
let destinationElement = Registry.get(toElementID),
1286+
let destination = windowTarget(for: destinationElement),
1287+
destination.pid != target.pid || destination.wid != target.wid
1288+
{
1289+
return "error: cross-window drag is not supported — keep the drag inside one window"
1290+
}
12811291
// Only treat as cross-window when the endpoint is outside the source frame.
12821292
// `windowTarget(under:)` is frontmost-first, so using it for every drag would
12831293
// reject legitimate background drags under an occluding window.

0 commit comments

Comments
 (0)