🛡️ Sentinel: [HIGH] Fix local code execution via .git/config

.jules/sentinel.md

@@ -0,0 +1,4 @@
+## 2024-06-22 - Prevent Local Code Execution via .git/config
+**Vulnerability:** Invoking `git` via `subprocess.run` against potentially untrusted directories can lead to local code execution via malicious `.git/config` files (e.g. `core.fsmonitor`).
+**Learning:** `git` executes configuration commands locally when run in a directory containing a `.git` structure, making seemingly safe operations like `git rev-parse` or `git diff` vulnerable to execution of arbitrary shell commands.
+**Prevention:** Always append the configuration `("-c", "core.fsmonitor=false")` (typically defined as `_SAFE_GIT_CONFIG`) to the `git` command when invoking it via `subprocess.run` on user-controlled or arbitrary paths.

src/wardline/core/delta.py

@@ -11,6 +11,8 @@
 if TYPE_CHECKING:
     from wardline.scanner.index import Entity
 
+_SAFE_GIT_CONFIG = ("-c", "core.fsmonitor=false")
+
 
 def get_changed_files_since(ref: str, root: Path) -> set[str]:
     """Get the set of file paths (repo-relative, POSIX-style matching Location.path)
@@ -22,7 +24,7 @@ def get_changed_files_since(ref: str, root: Path) -> set[str]:
     # 1. Get the git toplevel directory.
     try:
         res = subprocess.run(
-            ["git", "rev-parse", "--show-toplevel"],
+            ["git", *_SAFE_GIT_CONFIG, "rev-parse", "--show-toplevel"],
             cwd=root,
             capture_output=True,
             text=True,
@@ -38,7 +40,7 @@ def get_changed_files_since(ref: str, root: Path) -> set[str]:
     # 2. Resolve ref to a verified object id before passing it to git diff.
     try:
         res = subprocess.run(
-            ["git", "rev-parse", "--verify", "--end-of-options", ref],
+            ["git", *_SAFE_GIT_CONFIG, "rev-parse", "--verify", "--end-of-options", ref],
             cwd=git_toplevel,
             capture_output=True,
             text=True,
@@ -54,7 +56,7 @@ def get_changed_files_since(ref: str, root: Path) -> set[str]:
     # 3. Get changed files since ref (committed since ref, staged, unstaged).
     try:
         res = subprocess.run(
-            ["git", "diff", "--name-only", verified_ref, "--"],
+            ["git", *_SAFE_GIT_CONFIG, "diff", "--name-only", verified_ref, "--"],
             cwd=git_toplevel,
             capture_output=True,
             text=True,
@@ -68,7 +70,7 @@ def get_changed_files_since(ref: str, root: Path) -> set[str]:
     # 4. Get untracked files.
     try:
         res = subprocess.run(
-            ["git", "ls-files", "--others", "--exclude-standard"],
+            ["git", *_SAFE_GIT_CONFIG, "ls-files", "--others", "--exclude-standard"],
             cwd=git_toplevel,
             capture_output=True,
             text=True,

src/wardline/core/legis.py

@@ -53,6 +53,8 @@
     from wardline.core.config import WardlineConfig
     from wardline.core.run import ScanResult
 
+_SAFE_GIT_CONFIG = ("-c", "core.fsmonitor=false")
+
 LEGIS_ARTIFACT_KEY_ENV = "WARDLINE_LEGIS_ARTIFACT_KEY"
 SIG_PREFIX = "hmac-sha256:v2:"
 ARTIFACT_SIGNATURE_FIELD = "artifact_signature"
@@ -199,7 +201,7 @@ def _git_tree_sha(root: Path) -> str | None:
     """
     try:
         rev = subprocess.run(
-            ["git", "rev-parse", "HEAD^{tree}"],
+            ["git", *_SAFE_GIT_CONFIG, "rev-parse", "HEAD^{tree}"],
             cwd=root,
             capture_output=True,
             text=True,
@@ -215,7 +217,7 @@ def _git_repo_root(root: Path) -> Path | None:
     """The containing git repository root, or None when unavailable."""
     try:
         rev = subprocess.run(
-            ["git", "rev-parse", "--show-toplevel"],
+            ["git", *_SAFE_GIT_CONFIG, "rev-parse", "--show-toplevel"],
             cwd=root,
             capture_output=True,
             text=True,

tests/unit/core/test_delta.py

@@ -43,8 +43,24 @@ def run_dispatch(args, **kwargs):
     res = get_changed_files_since("HEAD~1", root)
 
     assert res == {"foo.py", "bar.py", "baz.py"}
-    assert mock_run.call_args_list[1].args[0] == ["git", "rev-parse", "--verify", "--end-of-options", "HEAD~1"]
-    assert mock_run.call_args_list[2].args[0] == ["git", "diff", "--name-only", "abc123", "--"]
+    assert mock_run.call_args_list[1].args[0] == [
+        "git",
+        "-c",
+        "core.fsmonitor=false",
+        "rev-parse",
+        "--verify",
+        "--end-of-options",
+        "HEAD~1",
+    ]
+    assert mock_run.call_args_list[2].args[0] == [
+        "git",
+        "-c",
+        "core.fsmonitor=false",
+        "diff",
+        "--name-only",
+        "abc123",
+        "--",
+    ]
 
 
 @patch("subprocess.run")