fix(buddy): 缩短沙箱私有目录以适配 macOS socket 限制

Author: shanyuhai123

apps/buddy/electron/main/sandbox/registerSandboxHostRpc.ts

@@ -1,10 +1,10 @@
 import type { RuntimeRpcPeerContract } from '../../../shared/runtime/rpcPeer'
-import { mkdir, mkdtemp, realpath, rm } from 'node:fs/promises'
-import { homedir, tmpdir } from 'node:os'
-import { join } from 'node:path'
+import { rm } from 'node:fs/promises'
+import { homedir } from 'node:os'
 import process from 'node:process'
 import { utilityProcess } from 'electron'
 import { createProxyEnvironment } from '../../../platform/process/proxyEnvironment'
+import { createSandboxDirectory } from '../../../platform/process/sandboxDirectory'
 import { createSandboxEnvironment } from '../../../platform/process/sandboxEnvironment'
 import { resolveWindowsSandbox } from '../../../platform/process/windowsSandbox'
 import sandboxProcessPath from '../../../service/src/sandbox/sandboxProcess?modulePath'
@@ -61,8 +61,7 @@ export function registerSandboxHostRpc(peer: RuntimeRpcPeerContract, options: Sa
           return { ok: false, code: 'SANDBOX_UNAVAILABLE' }
         if (isLinux(process.platform) && !options.sandboxDirectory)
           return { ok: false, code: 'SANDBOX_UNAVAILABLE' }
-        directory = await realpath(await mkdtemp(join(tmpdir(), 'lexora-shell-')))
-        await Promise.all(['home', 'tmp'].map(path => mkdir(join(directory!, path), { mode: 0o700 })))
+        directory = await createSandboxDirectory()
         controller.signal.throwIfAborted()
         child = utilityProcess.fork(sandboxProcessPath, [], {
           cwd: directory,

apps/buddy/platform/process/sandboxDirectory.ts

@@ -0,0 +1,18 @@
+import { mkdir, mkdtemp, realpath, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import process from 'node:process'
+import { isWindows } from '../../shared/platform/identifiers'
+
+export async function createSandboxDirectory(): Promise<string> {
+  const directory = await mkdtemp(join(isWindows(process.platform) ? tmpdir() : '/tmp', 'lexora-shell-'))
+  try {
+    const canonical = await realpath(directory)
+    await Promise.all(['home', 'tmp'].map(path => mkdir(join(canonical, path), { mode: 0o700 })))
+    return canonical
+  }
+  catch (error) {
+    await rm(directory, { recursive: true, force: true })
+    throw error
+  }
+}

apps/buddy/service/src/sandbox/__tests__/macosSandbox.spec.ts

@@ -8,6 +8,7 @@ import { join, resolve } from 'node:path'
 import process from 'node:process'
 import { setTimeout } from 'node:timers/promises'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createSandboxDirectory } from '../../../../platform/process/sandboxDirectory'
 import { createSandboxEnvironment } from '../../../../platform/process/sandboxEnvironment'
 import { runSrtSandbox } from '../backends/srt/runSrtSandbox'
 import { runSandboxCommand } from '../runSandboxCommand'
@@ -21,14 +22,15 @@ describe.skipIf(process.platform !== 'darwin' || process.arch !== 'arm64')('macO
   let directory: string
   let workspace: string
   let outside: string
+  let privateRoot: string
   let input: SandboxProcessInput
 
   beforeEach(async () => {
     directory = await realpath(await mkdtemp(join(tmpdir(), 'lexora-macos-sandbox-')))
     workspace = join(directory, 'workspace')
     outside = join(directory, 'outside')
-    const privateRoot = join(directory, 'private')
-    await Promise.all([workspace, outside, join(privateRoot, 'home'), join(privateRoot, 'tmp')].map(path => mkdir(path, { recursive: true })))
+    privateRoot = await createSandboxDirectory()
+    await Promise.all([workspace, outside].map(path => mkdir(path, { recursive: true })))
     await writeFile(join(outside, 'preserved'), 'outside-preserved')
     const isolatedEnvironment = createSandboxEnvironment(environment, privateRoot)
     for (const key of new Set([...Object.keys(process.env), ...Object.keys(isolatedEnvironment)]))
@@ -56,7 +58,7 @@ describe.skipIf(process.platform !== 'darwin' || process.arch !== 'arm64')('macO
   afterEach(async () => {
     process.chdir(buddyRoot)
     vi.unstubAllEnvs()
-    await rm(directory, { recursive: true, force: true })
+    await Promise.all([directory, privateRoot].map(path => rm(path, { recursive: true, force: true })))
   })
 
   async function execute(command: string, overrides: Partial<SandboxProcessInput> = {}, options: Partial<Parameters<typeof runSandboxCommand>[1]> = {}) {

apps/buddy/service/src/sandbox/__tests__/shellSandbox.spec.ts

@@ -8,6 +8,7 @@ import { join, resolve } from 'node:path'
 import process from 'node:process'
 import { setTimeout } from 'node:timers/promises'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createSandboxDirectory } from '../../../../platform/process/sandboxDirectory'
 import { createSandboxEnvironment } from '../../../../platform/process/sandboxEnvironment'
 import { runSandboxCommand } from '../runSandboxCommand'
 
@@ -20,14 +21,15 @@ describe.skipIf(process.platform !== 'linux')('linux shell enforcement', () => {
   let directory: string
   let workspace: string
   let outside: string
+  let privateRoot: string
   let input: SandboxProcessInput
 
   beforeEach(async () => {
     directory = await mkdtemp(join(tmpdir(), 'lexora-sandbox-test-'))
     workspace = join(directory, 'workspace')
     outside = join(directory, 'outside')
-    const privateRoot = join(directory, 'private')
-    await Promise.all([workspace, outside, join(privateRoot, 'home'), join(privateRoot, 'tmp')].map(path => mkdir(path, { recursive: true })))
+    privateRoot = await createSandboxDirectory()
+    await Promise.all([workspace, outside].map(path => mkdir(path, { recursive: true })))
     await writeFile(join(outside, 'preserved'), 'outside-preserved')
     const environment = createSandboxEnvironment(originalEnvironment, privateRoot)
     for (const key of new Set([...Object.keys(process.env), ...Object.keys(environment)]))
@@ -55,7 +57,7 @@ describe.skipIf(process.platform !== 'linux')('linux shell enforcement', () => {
   afterEach(async () => {
     process.chdir(buddyRoot)
     vi.unstubAllEnvs()
-    await rm(directory, { force: true, recursive: true })
+    await Promise.all([directory, privateRoot].map(path => rm(path, { force: true, recursive: true })))
   })
 
   async function execute(command: string, options: Partial<Parameters<typeof runSandboxCommand>[1]> = {}, overrides: Partial<SandboxProcessInput> = {}) {