puter/paseo
1
0
Fork 0
mirror of https://github.com/getpaseo/paseo.git synced 2026-10-14 13:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): check exact executable names and verify launch output

Browse Source
This commit is contained in:
paseo-bot[bot]
2026-10-13 10:09:47 +02:00
parent d04714a86d
commit a479d9c92a
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/executable-resolution/executable-resolution.ts
+2 -3
View File
@@ -130,8 +130,7 @@ export async function findExecutableWithoutProbing(
name: string,
options: { path?: string; cwd: string },
): Promise<string | null> {
const trimmed = name.trim();
if (!trimmed) {
if (!name) {
return null;
}
const path =
@@ -141,7 +140,7 @@ export async function findExecutableWithoutProbing(
.split(delimiter)
.map((entry) => resolve(options.cwd, entry))
.join(delimiter);
const candidates = await enumerateCandidatesViaLibrary(trimmed, { PATH: path });
const candidates = await enumerateCandidatesViaLibrary(name, { PATH: path });
return candidates[0] ?? null;
}
packages/server/src/terminal/terminal.test.ts
+25 -7
View File
@@ -663,7 +663,7 @@ describe("createTerminal", () => {
const binDir = mkdtempSync(join(tmpdir(), "terminal-envpath-bin-"));
temporaryDirs.push(binDir);
const toolPath = join(binDir, "paseo-qa-envpath-tool");
writeFileSync(toolPath, "#!/usr/bin/env bash\nsleep 30\n");
writeFileSync(toolPath, "#!/usr/bin/env bash\nprintf 'paseo-launch-ok\\n'\nsleep 30\n");
chmodSync(toolPath, 0o755);
const session = trackSession(
@@ -677,7 +677,8 @@ describe("createTerminal", () => {
}),
);
expect(session.id).toBeDefined();
await waitForLines(session, ["paseo-launch-ok"]);
expect(getLines(session.getState())[0]).toBe("paseo-launch-ok");
},
);
@@ -706,7 +707,7 @@ describe("createTerminal", () => {
temporaryDirs.push(projectDir);
mkdirSync(join(projectDir, "scripts"));
const scriptPath = join(projectDir, "scripts", "dev.sh");
writeFileSync(scriptPath, "#!/usr/bin/env bash\nsleep 30\n");
writeFileSync(scriptPath, "#!/usr/bin/env bash\nprintf 'paseo-launch-ok\\n'\nsleep 30\n");
chmodSync(scriptPath, 0o755);
const session = trackSession(
@@ -719,7 +720,8 @@ describe("createTerminal", () => {
}),
);
expect(session.id).toBeDefined();
await waitForLines(session, ["paseo-launch-ok"]);
expect(getLines(session.getState())[0]).toBe("paseo-launch-ok");
},
);
@@ -727,7 +729,7 @@ describe("createTerminal", () => {
const projectDir = mkdtempSync(join(tmpdir(), "terminal-absolute-cmd-"));
temporaryDirs.push(projectDir);
const scriptPath = join(projectDir, "run.sh");
writeFileSync(scriptPath, "#!/usr/bin/env bash\nsleep 30\n");
writeFileSync(scriptPath, "#!/usr/bin/env bash\nprintf 'paseo-launch-ok\\n'\nsleep 30\n");
chmodSync(scriptPath, 0o755);
const session = trackSession(
@@ -740,7 +742,8 @@ describe("createTerminal", () => {
}),
);
expect(session.id).toBeDefined();
await waitForLines(session, ["paseo-launch-ok"]);
expect(getLines(session.getState())[0]).toBe("paseo-launch-ok");
});
it("leaves the command check to the terminal itself on Windows", async () => {
@@ -1538,7 +1541,7 @@ it.runIf(isPlatform("linux", "darwin"))(
const projectDir = mkdtempSync(join(tmpdir(), "terminal-relative-path-"));
mkdirSync(join(projectDir, "bin"));
const script = join(projectDir, "bin", "paseo-relative-path-tool");
writeFileSync(script, "#!/bin/sh\nexec /bin/sleep 30\n");
writeFileSync(script, "#!/bin/sh\nprintf 'paseo-launch-ok\\n'\nexec /bin/sleep 30\n");
chmodSync(script, 0o755);
let session: TerminalSession | undefined;
try {
@@ -1548,6 +1551,8 @@ it.runIf(isPlatform("linux", "darwin"))(
command: "paseo-relative-path-tool",
env: { PATH: "bin" },
});
await waitForLines(session, ["paseo-launch-ok"]);
expect(getLines(session.getState())[0]).toBe("paseo-launch-ok");
expect(session.cwd).toBe(realpathSync(projectDir));
expect(session.getExitInfo()).toBeNull();
} finally {
@@ -1556,3 +1561,16 @@ it.runIf(isPlatform("linux", "darwin"))(
}
},
);
it.runIf(isPlatform("linux", "darwin"))(
"checks the exact command rather than accepting a trimmed executable name",
async () => {
await expect(
createTerminal({
workspaceId: "ws-test",
cwd: realpathSync(tmpdir()),
command: " node ",
}),
).rejects.toThrow(" node : command not found");
},
);