Skip to content

OpenAI's Codex Security CLI and TypeScript SDK for finding, validating, and fixing security vulnerabilities. npm: https://www.npmjs.com/package/@openai/codex-security

test(deep-scan): check recovered coverage ownership (#1595)

Michael D'Angelo72120bdf7288
diff --git a/plugins/codex-security/tests/test_deep_coverage_recovery.py b/plugins/codex-security/tests/test_deep_coverage_recovery.py
index 39a13cbfb..74a91492c 100644
--- a/plugins/codex-security/tests/test_deep_coverage_recovery.py
+++ b/plugins/codex-security/tests/test_deep_coverage_recovery.py
@@ -91,6 +91,53 @@ def test_worker_projection_retains_independent_links_receipts_and_frozen_replay(
assert all(p.read_bytes() == contents for p, contents in originals.items())
+def test_partial_parent_without_arrays_retains_closed_worker_surface_and_frozen_replay(tmp_path):
+ surface = {"id": "api", "label": "API", "disposition": "needs_follow_up", "receiptRefs": []}
+ pending = saved_draft(
+ "coverage-scan",
+ surfaces=[surface],
+ deferred=[{"id": "review", "reason": "Review remains.", "surfaceIds": ["api"]}],
+ )
+ closed = saved_draft(
+ "coverage-scan",
+ complete=True,
+ surfaces=[{**surface, "disposition": "no_issue_found"}],
+ closures=[{"id": "review", "reason": "Review completed."}],
+ )
+ source = worker(tmp_path, "first", closed)
+ output = Path(source["artifact_dir"])
+ for modified, draft in [(100, pending), (200, closed)]:
+ checkpoint = write_checkpoint(output / "checkpoints", draft)
+ os.utime(checkpoint, ns=(modified, modified))
+ head = output / "checkpoint-head.json"
+ head.write_text(json.dumps({"checkpoint": checkpoint.name}))
+ os.utime(head, ns=(200, 200))
+ os.utime(output / "result.json", ns=(200, 200))
+ parent = saved_draft("coverage-scan")
+ parent["coverage"] = {
+ "mode": "deep_repository",
+ "inventoryStrategy": "repository",
+ "includePaths": ["."],
+ "excludePaths": [],
+ }
+ write_saved_parent(tmp_path, parent, 300)
+ originals = {path: path.read_bytes() for path in tmp_path.rglob("*.json")}
+ first = recover(tmp_path, [source], project=True)
+ replay = recover(tmp_path, [source], project=True, frozen=first[0]["scan"]["preservedSources"])
+ assert replay[2] == first[2]
+ for coverage in (first[2], replay[2]):
+ assert coverage["surfaces"] == [
+ {
+ **surface,
+ "id": "first/api",
+ "workerId": "first",
+ "disposition": "no_issue_found",
+ }
+ ]
+ assert [row["id"] for row in coverage["deferred"]] == ["scan-stopped"]
+ assert all(path.read_bytes() == contents for path, contents in originals.items())
+
+
@pytest.mark.parametrize("collision", [False, True])
@pytest.mark.parametrize("parent_has_worker_metadata", [False, True])
def test_worker_links_follow_final_ids_without_redirecting_parent_links(
diff --git a/plugins/codex-security/tests/test_saved_deferred_identity.py b/plugins/codex-security/tests/test_saved_deferred_identity.py
index 055165edb..6359b2648 100644
--- a/plugins/codex-security/tests/test_saved_deferred_identity.py
+++ b/plugins/codex-security/tests/test_saved_deferred_identity.py
@@ -16,7 +16,6 @@ from workbench_test_support import (
preserve_scan_results,
saved_discovery_worker,
saved_draft,
- worker_coverage_id,
write_checkpoint,
)
@@ -416,28 +415,30 @@ def test_generic_surface_recovery_uses_resolved_candidate_identity(
monkeypatch, saved_results, state, codex_home, scan_dir, scan_id
)
for coverage in (first_coverage, recovered):
- api_surfaces = [
- row for row in coverage["surfaces"] if row["id"] == worker_coverage_id(worker_id, "api")
- ]
+ api_surfaces = [row for row in coverage["surfaces"] if row["id"] == f"{worker_id}/api"]
assert len(api_surfaces) == 1
expected_disposition = "no_issue_found" if rejected_here else "needs_follow_up"
assert api_surfaces[0]["disposition"] == expected_disposition
+ assert api_surfaces[0]["workerId"] == worker_id
+ assert not any(row["id"] == candidate["id"] for row in coverage["deferred"])
+ assert not any(row["id"] in {"api", rejection["id"]} for row in coverage["surfaces"])
assert not any(
- row["id"] == worker_coverage_id(worker_id, generic["id"])
+ row["id"] in {generic["id"], f"{worker_id}/{generic['id']}"}
for row in coverage["deferred"]
)
assert (
- any(
- row["id"] == worker_coverage_id(worker_id, candidate["id"])
- for row in coverage["deferred"]
- )
+ any(row["id"] == f"{worker_id}/{candidate['id']}" for row in coverage["deferred"])
) is not rejected_here
if outcome != "unresolved":
assert {
**rejection,
- "id": worker_coverage_id(rejection_worker_id, rejection["id"]),
+ "id": f"{rejection_worker_id}/{rejection['id']}",
"workerId": rejection_worker_id,
} in coverage["surfaces"]
+ for row in coverage["deferred"]:
+ if row["id"] == f"{worker_id}/{candidate['id']}":
+ assert row["workerId"] == worker_id
+ assert row["surfaceIds"] == [api_surfaces[0]["id"]]
assert recovered["surfaces"] == first_coverage["surfaces"]
assert recovered["deferred"] == first_coverage["deferred"]
@@ -506,9 +507,12 @@ def test_split_deferred_rows_keep_distinct_ids_in_frozen_recovery(
assert len({row["id"] for row in retained}) == len(retained)
if explicit_ids:
assert {row["id"] for row in retained} == {
- worker_coverage_id(worker_id, identity) for identity in expected_ids
+ f"{worker_id}/{identity}" for identity in expected_ids
}
- assert all(row["id"] != worker_coverage_id(worker_id, combined["id"]) for row in retained)
+ assert all(
+ row["id"] not in {combined["id"], f"{worker_id}/{combined['id']}"} for row in retained
+ )
+ assert all(row["workerId"] == worker_id for row in retained)
if payload_field:
assert all(row[payload_field] == combined[payload_field] for row in retained)
assert replay == first_coverage
@@ -565,7 +569,7 @@ def test_unnamed_observation_does_not_replace_saved_context(
monkeypatch, saved_results, state, codex_home, scan_dir, scan_id
)
expected_output = (
- {**expected, "id": worker_coverage_id(worker_id, expected["id"]), "workerId": worker_id}
+ {**expected, "id": f"{worker_id}/{expected['id']}", "workerId": worker_id}
if layout == "worker"
else expected
)
@@ -573,6 +577,10 @@ def test_unnamed_observation_does_not_replace_saved_context(
for coverage in (first_coverage, replay):
pending = [row for row in coverage["deferred"] if row["id"] != "scan-stopped"]
assert expected_output in pending
+ if layout == "worker":
+ assert not any(row["id"] == broad["id"] for row in pending)
+ assert all(row.get("workerId") == worker_id for row in pending)
+ assert all(row["id"].startswith(f"{worker_id}/") for row in pending)
unnamed = [row for row in pending if row.get("id") != expected_output["id"]]
assert len(unnamed) == 1
assert {key: value for key, value in unnamed[0].items() if key != "id"} == expected_raw
diff --git a/plugins/codex-security/tests/test_workbench_checkpoint_heads.py b/plugins/codex-security/tests/test_workbench_checkpoint_heads.py
index 7ba90e1f7..125dcbd4c 100644
--- a/plugins/codex-security/tests/test_workbench_checkpoint_heads.py
+++ b/plugins/codex-security/tests/test_workbench_checkpoint_heads.py
@@ -25,7 +25,6 @@ from workbench_test_support import (
saved_draft,
scan_command,
start_delivered_scan,
- worker_coverage_id,
write_checkpoint,
write_completed_contract,
)
@@ -79,7 +78,7 @@ def test_late_head_changes_require_explicit_recovery(
assert any("/checkpoint-heads/" in path for path in frozen)
assert not any(path.endswith("checkpoint-head.json") for path in frozen)
assert not any(
- row["id"] == worker_coverage_id(worker_id, "review")
+ row["id"] in {"review", f"{worker_id}/review"}
for row in json.loads((scan_dir / "coverage.json").read_text())["deferred"]
)
assert get_scan(state, scan_id)["scan"]["resultsRecoveryNeeded"] is False
@@ -93,9 +92,15 @@ def test_late_head_changes_require_explicit_recovery(
recovered = scan_command(state, "recover-scan-results", scan_id, environment=environment)
assert recovered["scan"]["resultsRecoveryNeeded"] is False
coverage = json.loads((scan_dir / "coverage.json").read_text())
- assert any(
- row["id"] == worker_coverage_id(worker_id, "review") for row in coverage["deferred"]
- ) is (selection == "reopened")
+ assert not any(row["id"] == "review" for row in coverage["deferred"])
+ assert all(
+ row.get("workerId") == worker_id
+ for row in coverage["deferred"]
+ if row["id"] != "scan-stopped"
+ )
+ assert any(row["id"] == f"{worker_id}/review" for row in coverage["deferred"]) is (
+ selection == "reopened"
+ )
published = manifest_path.read_bytes()
scan_command(state, "recover-scan-results", scan_id, environment=environment)
assert manifest_path.read_bytes() == published
@@ -928,9 +933,10 @@ def test_parent_head_selection_matches_frozen_publication_retry(
json.loads((scan_dir / "coverage.json").read_text()),
)
for findings, coverage in (first[0], replay):
+ assert not any(row["id"] == child_work["id"] for row in coverage["deferred"])
assert {
**child_work,
- "id": worker_coverage_id(worker_id, child_work["id"]),
+ "id": f"{worker_id}/{child_work['id']}",
"workerId": worker_id,
} in coverage["deferred"]
if evidence == "deferred":
diff --git a/plugins/codex-security/tests/test_workbench_saved_source_order.py b/plugins/codex-security/tests/test_workbench_saved_source_order.py
index ed427f1e3..719f29618 100644
--- a/plugins/codex-security/tests/test_workbench_saved_source_order.py
+++ b/plugins/codex-security/tests/test_workbench_saved_source_order.py
@@ -15,7 +15,6 @@ from workbench_test_support import (
saved_binding,
saved_discovery_worker,
scan_command,
- worker_coverage_id,
write_checkpoint,
)
@@ -74,10 +73,13 @@ def test_failed_publication_keeps_order_after_identical_result_rewrite(
"standard-worker-thread",
)
coverage = json.loads((scan_dir / "coverage.json").read_text())
- assert (
- any(row["id"] == worker_coverage_id(worker_id, "review") for row in coverage["deferred"])
- is latest_pending
+ assert not any(row["id"] == "review" for row in coverage["deferred"])
+ assert all(
+ row.get("workerId") == worker_id
+ for row in coverage["deferred"]
+ if row["id"] != "scan-stopped"
)
+ assert any(row["id"] == f"{worker_id}/review" for row in coverage["deferred"]) is latest_pending
assert (
json.loads((scan_dir / "scan-manifest.json").read_text())["scan"]["preservedSources"]
== frozen
@@ -126,7 +128,14 @@ def test_head_capture_includes_checkpoint_published_after_enumeration(
)
assert len(published) == 1
coverage = json.loads((scan_dir / "coverage.json").read_text())
- expected_id = worker_coverage_id(worker_id, "review") if layout == "worker" else "review"
+ expected_id = f"{worker_id}/review" if layout == "worker" else "review"
+ if layout == "worker":
+ assert not any(row["id"] == "review" for row in coverage["deferred"])
+ assert all(
+ row.get("workerId") == worker_id
+ for row in coverage["deferred"]
+ if row["id"] != "scan-stopped"
+ )
assert any(row["id"] == expected_id for row in coverage["deferred"])
sources = json.loads((scan_dir / "scan-manifest.json").read_text())["scan"]["preservedSources"]
assert published[0].relative_to(scan_dir).as_posix() in sources
diff --git a/plugins/codex-security/tests/workbench_test_support.py b/plugins/codex-security/tests/workbench_test_support.py
index d9c7a0680..421dc01b7 100644
--- a/plugins/codex-security/tests/workbench_test_support.py
+++ b/plugins/codex-security/tests/workbench_test_support.py
@@ -94,10 +94,6 @@ def saved_binding(coverage_mode="repository", *, repository="test", status="inte
}
-def worker_coverage_id(worker_id: str, local_id: str) -> str:
- return f"{worker_id}/{local_id}"
-
-
def saved_discovery_worker(output: Path, worker_id: str = "worker", attempt: int = 1) -> dict:
return {
"id": worker_id,