OpenAI's Codex Security CLI and TypeScript SDK for finding, validating, and fixing security vulnerabilities. npm: https://www.npmjs.com/package/@openai/codex-security
TypeScript ai-securityapplication-securityclicode-scanningcodexcodex-securitycybersecuritydevsecopsnodejsnpmopenaisdksecuritytypescriptvulnerability-scanning
fix(sdk): skip work cancelled before it starts (#1733)
Michael D'Angelo7728491c2538
diff --git a/sdk/typescript/src/targets.ts b/sdk/typescript/src/targets.tsindex 2a87c8256..57999f7a1 100644--- a/sdk/typescript/src/targets.ts+++ b/sdk/typescript/src/targets.ts@@ -924,7 +924,10 @@ export async function abortable<T>(settle(value);};void Promise.resolve()- .then(operation)+ .then(() => {+ throwIfAborted(signal);+ return operation();+ }).then(finish(resolvePromise), finish(reject));});}diff --git a/sdk/typescript/tests-ts/targets.test.ts b/sdk/typescript/tests-ts/targets.test.tsindex 6a506394a..6d56cba22 100644--- a/sdk/typescript/tests-ts/targets.test.ts+++ b/sdk/typescript/tests-ts/targets.test.ts@@ -1,4 +1,5 @@import { execFileSync, spawnSync } from "node:child_process";+import { getEventListeners } from "node:events";import { existsSync } from "node:fs";import {chmod,@@ -24,6 +25,7 @@ import {type ScanTarget,} from "../src/index.js";import {+ abortable,enclosingGitWorktreeRoot,gitMarkerRoot,isGitMetadataDirectory,@@ -44,6 +46,101 @@ const { temporaryDirectory, cleanup, temporaryDirectories } =afterEach(cleanup);+describe("abortable", () => {+ test.each([+ { label: "error", reason: new Error("Canceled before execution") },+ { label: "object", reason: { message: "Canceled before execution" } },+ { label: "string", reason: "Canceled before execution" },+ { label: "zero", reason: 0 },+ { label: "false", reason: false },+ { label: "null", reason: null },+ { label: "default", reason: undefined },+ ])(+ "does not start canceled work with a $label reason",+ async ({ reason }) => {+ for (const beforeAdmission of [true, false]) {+ const controller = new AbortController();+ let calls = 0;+ if (beforeAdmission) controller.abort(reason);+ const pending = abortable(async () => {+ calls++;+ return "unused";+ }, controller.signal);+ if (!beforeAdmission) controller.abort(reason);+ if (reason === null)+ await expect(pending).rejects.toMatchObject({+ name: "AbortError",+ message: "The operation was aborted.",+ });+ else await expect(pending).rejects.toBe(controller.signal.reason);+ expect(calls).toBe(0);+ expect(getEventListeners(controller.signal, "abort")).toHaveLength(0);+ }+ },+ );++ test.each([false, true])(+ "preserves operation ordering with a signal: %p",+ async (withSignal) => {+ const controller = new AbortController();+ const order: string[] = [];+ const result = { completed: true };+ const pending = abortable(+ async () => {+ order.push("operation");+ return result;+ },+ withSignal ? controller.signal : undefined,+ );+ order.push("returned");+ expect(await pending).toBe(result);+ expect(order).toEqual(+ withSignal ? ["returned", "operation"] : ["operation", "returned"],+ );+ expect(getEventListeners(controller.signal, "abort")).toHaveLength(0);+ controller.abort(new Error("Canceled after completion"));+ expect(await pending).toBe(result);+ },+ );++ test("cancels started work without awaiting its late failure", async () => {+ const controller = new AbortController();+ const started = Promise.withResolvers<void>();+ const operation = Promise.withResolvers<void>();+ const pending = abortable(() => {+ started.resolve();+ return operation.promise;+ }, controller.signal);+ await started.promise;+ const reason = new Error("Canceled while running");+ controller.abort(reason);+ await expect(pending).rejects.toBe(reason);+ expect(getEventListeners(controller.signal, "abort")).toHaveLength(0);+ operation.reject(new Error("Late operation failure"));+ await expect(pending).rejects.toBe(reason);+ });++ test.each(["resolve", "reject"])(+ "preserves cancellation before a queued %s is observed",+ async (settlement) => {+ const controller = new AbortController();+ const started = Promise.withResolvers<void>();+ const operation = Promise.withResolvers<number>();+ const pending = abortable(() => {+ started.resolve();+ return operation.promise;+ }, controller.signal);+ await started.promise;+ if (settlement === "resolve") operation.resolve(7);+ else operation.reject(new Error("Queued operation failure"));+ const reason = new Error("Canceled before settlement");+ controller.abort(reason);+ await expect(pending).rejects.toBe(reason);+ expect(getEventListeners(controller.signal, "abort")).toHaveLength(0);+ },+ );+});+async function repository(name = "repo"): Promise<string> {const root = await temporaryDirectory();const repo = join(root, name);