From 06402ecb7ca5c583f035941a88acc803ddaf9118 Mon Sep 17 00:00:00 2001 From: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com> Date: Sun, 6 Sep 2026 15:34:59 +0530 Subject: [PATCH] test(desktop): tighten the real-sh mutex quoting test Review follow-ups on the #96187 cherry-pick: skip on win32 like the sibling tests that shell out; reuse the file's `exec` helper; one temp root so a failing second mkdtemp cannot leak the shim dir; quote the shim's redirect target; guard the payload-prefix sentinel so a renamed loop marker can never make the test execute the real spawn payload; drop the lockMetadata fields the assertions never read. Move the mutexPath contract into withRemoteUpdateMutex's doc comment instead of a third inline restatement. --- .../desktop/electron/remote-lifecycle.test.ts | 58 +++++++------------ apps/desktop/electron/remote-lifecycle.ts | 5 +- 2 files changed, 23 insertions(+), 40 deletions(-) diff --git a/apps/desktop/electron/remote-lifecycle.test.ts b/apps/desktop/electron/remote-lifecycle.test.ts index 4ca82c2ed9..6cd596ae85 100644 --- a/apps/desktop/electron/remote-lifecycle.test.ts +++ b/apps/desktop/electron/remote-lifecycle.test.ts @@ -1849,14 +1849,10 @@ test('cleanupStale keeps the lockfile when even SIGKILL cannot confirm the pid d // The record must survive so the next connect's reap pass retries. assert.ok(!ssh.calls.some(c => /rm -f .*backend\.lock\.json/.test(c))) }) -test('buildSpawnCommand quotes expandRemotePath fragments exactly once (real sh parse)', async () => { - // Regression: expandRemotePath() returns an already-quoted shell fragment - // ("$HOME"'/path'). Wrapping such a fragment in shq() again ships literal - // quote characters to the remote: python received a mutex path named - // '"$HOME"'"'"'/…'"'"'', and the payload's `mkdir "$reservation"` spun - // forever on a path that can never exist, so every SSH backend spawn hung - // until the connect timeout. Parse the composed command with a real sh the - // way the remote login shell does, and require the paths to come out clean. +test.skipIf(process.platform === 'win32')('buildSpawnCommand quotes expandRemotePath fragments exactly once (real sh parse)', async () => { + // expandRemotePath() output is pre-quoted; a second shq() ships literal quote + // characters to the remote python. Parse the composed command with a real sh, + // as the remote login shell does, and require every path to come out clean. const cmd = buildSpawnCommand('/x/hermes', 'work', { hermesHome: '~/.hermes', logPath: spawnLogPath(OWNERSHIP_ID, SPAWN_NONCE), @@ -1864,58 +1860,44 @@ test('buildSpawnCommand quotes expandRemotePath fragments exactly once (real sh reservationNonce: SPAWN_NONCE, spawnNonce: SPAWN_NONCE, tokenFilePath: spawnTokenPath(OWNERSHIP_ID, SPAWN_NONCE), - lockMetadata: { - ownershipId: OWNERSHIP_ID, - spawnNonce: SPAWN_NONCE, - port: 0, - profile: 'work', - hermesPath: '/x/hermes', - hermesHome: '~/.hermes', - logPath: spawnLogPath(OWNERSHIP_ID, SPAWN_NONCE), - tokenFingerprint: fingerprintToken('stored-token'), - protocolVersion: PROTOCOL_VERSION, - startedAt: '2026-07-14T00:00:00.000Z' - } + lockMetadata: { ownershipId: OWNERSHIP_ID, spawnNonce: SPAWN_NONCE } }) // Capture the argv a remote shell would hand to python3, via a shim on PATH. - const shimDir = await mkdtemp(path.join(os.tmpdir(), 'hermes-argv-shim-')) - const fakeHome = await mkdtemp(path.join(os.tmpdir(), 'hermes-fake-home-')) + const root = await mkdtemp(path.join(os.tmpdir(), 'hermes-argv-shim-')) try { + const shimDir = path.join(root, 'shim') + const fakeHome = path.join(root, 'home') + await mkdir(shimDir) + await mkdir(fakeHome) const argvFile = path.join(shimDir, 'argv') - await writeFile( - path.join(shimDir, 'python3'), - `#!/bin/sh\nprintf '%s\\0' "$@" > ${argvFile}\n`, - { mode: 0o755 } - ) - await promisify(execCallback)(cmd, { + await writeFile(path.join(shimDir, 'python3'), `#!/bin/sh\nprintf '%s\\0' "$@" > '${argvFile}'\n`, { mode: 0o755 }) + await exec(cmd, { env: { ...process.env, PATH: `${shimDir}:${process.env.PATH}`, HOME: fakeHome } }) const argv = (await readFile(argvFile, 'utf8')).split('\0') // argv: ['-c', , , ] - const mutexPath = argv[2] assert.equal( - mutexPath, + argv[2], `${fakeHome}/.hermes/.hermes-update-in-progress.mutex`, 'mutex path must reach python fully expanded, with no quote characters' ) // The payload assigns reservation/lock/owner_file before its mkdir loop. - // Evaluate that prefix the way the remote sh does and require real paths. + // Evaluate only that prefix the way the remote sh does; never the loop itself. const payload = argv[3] - const prefix = payload.slice(0, payload.indexOf('i=0;')) - const { stdout } = await promisify(execCallback)( - `${prefix} printf '%s\\n' "$reservation" "$lock" "$owner_file"`, - { env: { ...process.env, HOME: fakeHome } } - ) + const loopStart = payload.indexOf('i=0;') + assert.ok(loopStart > 0, 'payload prefix sentinel missing') + const { stdout } = await exec(`${payload.slice(0, loopStart)} printf '%s\\n' "$reservation" "$lock" "$owner_file"`, { + env: { ...process.env, HOME: fakeHome } + }) const [reservation, lock, ownerFile] = stdout.split('\n') const base = `${fakeHome}/.hermes/desktop-ssh/${OWNERSHIP_ID}` assert.equal(reservation, `${base}/.connect.lock`) assert.equal(lock, `${base}/backend.lock.json`) assert.equal(ownerFile, `${base}/.connect.lock/owner`) } finally { - await rm(shimDir, { recursive: true, force: true }) - await rm(fakeHome, { recursive: true, force: true }) + await rm(root, { recursive: true, force: true }) } }) diff --git a/apps/desktop/electron/remote-lifecycle.ts b/apps/desktop/electron/remote-lifecycle.ts index 17c98a97f5..40108383cd 100644 --- a/apps/desktop/electron/remote-lifecycle.ts +++ b/apps/desktop/electron/remote-lifecycle.ts @@ -895,7 +895,9 @@ finally: // the marker check, spawns the backend, and publishes its initial lockfile. // Python keeps the descriptor close-on-exec by default and passes it explicitly // only to the intended outer shell; each detached child closes it before -// execing Hermes. +// execing Hermes. mutexPath is expandRemotePath() output — a complete shell +// word ("$HOME"'/…' or '/abs/…') embedded raw so $HOME expands remotely; a +// second shq() would hand python the quote characters as part of the path. function withRemoteUpdateMutex(command, mutexPath) { const script = ` import fcntl,os,subprocess,sys @@ -913,7 +915,6 @@ finally: sys.exit(result.returncode if result is not None else 1) `.trim() - // mutexPath is an expandRemotePath fragment — already quoted; do not shq again. return `python3 -c ${shq(script)} ${mutexPath} ${shq(command)}` }