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
refactor: simplify publication reconciliation (#1455)
mldangelo-oai0e3460ccc452
diff --git a/sdk/typescript/src/publication-store.ts b/sdk/typescript/src/publication-store.tsindex 82895d867..52bbb02f6 100644--- a/sdk/typescript/src/publication-store.ts+++ b/sdk/typescript/src/publication-store.ts@@ -107,10 +107,9 @@ export async function recordPublishedIssues(}return created.map((value, index) => {- const expectedIssue = ordered[index];+ const expectedIssue = ordered[index]!;const issue = readPublicationRecord(value);if (- expectedIssue === undefined ||issue.findingId !== expectedIssue.findingId ||issue.occurrenceId !== expectedIssue.occurrenceId ||issue.issueIdentifier !== expectedIssue.issueIdentifier ||diff --git a/sdk/typescript/src/publish.ts b/sdk/typescript/src/publish.tsindex fdb6cbda4..255ebf0b8 100644--- a/sdk/typescript/src/publish.ts+++ b/sdk/typescript/src/publish.ts@@ -1086,23 +1086,24 @@ function reconcilePublicationEvidence(const byOwner = Map.groupBy(evidence, (item) => item.ownerFindingId);const claimLedger = new Map<string,- {- kinds: Set<PublicationClaim["kind"]>;- owners: Set<string | undefined>;- }+ { kind: PublicationClaim["kind"]; owner: string | undefined }>();-+ const collidingOwners = new Set<string>();for (const item of evidence) {for (const claim of item.resolution.claims) {for (const alias of publicationClaimAliases(claim)) {- const key = alias.value;- const reservation = claimLedger.get(key) ?? {- kinds: new Set<PublicationClaim["kind"]>(),- owners: new Set<string | undefined>(),- };- reservation.kinds.add(alias.kind);- reservation.owners.add(item.ownerFindingId);- claimLedger.set(key, reservation);+ const reservation = claimLedger.get(alias.value);+ const owner = item.ownerFindingId;+ if (reservation === undefined) {+ claimLedger.set(alias.value, { kind: alias.kind, owner });+ } else if (+ reservation.kind !== alias.kind ||+ reservation.owner !== owner+ ) {+ if (reservation.owner !== undefined)+ collidingOwners.add(reservation.owner);+ if (owner !== undefined) collidingOwners.add(owner);+ }}}}@@ -1112,14 +1113,6 @@ function reconcilePublicationEvidence();let indeterminate = outcomes.some((outcome) => outcome.indeterminate);- const collidingOwners = new Set<string>();- for (const reservation of claimLedger.values()) {- if (reservation.kinds.size > 1 || reservation.owners.size > 1) {- for (const owner of reservation.owners) {- if (owner !== undefined) collidingOwners.add(owner);- }- }- }for (const outcome of outcomes) {if (!collidingOwners.has(outcome.issue.findingId)) continue;outcome.created = undefined;diff --git a/sdk/typescript/tests-ts/publish.test.ts b/sdk/typescript/tests-ts/publish.test.tsindex 74a9e949f..167734f2a 100644--- a/sdk/typescript/tests-ts/publish.test.ts+++ b/sdk/typescript/tests-ts/publish.test.ts@@ -391,6 +391,15 @@ async function writeHandoff();}+function publicationHandoffRoot(injected: PublishScanDependencies): string {+ return join(+ injected.environment!["CODEX_SECURITY_STATE_DIR"]!,+ "publications",+ "linear",+ "handoffs",+ );+}+async function publicationEventsFile(handoffFile: string): Promise<string> {const directory = dirname(handoffFile);const files = (await readdir(directory)).filter(@@ -801,13 +810,7 @@ describe("direct Linear API publication", () => {),).toBe(false);- const stateDirectory = injected.environment!["CODEX_SECURITY_STATE_DIR"]!;- const handoffRoot = join(- stateDirectory,- "publications",- "linear",- "handoffs",- );+ const handoffRoot = publicationHandoffRoot(injected);const handoffDirectories = await readdir(handoffRoot);expect(handoffDirectories).toHaveLength(1);const handoffRecords = await readJsonLines<Record<string, unknown>>(@@ -964,13 +967,7 @@ describe("direct Linear API publication", () => {counts: { findings: 3, created: 1, failed: 2 },});- const stateDirectory = injected.environment!["CODEX_SECURITY_STATE_DIR"]!;- const handoffRoot = join(- stateDirectory,- "publications",- "linear",- "handoffs",- );+ const handoffRoot = publicationHandoffRoot(injected);const handoffDirectories = await readdir(handoffRoot);expect(handoffDirectories).toHaveLength(1);const handoff = await readFile(@@ -1060,13 +1057,7 @@ describe("direct Linear API publication", () => {...(skipExisting ? { skipped: 1 } : {}),},});- const stateDirectory = injected.environment!["CODEX_SECURITY_STATE_DIR"]!;- const handoffRoot = join(- stateDirectory,- "publications",- "linear",- "handoffs",- );+ const handoffRoot = publicationHandoffRoot(injected);const handoffDirectories = await readdir(handoffRoot);expect(handoffDirectories).toHaveLength(1);expect(@@ -2740,12 +2731,7 @@ describe("connected Linear publication", () => {publishScanInternal(publication.scanDirectory, OPTIONS, injected),).rejects.toThrow("The Codex executable could not be resolved.");- const handoffRoot = join(- injected.environment!["CODEX_SECURITY_STATE_DIR"]!,- "publications",- "linear",- "handoffs",- );+ const handoffRoot = publicationHandoffRoot(injected);expect(await stat(handoffRoot).then(() => false,@@ -2771,12 +2757,7 @@ describe("connected Linear publication", () => {publishScanInternal(publication.scanDirectory, OPTIONS, injected),).rejects.toThrow("Could not start Codex for Linear publication.");- const handoffRoot = join(- injected.environment!["CODEX_SECURITY_STATE_DIR"]!,- "publications",- "linear",- "handoffs",- );+ const handoffRoot = publicationHandoffRoot(injected);expect(await readdir(handoffRoot)).toEqual([]);expect(persisted).not.toHaveBeenCalled();});