Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions sdk/typescript/src/targets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,20 @@ export async function normalizeTarget(
`Path target is outside the repository: ${value}`,
);
}
let metadata;
try {
metadata = await abortable(() => stat(canonical), signal);
} catch (error) {
throwIfAborted(signal);
throw new InvalidTargetError(`Path target does not exist: ${value}`, {
cause: error,
});
}
if (!metadata.isFile() && !metadata.isDirectory()) {
throw new InvalidTargetError(
`Path target must be a regular file or directory: ${value}`,
);
}
const normalized = relativePath.split(sep).join("/") || ".";
if (!paths.includes(normalized)) {
paths.push(normalized);
Expand Down
46 changes: 46 additions & 0 deletions sdk/typescript/tests-ts/path-target-special-files.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { createServer } from "node:net";
import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { expect, test } from "bun:test";
import { normalizeTarget } from "../src/targets.js";

test.skipIf(process.platform === "win32")(
"rejects special filesystem nodes during path-target preflight",
async () => {
const root = await mkdtemp(join(tmpdir(), "codex-security-special-target-"));
const repository = join(root, "repository");
const socketPath = join(repository, "target.sock");
await mkdir(repository);
const server = createServer();

try {
await new Promise<void>((resolvePromise, reject) => {
server.once("error", reject);
server.listen(socketPath, () => resolvePromise());
});

await expect(normalizeTarget(repository, [socketPath])).rejects.toThrow(

Check failure on line 23 in sdk/typescript/tests-ts/path-target-special-files.test.ts

View workflow job for this annotation

GitHub Actions / macos-latest / node-22

error: expect(received).toThrow(expected)

Expected substring: "Path target must be a regular file or directory" Received message: "Path target does not exist: /Users/runner/work/_temp/codex-security-special-target-ij8lSX/repository/target.sock" at <anonymous> (/Users/runner/work/codex-security/codex-security/sdk/typescript/tests-ts/path-target-special-files.test.ts:23:71)
"Path target must be a regular file or directory",
);
} finally {
await new Promise<void>((resolvePromise) => server.close(() => resolvePromise()));
await rm(root, { recursive: true, force: true });
}
},
);

test("keeps ordinary file and directory path targets valid", async () => {
const root = await mkdtemp(join(tmpdir(), "codex-security-regular-target-"));
const repository = join(root, "repository");
try {
await mkdir(join(repository, "src"), { recursive: true });
await writeFile(join(repository, "src", "app.ts"), "export {};\n");

await expect(
normalizeTarget(repository, ["src/app.ts", "src"]),
).resolves.toEqual({ kind: "paths", paths: ["src/app.ts", "src"] });
} finally {
await rm(root, { recursive: true, force: true });
}
});
Loading