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(reports): preserve distinct fixes from merged findings (#905)
mldangelo-oaie9aceb43b719
diff --git a/plugins/codex-security/scripts/report_projection.py b/plugins/codex-security/scripts/report_projection.pyindex eb36ec65f..df84891b5 100644--- a/plugins/codex-security/scripts/report_projection.py+++ b/plugins/codex-security/scripts/report_projection.py@@ -480,6 +480,52 @@ def _surface_notes(surface: dict[str, Any]) -> str:return _cell(f"{notes} Evidence: {evidence}")+def _remediation_section(finding: dict[str, Any]) -> list[str]:+ remediation = _text(finding.get("remediation"), "No canonical remediation was recorded.")+ lines = ["", "#### Remediation", "", remediation]+ seen = {remediation}+ originals: list[tuple[str, dict[str, Any]]] = []+ pending = [("finding", finding)]+ seen_findings: set[int] = set()+ while pending:+ source_id, original = pending.pop()+ if id(original) in seen_findings:+ continue+ seen_findings.add(id(original))+ originals.append((source_id, original))+ provenance = original.get("provenance")+ if not isinstance(provenance, dict):+ continue+ previous = provenance.get("previousFindings")+ if isinstance(previous, list):+ pending.extend(+ (source_id, item) for item in reversed(previous) if isinstance(item, dict)+ )+ sources = provenance.get("sourceFindings")+ if isinstance(sources, list):+ pending.extend(+ (_text(source.get("id"), "finding"), source["finding"])+ for source in reversed(sources)+ if isinstance(source, dict) and isinstance(source.get("finding"), dict)+ )+ for source_id, original in originals[1:]:+ text = _text(original.get("remediation"), "")+ if text and text not in seen:+ seen.add(text)+ lines.extend(["", f"Source {source_id}: {text}"])+ for field, label in (+ ("remediationTests", "Tests"),+ ("preventiveControls", "Preventive controls"),+ ):+ values = list(+ dict.fromkeys(+ value for _, original in originals for value in _strings(original.get(field))+ )+ )+ lines.extend(_bullet_section(f"{label}:", values))+ return lines++def _finding_header(number: int, finding: dict[str, Any]) -> list[str]:cwes = ", ".join(finding["taxonomy"]["cwe"]) or "none"title = _text(finding["title"], "Untitled finding")@@ -676,26 +722,21 @@ def _finding_section(number: int, finding: dict[str, Any]) -> list[str]:lines.extend(["", f"{label} assessment:", *(f"- **{name}:** {value}" for name, value in details)])- lines.extend(- [- "",- "#### Remediation",- "",- _text(finding["remediation"], "No canonical remediation was recorded."),- ]- )- lines.extend(_bullet_section("Tests:", _strings(finding.get("remediationTests"))))- lines.extend(- _bullet_section("Preventive controls:", _strings(finding.get("preventiveControls")))- )+ lines.extend(_remediation_section(finding))return linesdef _linked_finding_section(number: int, finding: dict[str, Any], report_path: str) -> list[str]:link = f"[detailed technical write-up]({report_path})"lines = _finding_header(number, finding)- for heading in ("Summary", "Validation", "Dataflow", "Reachability", "Severity", "Remediation"):+ for heading in ("Summary", "Validation", "Dataflow", "Reachability", "Severity"):lines.extend(["", f"#### {heading}", "", f"See the {link}."])+ if any(+ finding.get("provenance", {}).get(field) for field in ("sourceFindings", "previousFindings")+ ):+ lines.extend(_remediation_section(finding))+ else:+ lines.extend(["", "#### Remediation", "", f"See the {link}."])return linesdiff --git a/plugins/codex-security/tests/test_deep_scan_successful_publication.py b/plugins/codex-security/tests/test_deep_scan_successful_publication.pyindex 4fbb5376c..5a733b847 100644--- a/plugins/codex-security/tests/test_deep_scan_successful_publication.py+++ b/plugins/codex-security/tests/test_deep_scan_successful_publication.py@@ -173,6 +173,89 @@ def assert_published_aggregate(scan):assert (scan.scan_dir / "report.md").is_file()[email protected]("mode", ["standard", "deep", "deep-nested"])[email protected]("linked_writeup", [False, True], ids=["inline", "linked"])+def test_publication_renders_each_source_remediation(+ workbench_api, workbench_db, publication_scan, mode, linked_writeup+):+ scan = publication_scan(mode="deep" if mode == "deep-nested" else mode)+ finding = scan.findings[0]+ first = copy.deepcopy(finding)+ first["provenance"] = {"source": "local_plugin"}+ first["remediation"] = "Check the destination before writing the archive entry."+ first["remediationTests"] = ["Reject an archive entry outside the destination."]+ second = copy.deepcopy(first)+ second["remediation"] = "Reject symbolic links before opening the destination."+ second["remediationTests"] = ["Reject a symbolic link inside the destination."]+ second["preventiveControls"] = ["Use a directory-relative file handle."]+ third = copy.deepcopy(second)+ third["remediationTests"].append("Reject a dangling symbolic link.")+ third["preventiveControls"].append("Resolve links relative to the destination directory.")+ fourth = copy.deepcopy(first)+ fourth["remediation"] = "Create the output file exclusively."+ fourth["remediationTests"] = ["Preserve an existing destination file."]+ sources = [first, second, third, fourth]+ finding["remediation"] = first["remediation"]+ finding["remediationTests"] = first["remediationTests"]+ if mode == "standard":+ # Standard completion itself consolidates these duplicate logical findings.+ scan.findings[:] = sources+ finding = first+ elif mode == "deep-nested":+ nested = copy.deepcopy(second)+ nested["provenance"]["previousFindings"] = [third]+ nested["provenance"]["sourceFindings"] = [{"id": "review-4:0", "finding": fourth}]+ finding["provenance"]["sourceFindings"] = [+ {"id": "review-1:0", "finding": first},+ {"id": "review-2:0", "finding": nested},+ ]+ else:+ finding["provenance"]["sourceFindings"] = [+ {"id": f"review-{index}:0", "finding": source}+ for index, source in enumerate(sources, 1)+ ]+ if linked_writeup:+ finding["writeup"] = {"reportPath": "findings/archive/archive.md"}+ writeup = scan.scan_dir / "findings" / "archive" / "archive.md"+ writeup.parent.mkdir(parents=True)+ writeup.write_text("# Archive extraction\n\nRepresentative source writeup.\n")+ writeup_bytes = writeup.read_bytes()+ (scan.scan_dir / "findings.json").write_text(json.dumps({"findings": scan.findings}))++ completed = complete(workbench_api, workbench_db, scan)++ assert completed["progress"]["status"] == "complete"+ if mode == "standard":+ published = json.loads((scan.scan_dir / "findings.json").read_text())["findings"]+ assert len(published) == 1+ canonical = published[0]+ assert "sourceFindings" not in canonical["provenance"]+ retained = [canonical, *canonical["provenance"].pop("previousFindings")]+ for source in retained:+ for field in ("findingId", "occurrenceId", "fingerprints"):+ value = source.pop(field)+ assert value+ assert retained == sources+ coverage = json.loads((scan.scan_dir / "coverage.json").read_text())+ for field in ("documentType", "schemaVersion", "scanId"):+ coverage.pop(field)+ assert coverage == scan.coverage+ else:+ assert_published_aggregate(scan)+ report = (scan.scan_dir / "report.md").read_text()+ if linked_writeup:+ assert "findings/archive/archive.md" in report+ assert writeup.read_bytes() == writeup_bytes+ for source in sources:+ assert report.count(source["remediation"]) == 1+ for test in source["remediationTests"]:+ assert report.count(test) == 1+ for control in source.get("preventiveControls", []):+ assert report.count(control) == 1+ positions = [report.index(text) for text in dict.fromkeys(s["remediation"] for s in sources)]+ assert positions == sorted(positions)++@pytest.mark.parametrize("scope", [".", "subdir"], ids=["repository", "scoped"])def test_deep_publication_keeps_configured_scope_without_worker_observations(workbench_api, workbench_db, publication_scan, scopediff --git a/plugins/codex-security/tests/test_report_projection.py b/plugins/codex-security/tests/test_report_projection.pyindex f0f7cf2b7..888219b40 100644--- a/plugins/codex-security/tests/test_report_projection.py+++ b/plugins/codex-security/tests/test_report_projection.py@@ -63,6 +63,63 @@ def test_projection_normalizes_structured_fields() -> None:assert "Text: ## Injected remediation - unsafe instruction" in markdown[email protected]("linked_writeup", [False, True], ids=["inline", "linked"])+def test_projection_retains_distinct_source_fixes(linked_writeup: bool) -> None:+ manifest, findings, coverage = canonical_documents()+ finding = findings["findings"][0]+ if linked_writeup:+ finding["writeup"] = {"reportPath": "findings/parser/parser.md"}+ finding["remediation"] = "Validate the record length."+ finding["remediationTests"] = ["Reject a record longer than the allowed size."]+ finding["preventiveControls"] = ["Centralize record validation."]+ finding["provenance"] = {+ "sourceFindings": [+ {"id": "review-1:0", "finding": {"remediation": "Validate the record length."}},+ {+ "id": "review-2:0",+ "finding": {+ "remediation": "Reject duplicate record keys.",+ "remediationTests": [+ "Reject a record longer than the allowed size.",+ "Cover duplicate keys in parser tests.",+ ],+ "preventiveControls": [+ "Centralize record validation.",+ "Track keys while parsing a record.",+ ],+ },+ },+ {+ "id": "review-3:0",+ "finding": {+ "remediation": "Reject duplicate record keys.",+ "remediationTests": [+ "Cover duplicate keys in parser tests.",+ "Reject case-variant duplicate keys.",+ ],+ "preventiveControls": ["Track keys while parsing a record."],+ },+ },+ ]+ }++ markdown = PROJECTION.build_report_markdown(manifest, findings, coverage)++ if linked_writeup:+ assert "findings/parser/parser.md" in markdown+ assert "Source review-2:0: Reject duplicate record keys." in markdown+ for text in (+ "Validate the record length.",+ "Reject duplicate record keys.",+ "Reject a record longer than the allowed size.",+ "Cover duplicate keys in parser tests.",+ "Reject case-variant duplicate keys.",+ "Centralize record validation.",+ "Track keys while parsing a record.",+ ):+ assert markdown.count(text) == 1++def test_projection_renders_inline_code_and_section_code_evidence() -> None:manifest, findings, coverage = canonical_documents()finding = findings["findings"][0]