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

refactor(plugin): share artifact path validation during finalization (#2222)

Michael D'Angelod23c86fa0930
diff --git a/plugins/codex-security/scripts/finalize_scan_contract.py b/plugins/codex-security/scripts/finalize_scan_contract.py
index 98efc61d6..3ae1c062c 100644
--- a/plugins/codex-security/scripts/finalize_scan_contract.py
+++ b/plugins/codex-security/scripts/finalize_scan_contract.py
@@ -1842,6 +1842,18 @@ def _validate_coverage(manifest: dict[str, Any], coverage: dict[str, Any], scan_
_require_safe_json_value(coverage, "coverage.json")
+def _require_unique_artifact_path(artifact: Any, context: str, collision_keys: set[str]) -> str:
+ if not isinstance(artifact, dict):
+ raise ContractError(f"{context}: expected an object")
+ value = _require_str(artifact, "path", context)
+ path = _require_portable_relative_path(value, f"{context}.path")
+ collision_key = path.lower()
+ if collision_key in collision_keys:
+ raise ContractError(f"{context}.path: duplicate artifact path")
+ collision_keys.add(collision_key)
+ return path
+
+
def _validate_manifest(manifest: dict[str, Any]) -> None:
if manifest.get("documentType") != "codex-security.scan-manifest":
raise ContractError("manifest.documentType: expected codex-security.scan-manifest")
@@ -1873,16 +1885,8 @@ def _validate_manifest(manifest: dict[str, Any]) -> None:
artifact_collision_keys: set[str] = set()
for index, artifact in enumerate(artifacts):
context = f"manifest.scan.artifacts[{index}]"
- if not isinstance(artifact, dict):
- raise ContractError(f"{context}: expected an object")
- path = _require_portable_relative_path(
- _require_str(artifact, "path", context), f"{context}.path"
- )
- collision_key = path.lower()
- if collision_key in artifact_collision_keys:
- raise ContractError(f"{context}.path: duplicate artifact path")
+ path = _require_unique_artifact_path(artifact, context, artifact_collision_keys)
artifact_paths.add(path)
- artifact_collision_keys.add(collision_key)
_require_str(artifact, "sha256", context)
_require_str(artifact, "mediaType", context)
for required_path in ("findings.json", *(["coverage.json"] if "coverageRef" in scan else [])):
@@ -2776,15 +2780,7 @@ def _validate_existing_seal(
artifact_collision_keys: set[str] = set()
for index, artifact in enumerate(artifacts):
context = f"manifest.scan.artifacts[{index}]"
- if not isinstance(artifact, dict):
- raise ContractError(f"{context}: expected an object")
- path = _require_portable_relative_path(
- _require_str(artifact, "path", context), f"{context}.path"
- )
- collision_key = path.lower()
- if collision_key in artifact_collision_keys:
- raise ContractError(f"{context}.path: duplicate artifact path")
- artifact_collision_keys.add(collision_key)
+ path = _require_unique_artifact_path(artifact, context, artifact_collision_keys)
expected_sha256 = _require_str(artifact, "sha256", context)
contents = (artifact_contents or {}).get(path)
actual_sha256 = (