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): stop snapshot copies at directory links (#1751)
Michael D'Angelo1337a7f5b38a
diff --git a/plugins/codex-security/scripts/workbench_target.py b/plugins/codex-security/scripts/workbench_target.pyindex 8d1c53c46..30a567c8a 100644--- a/plugins/codex-security/scripts/workbench_target.py+++ b/plugins/codex-security/scripts/workbench_target.py@@ -984,9 +984,8 @@ def copy_git_worktree_files(continuesource_path = repository / relativetry:- if _WINDOWS:- source_path = _directory_link_boundary(repository, source_path, linked_prefixes)- relative = source_path.relative_to(repository)+ source_path = _directory_link_boundary(repository, source_path, linked_prefixes)+ relative = source_path.relative_to(repository)metadata = source_path.lstat()except FileNotFoundError:continuediff --git a/plugins/codex-security/tests/test_workbench_target.py b/plugins/codex-security/tests/test_workbench_target.pyindex f4f1c32bd..69ab4410a 100644--- a/plugins/codex-security/tests/test_workbench_target.py+++ b/plugins/codex-security/tests/test_workbench_target.py@@ -292,6 +292,90 @@ def test_versioned_reviewed_patch_preserves_nested_junctions(assert (outside / "external.txt").read_text() == "outside contents\n"+ "link_kind",+ [+ pytest.param("absolute", marks=pytest.mark.cross_platform),+ pytest.param("relative", marks=pytest.mark.cross_platform),+ pytest.param(+ "junction",+ marks=[+ pytest.mark.native_windows,+ pytest.mark.skipif(os.name != "nt", reason="requires native Windows junctions"),+ ],+ ),+ ],+)[email protected]("nested", [False, True], ids=["direct", "nested"])[email protected]("unrelated_change", [False, True], ids=["reviewed", "unrelated"])+def test_reviewed_patch_does_not_copy_through_indexed_directory_links(+ tmp_path: Path,+ monkeypatch: pytest.MonkeyPatch,+ link_kind: str,+ nested: bool,+ unrelated_change: bool,+) -> None:+ import workbench_db++ repository = tmp_path / "source" / "repository"+ repository.parent.mkdir()+ revision = initialize_git_repository(repository)+ source = repository / "component"+ link = source / ("linked/nested" if nested else "linked")+ link.mkdir(parents=True)+ (link / "file.txt").write_text("indexed child\n")+ (source / "app.txt").write_text("before\n")+ subprocess.run(["git", "add", "component"], cwd=repository, check=True)+ shutil.rmtree(link)+ outside = tmp_path / "outside"+ outside.mkdir()+ (outside / "file.txt").write_text("original outside contents\n")+ if link_kind == "junction":+ subprocess.run(["cmd", "/c", "mklink", "/J", str(link), str(outside)], check=True)+ else:+ link_target = (+ "../" * (4 if nested else 3) + "outside" if link_kind == "relative" else str(outside)+ )+ link.symlink_to(link_target, target_is_directory=True)+ original_link = os.readlink(link)++ staging = tmp_path / "staging"+ sentinel = staging / "outside"+ sentinel.mkdir(parents=True)+ (sentinel / "file.txt").write_text("staged outside sentinel\n")+ # A relative link resolves to this different directory after materialization.+ monkeypatch.setattr(workbench_db.tempfile, "tempdir", str(staging))+ scan_dir = tmp_path / "scan"+ scan_dir.mkdir(mode=0o700)+ patch = b"diff --git a/app.txt b/app.txt\n--- a/app.txt\n+++ b/app.txt\n@@ -1 +1 @@\n-before\n+after\n"+ (scan_dir / "reviewed.patch").write_bytes(patch)+ scan = {+ "target_path": str(source),+ "target_inode": source.stat().st_ino,+ "target_revision": revision,+ "scan_dir": str(scan_dir),+ }+ remediation = {+ "base_revision": revision,+ "base_content_digest": workbench_db.worktree_content_digest(source),+ "patch_digest": "sha256:" + hashlib.sha256(patch).hexdigest(),+ }+ (source / "app.txt").write_text("after\n")+ if unrelated_change:+ (source / "unrelated.txt").write_text("outside the reviewed patch\n")+ with pytest.raises(SystemExit, match="changes outside the reviewed patch"):+ workbench_db.require_reviewed_patch_applied(scan, remediation, "reviewed.patch")+ else:+ assert workbench_db.require_reviewed_patch_applied(+ scan, remediation, "reviewed.patch"+ ) == workbench_db.worktree_content_digest(source)+ assert (outside / "file.txt").read_text() == "original outside contents\n"+ assert (sentinel / "file.txt").read_text() == "staged outside sentinel\n"+ assert (source / "app.txt").read_text() == "after\n"+ assert os.readlink(link) == original_link+ assert list(staging.iterdir()) == [sentinel]++@pytest.mark.parametrize("case",[