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
ci: verify merge parents after a pull request retarget (#1948)
Michael D'Angelo16f36603151f
diff --git a/.github/scripts/select-ci-checks.mjs b/.github/scripts/select-ci-checks.mjsindex 002e99bbc..327d6aba8 100644--- a/.github/scripts/select-ci-checks.mjs+++ b/.github/scripts/select-ci-checks.mjs@@ -1,5 +1,5 @@import { execFileSync } from "node:child_process";-import { appendFileSync } from "node:fs";+import { appendFileSync, readFileSync } from "node:fs";import { pathToFileURL } from "node:url";const documentation =@@ -84,6 +84,23 @@ if () {const event = process.env.EVENT_NAME;const baseChanged = process.env.BASE_CHANGED === "true";+ if (event === "pull_request" && baseChanged) {+ const { base, head } = JSON.parse(+ readFileSync(process.env.GITHUB_EVENT_PATH, "utf8"),+ ).pull_request;+ const parents = execFileSync("git", ["show", "-s", "--format=%P", "HEAD"], {+ encoding: "utf8",+ }).trim();+ const expected = `${base.sha} ${head.sha}`;+ console.log(+ `Requested base ${base.ref}. Expected merge parents ${expected}. Checked out ${parents}.`,+ );+ if (parents !== expected) {+ throw new Error(+ "GitHub supplied a stale test merge. After the merge ref updates, reopen the pull request to start a fresh source run. Rerunning this attempt uses the same commit.",+ );+ }+ }const paths =event === "pull_request" && !baseChanged? execFileSync(diff --git a/sdk/typescript/tests-ts/workflow-quality.test.ts b/sdk/typescript/tests-ts/workflow-quality.test.tsindex 418a9895e..e77346eef 100644--- a/sdk/typescript/tests-ts/workflow-quality.test.ts+++ b/sdk/typescript/tests-ts/workflow-quality.test.ts@@ -195,7 +195,7 @@ bashTest(},);-test("classification reads the PR merge diff rather than unrelated base changes", async () => {+test("classification uses the PR merge diff and validates retargeted merge parents", async () => {const scope = ci.jobs["classify-changes"]!.steps.find((step) => step.name === "Select required checks",)!;@@ -235,20 +235,23 @@ test("classification reads the PR merge diff rather than unrelated base changes"git("add", ".");git("commit", "-m", "Independent base change");git("merge", "--no-ff", "docs", "-m", "Merge fixture");- const result = spawnSync(- command!,- [fileURLToPath(new URL(`../../../${script}`, import.meta.url))],- {- cwd: repository,- encoding: "utf8",- env: {- ...process.env,- EVENT_NAME: "pull_request",- BASE_CHANGED: "false",- GITHUB_OUTPUT: output,+ const classify = (env: Record<string, string> = {}) =>+ spawnSync(+ command!,+ [fileURLToPath(new URL(`../../../${script}`, import.meta.url))],+ {+ cwd: repository,+ encoding: "utf8",+ env: {+ ...process.env,+ EVENT_NAME: "pull_request",+ BASE_CHANGED: "false",+ GITHUB_OUTPUT: output,+ ...env,+ },},- },- );+ );+ const result = classify();expect(result.status, result.stderr).toBe(0);const outputs = Object.fromEntries((await readFile(output, "utf8"))@@ -259,6 +262,39 @@ test("classification reads the PR merge diff rather than unrelated base changes"expect(outputs["source-required"]).toBe("false");expect(outputs["container-validate"]).toBe("false");expect(outputs["workflow-quality"]).toBe("false");++ const base = git("rev-parse", "HEAD^1").trim();+ const head = git("rev-parse", "docs").trim();+ const old = git("rev-parse", "HEAD^1^1").trim();+ const eventPath = join(directory, "event.json");+ for (const [expectedBase, expectedHead, valid] of [+ [base, head, true],+ [old, head, false],+ [base, old, false],+ ] as const) {+ await writeFile(+ eventPath,+ JSON.stringify({+ pull_request: {+ base: { ref: "main", sha: expectedBase },+ head: { sha: expectedHead },+ },+ }),+ );+ await writeFile(output, "");+ const retarget = classify({+ BASE_CHANGED: "true",+ GITHUB_EVENT_PATH: eventPath,+ });+ expect(retarget.status, retarget.stderr).toBe(valid ? 0 : 1);+ const selection = await readFile(output, "utf8");+ if (valid) expect(selection).toContain("workflow-quality=true");+ else {+ expect(retarget.stdout).toContain(`${base} ${head}`);+ expect(retarget.stderr).toContain("stale test merge");+ expect(selection).toBe("");+ }+ }} finally {await rm(directory, { recursive: true, force: true });}