mirror of
https://github.com/trailofbits/skills.git
synced 2026-09-14 14:28:48 +08:00
c199e0cc7d
* Narrow the modern-python shims to the commands uv run replaces Closes #207. The shims sit on PATH, so they intercept every subprocess any tool spawns, not just what Claude types. Two of the intercepted invocations were not package management at all, and blocking them broke real tooling. `uv pip` now passes through when it carries --project, --directory or --target. Those say a tool is building an environment it owns, where `uv add` is not the available advice: prek installs every hook with `uv pip install --project / --directory <cache>`, so the refusal made `git commit` fail in any repo whose hooks need a Python environment. A bare `uv pip install requests` is still refused. `python -c`, `python -m <module>` and `python -` now reach the real interpreter. None of them resolves a script against a project's dependencies, which is what `uv run` exists to do, and `uv run python3 -` is not a drop-in replacement inside a pipeline. `python -m pip` stays intercepted, as do bare `python` and `python script.py`. Passing anything through is new for the python shim, which previously ended every branch in exit 1, so it gains the same skip-my-own-dir PATH walk the uv shim already had. That walk now uses parameter expansion rather than basename, because the one case where it must report failure is a PATH holding nothing but the shim, where shelling out to coreutils fails first with a confusing error. Verified by A/B on the two symptoms #207 reports, running each suite against the old shim and the new one: - zeroize-audit's rust-regression smoke test: FAILED at line 72 before, "Rust regression smoke checks passed." after. - prek hook installation from a cold cache: refused before, "check json Passed" after. bats goes from 19 cases to 38. Five python cases inverted rather than being deleted: the ones asserting that -c and -m are refused now assert they run. AGENTS.md's note on `make shell-suites` is corrected rather than removed — the #207 interceptions are gone, but the target still fails because variant-analysis invokes `python3 <script>.py`, which the shim intercepts by design. That one belongs to variant-analysis. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Decide on the mode selector, not on argument position Two gaps in the narrowing, both from review. `uv pip install --help` documents `-t, --target <TARGET>`, so the short form has to be exempt alongside the long one. Without it the same tool-managed install was allowed or refused depending on spelling. The python shim read only $1 to find the mode selector, so `python -u -c 'code'` was refused while `python -c 'code'` ran, even though they are the same invocation. It now steps over interpreter flags to find the selector, giving `-W`, `-X` and `--check-hash-based-pycs` the two slots they take. `-u -m pip` is still refused, and so is `-u script.py`: a script path is what `uv run` replaces regardless of what precedes it. bats 38 -> 43. Both #207 regressions re-verified after the restructure: zeroize-audit's smoke test passes and prek installs hooks from a cold cache. Not fixed here, deliberately: `uv --no-progress pip install requests` still slips past the refusal, because the subcommand check reads $1 as well. Parsing that correctly means knowing which uv global flags take a value, and getting it wrong would refuse a command that works today. The failure mode is a missed nudge rather than a breakage — the real uv runs and behaves correctly — so it does not belong in a change whose purpose is to refuse less. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
77 lines
2.5 KiB
Bash
77 lines
2.5 KiB
Bash
#!/usr/bin/env bats
|
|
# Tests for uv PATH shim
|
|
# Requires: nix shell nixpkgs#uv -c bats ...
|
|
|
|
bats_require_minimum_version 1.5.0
|
|
|
|
SHIM="${BATS_TEST_DIRNAME}/uv"
|
|
|
|
setup() {
|
|
command -v uv &>/dev/null || skip "uv not available — run via: nix shell nixpkgs#uv -c bats ..."
|
|
}
|
|
|
|
@test "exits non-zero for uv pip install" {
|
|
run "$SHIM" pip install requests
|
|
[[ $status -ne 0 ]]
|
|
[[ "$output" == *"uv add"* ]]
|
|
}
|
|
|
|
@test "exits non-zero for uv pip sync" {
|
|
run "$SHIM" pip sync
|
|
[[ $status -ne 0 ]]
|
|
[[ "$output" == *"uv sync"* ]]
|
|
}
|
|
|
|
@test "exits non-zero for uv pip freeze" {
|
|
run "$SHIM" pip freeze
|
|
[[ $status -ne 0 ]]
|
|
[[ "$output" == *"legacy"* ]]
|
|
}
|
|
|
|
@test "suggests uv remove for uv pip uninstall" {
|
|
run "$SHIM" pip uninstall foo
|
|
[[ $status -ne 0 ]]
|
|
[[ "$output" == *"uv remove"* ]]
|
|
}
|
|
|
|
@test "passes through to real uv for non-pip subcommands" {
|
|
run "$SHIM" --version
|
|
[[ $status -eq 0 ]]
|
|
[[ "$output" == *"uv"* ]]
|
|
}
|
|
|
|
# `uv pip` carrying one of these is a tool building an environment it owns, not a person
|
|
# managing project dependencies — `uv add` is not the advice it needs. prek installs
|
|
# every hook this way, and refusing it broke `git commit` in any repo whose hooks need a
|
|
# Python environment. See #207.
|
|
@test "allows uv pip when --directory says a tool owns the environment" {
|
|
run "$SHIM" pip list --directory /tmp
|
|
[[ "$output" != *"legacy interface"* ]]
|
|
}
|
|
|
|
@test "allows uv pip when --project says a tool owns the environment" {
|
|
run "$SHIM" pip install --project / --help
|
|
[[ "$output" != *"legacy interface"* ]]
|
|
}
|
|
|
|
@test "allows uv pip when --target says a tool owns the environment" {
|
|
run "$SHIM" pip install --target /tmp/nowhere --help
|
|
[[ "$output" != *"legacy interface"* ]]
|
|
}
|
|
|
|
# `uv pip install --help` documents `-t, --target <TARGET>`, so the short form has to be
|
|
# exempt too — otherwise the same install is allowed or refused depending on spelling.
|
|
@test "allows uv pip when the short -t names the target" {
|
|
run "$SHIM" pip install -t /tmp/nowhere --help
|
|
[[ "$output" != *"legacy interface"* ]]
|
|
}
|
|
|
|
@test "exits 127 with error when real uv is not found" {
|
|
# Include /usr/bin for coreutils but exclude dirs with a real uv.
|
|
# `run -127` declares the expected status, which is what this asserts; without it
|
|
# bats warns (BW01) that a 127 looks like a command that was not found by accident.
|
|
local path_no_uv="${BATS_TEST_DIRNAME}:/usr/bin:/bin"
|
|
run -127 env PATH="$path_no_uv" "$SHIM" --version
|
|
[[ "$output" == *"real uv binary not found"* ]]
|
|
}
|