mirror of
https://github.com/usestrix/strix.git
synced 2026-10-17 04:34:03 +00:00
4d60330338
Prevent Git argument injection and option smuggling when cloning repositories by inserting an end-of-options delimiter (--) before positional target arguments in clone_repository and rejecting leading-dash targets upfront in infer_target_type. Fix the following gaps: - Insert '--' separator before repo_url in git clone invocation - Reject targets and repo URLs starting with '-' in infer_target_type and clone_repository - Sanitize repo base names to strip leading dots/dashes and prevent directory traversal - Add comprehensive test coverage in tests/test_clone_repository.py
94 lines
3.4 KiB
Python
94 lines
3.4 KiB
Python
"""Tests for clone_repository, infer_target_type, and sanitization in strix.interface.utils."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from strix.interface.utils import (
|
|
clone_repository,
|
|
derive_repo_base_name,
|
|
infer_target_type,
|
|
sanitize_name,
|
|
)
|
|
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
|
|
def test_clone_repository_includes_double_dash_separator(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
monkeypatch.setattr("tempfile.gettempdir", lambda: str(tmp_path))
|
|
monkeypatch.setattr("shutil.which", lambda cmd: "/usr/bin/git" if cmd == "git" else None)
|
|
|
|
mock_run = MagicMock()
|
|
with patch("subprocess.run", mock_run):
|
|
res = clone_repository("https://github.com/example/test-repo.git", "run_123")
|
|
|
|
expected_path = tmp_path / "strix_repos" / "run_123" / "test-repo"
|
|
assert res == str(expected_path.resolve())
|
|
mock_run.assert_called_once_with(
|
|
[
|
|
"/usr/bin/git",
|
|
"clone",
|
|
"--",
|
|
"https://github.com/example/test-repo.git",
|
|
str(expected_path),
|
|
],
|
|
capture_output=True,
|
|
text=True,
|
|
check=True,
|
|
)
|
|
|
|
|
|
def test_clone_repository_rejects_leading_dash_url() -> None:
|
|
with pytest.raises(ValueError, match="Repository URL cannot start with a dash"):
|
|
clone_repository("-u/upload-pack.git", "run_123")
|
|
|
|
with pytest.raises(ValueError, match="Repository URL cannot start with a dash"):
|
|
clone_repository("--upload-pack=touch /tmp/pwn", "run_123")
|
|
|
|
|
|
def test_clone_repository_rejects_invalid_dest_names(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
monkeypatch.setattr("tempfile.gettempdir", lambda: str(tmp_path))
|
|
monkeypatch.setattr("shutil.which", lambda cmd: "/usr/bin/git" if cmd == "git" else None)
|
|
|
|
with pytest.raises(ValueError, match="Invalid repository destination name"):
|
|
clone_repository("https://example.com/repo.git", "run_123", dest_name="..")
|
|
|
|
with pytest.raises(ValueError, match="Invalid repository destination name"):
|
|
clone_repository("https://example.com/repo.git", "run_123", dest_name=".")
|
|
|
|
with pytest.raises(ValueError, match="Invalid repository destination name"):
|
|
clone_repository("https://example.com/repo.git", "run_123", dest_name="-dashed")
|
|
|
|
with pytest.raises(ValueError, match="Invalid repository destination name"):
|
|
clone_repository("https://example.com/repo.git", "run_123", dest_name="sub/dir")
|
|
|
|
|
|
def test_infer_target_type_rejects_leading_dash() -> None:
|
|
with pytest.raises(ValueError, match="Targets cannot start with a dash"):
|
|
infer_target_type("-u/upload-pack.git")
|
|
|
|
with pytest.raises(ValueError, match="Targets cannot start with a dash"):
|
|
infer_target_type("--target-flag")
|
|
|
|
|
|
def test_sanitize_name_strips_leading_dots_and_dashes() -> None:
|
|
assert sanitize_name("..") == "target"
|
|
assert sanitize_name(".") == "target"
|
|
assert sanitize_name("-dashed") == "dashed"
|
|
assert sanitize_name(".hidden") == "hidden"
|
|
assert sanitize_name("normal_repo-1") == "normal_repo-1"
|
|
|
|
|
|
def test_derive_repo_base_name_handles_dot_git() -> None:
|
|
assert derive_repo_base_name("..git") == "target"
|
|
assert derive_repo_base_name("https://github.com/foo/bar.git") == "bar"
|
|
assert derive_repo_base_name("git@github.com:foo/bar.git") == "bar"
|