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

fix(inventory): include tracked ignored files in component scans (#1768)

Michael D'Angelo84f2a01caee1
diff --git a/plugins/codex-security/scripts/generate_in_scope_files.py b/plugins/codex-security/scripts/generate_in_scope_files.py
index 00e0b5c21..cdcacde9a 100644
--- a/plugins/codex-security/scripts/generate_in_scope_files.py
+++ b/plugins/codex-security/scripts/generate_in_scope_files.py
@@ -121,7 +121,7 @@ def generate_in_scope_files(repository: Path, scope: str, output: Path) -> int:
message = f"{message}: {detail}"
raise InventoryError(message)
- if (repository / ".git").exists():
+ if any((parent / ".git").exists() for parent in (repository, *repository.parents)):
try:
tracked = git_command(
repository,
diff --git a/plugins/codex-security/tests/test_generate_in_scope_files.py b/plugins/codex-security/tests/test_generate_in_scope_files.py
index 3ed4f46d3..ebd9962ea 100644
--- a/plugins/codex-security/tests/test_generate_in_scope_files.py
+++ b/plugins/codex-security/tests/test_generate_in_scope_files.py
@@ -159,19 +159,30 @@ def test_absolute_scope_still_produces_repository_relative_paths(tmp_path: Path)
assert all(not Path(line).is_absolute() for line in output.read_text().splitlines())
[email protected]("selected_path", [".", "component"])
[email protected]("linked_worktree", [False, True])
def test_inventory_keeps_ignored_tracked_files_without_ignored_untracked_files(
- tmp_path: Path,
+ tmp_path: Path, selected_path: str, linked_worktree: bool
) -> None:
repository = make_repository(tmp_path)
- write_file(repository, "ignored/tracked.py")
- git(repository, "add", "--force", "--", "ignored/tracked.py")
+ if linked_worktree:
+ git(repository, "add", ".")
+ git(repository, "commit", "-qm", "base")
+ worktree = tmp_path / "worktree"
+ git(repository, "worktree", "add", "-q", str(worktree), "HEAD")
+ repository = worktree
+ selected = repository / selected_path
+ write_file(selected, "ignored/tracked.py")
+ write_file(selected, "ignored/untracked.py")
+ git(selected, "add", "--force", "--", "ignored/tracked.py")
output = tmp_path / "in_scope_files.txt"
- result = run_inventory(repository, ".", output)
+ result = run_inventory(selected, ".", output)
assert result.returncode == 0, result.stderr
paths = set(output.read_text(encoding="utf-8").splitlines())
assert "./ignored/tracked.py" in paths
+ assert "./ignored/untracked.py" not in paths
assert "./ignored/secret.py" not in paths
assert "./app/ignored.skip" not in paths
@@ -383,17 +394,22 @@ def test_inventory_uses_forward_slashes_when_ripgrep_defaults_to_backslashes(
assert all("\\" not in path for path in paths)
-def test_empty_inventory_is_a_success_and_replaces_the_previous_output(tmp_path: Path) -> None:
[email protected]("files", [[], ["app/handler.py"]])
+def test_inventory_without_git_metadata_replaces_the_previous_output(
+ tmp_path: Path, files: list[str]
+) -> None:
repository = tmp_path / "repository"
repository.mkdir()
+ for name in files:
+ write_file(repository, name)
output = tmp_path / "in_scope_files.txt"
output.write_text("old.py\n", encoding="utf-8")
result = run_inventory(repository, ".", output)
assert result.returncode == 0, result.stderr
- assert output.read_bytes() == b""
- assert "0 in-scope files" in result.stdout
+ assert output.read_bytes() == standard_inventory(repository, ".")
+ assert f"{len(files)} in-scope files" in result.stdout
@pytest.mark.parametrize(