@@ -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}" ) ;
0 commit comments