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(workbench): restore applied state after verification cancellation (#1819)
Michael D'Angeloa68cc683f30e
diff --git a/plugins/codex-security/scripts/workbench_remediation.py b/plugins/codex-security/scripts/workbench_remediation.pyindex a8ecc4f8c..4fea9793f 100644--- a/plugins/codex-security/scripts/workbench_remediation.py+++ b/plugins/codex-security/scripts/workbench_remediation.py@@ -147,7 +147,11 @@ def cancel_finding_remediation_request(connection.execute("""UPDATE finding_remediation_attempts- SET pending_action = NULL, pending_action_claimed_at = NULL,+ SET state = CASE+ WHEN pending_action = 'verify' AND state = 'verifying' THEN 'applied'+ ELSE state+ END,+ pending_action = NULL, pending_action_claimed_at = NULL,pending_action_claim_token = NULL, pending_action_delivered_at = NULL,version = version + 1, updated_at = ?WHERE request_id = ? AND pending_action_claim_token = ?diff --git a/plugins/codex-security/tests/test_workbench_remediation_cancellation.py b/plugins/codex-security/tests/test_workbench_remediation_cancellation.pyindex 49ea51086..6fccd5a09 100644--- a/plugins/codex-security/tests/test_workbench_remediation_cancellation.py+++ b/plugins/codex-security/tests/test_workbench_remediation_cancellation.py@@ -5,8 +5,10 @@ import subprocessimport uuidfrom pathlib import Path+import pytestfrom workbench_test_support import (cancel_remediation_request,+ mark_remediation_delivered,request_remediation,request_remediation_action,run_workbench,@@ -17,7 +19,10 @@ from workbench_test_support import ()-def test_cancel_finding_remediation_request_restores_previous_state(tmp_path: Path) -> None:[email protected]("verification_started", [False, True])+def test_cancel_finding_remediation_request_restores_previous_state(+ tmp_path: Path, verification_started: bool+) -> None:state_dir = tmp_path / "state"target = tmp_path / "target"target.mkdir()@@ -108,14 +113,39 @@ def test_cancel_finding_remediation_request_restores_previous_state(tmp_path: Pa)["scan"]verify_token = str(uuid.uuid4())- request_remediation_action(+ verify_requested = request_remediation_action(state_dir,occurrence_id,request_id,str(applied["findings"][0]["remediationState"]["version"]),"verify",verify_token,+ )["scan"]["findings"][0]["remediationState"]+ if verification_started:+ mark_remediation_delivered(state_dir, occurrence_id, request_id, verify_token)+ verify_requested = set_remediation(+ state_dir,+ occurrence_id,+ request_id,+ verify_token,+ str(verify_requested["version"]),+ "verifying",+ "--base-revision",+ "unversioned",+ )["scan"]["findings"][0]["remediationState"]+ wrong_owner = run_workbench(+ state_dir,+ "cancel-finding-remediation-request",+ "--occurrence-id",+ occurrence_id,+ "--request-id",+ request_id,+ "--action-token",+ str(uuid.uuid4()),+ check=False,)+ assert wrong_owner["returncode"] != 0+ assert "owned by a different action token" in wrong_owner["stderr"]canceled_verify = cancel_remediation_request(state_dir, occurrence_id, request_id, verify_token)["scan"]@@ -123,3 +153,34 @@ def test_cancel_finding_remediation_request_restores_previous_state(tmp_path: Paassert restored_after_verify["state"] == "applied"assert restored_after_verify["pendingAction"] is Noneassert restored_after_verify["actionClaimToken"] is None+ assert restored_after_verify["actionClaimedAt"] is None+ assert restored_after_verify["actionDeliveredAt"] is None+ assert restored_after_verify["version"] == verify_requested["version"] + 1+ assert restored_after_verify["patchPath"] == patch_path.name+ assert restored_after_verify["patchDigest"] == verify_requested["patchDigest"]+ assert source.read_text() == "fixed\n"+ replayed_verify = cancel_remediation_request(+ state_dir, occurrence_id, request_id, verify_token+ )["scan"]["findings"][0]["remediationState"]+ assert replayed_verify == restored_after_verify++ stale_update = set_remediation(+ state_dir,+ occurrence_id,+ request_id,+ verify_token,+ str(verify_requested["version"]),+ "failed",+ check=False,+ )+ assert stale_update["returncode"] != 0+ assert "This remediation request changed" in stale_update["stderr"]+ retried_verify = request_remediation_action(+ state_dir,+ occurrence_id,+ request_id,+ str(restored_after_verify["version"]),+ "verify",+ str(uuid.uuid4()),+ )["scan"]["findings"][0]["remediationState"]+ assert retried_verify["pendingAction"] == "verify"diff --git a/plugins/codex-security/tests/test_workbench_remediation_retry.py b/plugins/codex-security/tests/test_workbench_remediation_retry.pyindex d0fd1f282..9a37d5916 100644--- a/plugins/codex-security/tests/test_workbench_remediation_retry.py+++ b/plugins/codex-security/tests/test_workbench_remediation_retry.py@@ -189,12 +189,28 @@ def test_failed_remediation_steps_can_retry_or_regenerate(tmp_path: Path) -> Nonassert failed["pendingAction"] == "verify"assert failed["actionClaimToken"] is Noneassert failed["actionDeliveredAt"] is None+ canceled = cancel_remediation_request(state_dir, occurrence_id, request_id, verify_token)[+ "scan"+ ]["findings"][0]["remediationState"]+ assert canceled == failedverify_retry_token = str(uuid.uuid4())claim_remediation_resend(state_dir, occurrence_id, request_id, verify_retry_token)delivered = mark_remediation_delivered(state_dir, occurrence_id, request_id, verify_retry_token)["scan"]["findings"][0]["remediationState"]assert delivered["actionDeliveredAt"]+ canceled = cancel_remediation_request(state_dir, occurrence_id, request_id, verify_retry_token)[+ "scan"+ ]["findings"][0]["remediationState"]+ assert canceled["state"] == "failed"+ assert canceled["pendingAction"] == "verify"+ assert canceled["summary"] == failed["summary"]+ assert canceled["version"] == failed["version"]+ assert canceled["actionClaimToken"] is None+ assert canceled["actionClaimedAt"] is None+ assert canceled["actionDeliveredAt"] is None+ verify_retry_token = str(uuid.uuid4())+ claim_remediation_resend(state_dir, occurrence_id, request_id, verify_retry_token)verified = update_remediation(state_dir,occurrence_id,diff --git a/sdk/typescript/tests-ts/runtime-zip-descriptor.test.ts b/sdk/typescript/tests-ts/runtime-zip-descriptor.test.tsindex 3c81706e6..3935bda8c 100644--- a/sdk/typescript/tests-ts/runtime-zip-descriptor.test.ts+++ b/sdk/typescript/tests-ts/runtime-zip-descriptor.test.ts@@ -1,7 +1,8 @@-import { spawnSync } from "node:child_process";+import { execFile, spawnSync } from "node:child_process";import { writeFile } from "node:fs/promises";import { join } from "node:path";import { fileURLToPath } from "node:url";+import { promisify } from "node:util";import { afterEach, expect, test } from "bun:test";import { strToU8, zipSync } from "fflate";import { createApiTestFixtures } from "./support/temporary-directories.js";@@ -40,7 +41,7 @@ for (const scenario of [const fifo = spawnSync("mkfifo", [join(root, "replacement.fifo")]);expect(fifo.status, fifo.stderr?.toString()).toBe(0);}- const child = spawnSync(+ const child = await promisify(execFile)(process.execPath,[fileURLToPath(@@ -51,8 +52,6 @@ for (const scenario of [],{ encoding: "utf8", timeout: 10_000, killSignal: "SIGKILL" },);- expect(child.error, child.stderr).toBeUndefined();- expect(child.status, child.stderr).toBe(0);expect(JSON.parse(child.stdout)).toEqual({ scenario, passed: true });},);