mirror of
https://github.com/safedep/pmg.git
synced 2026-08-03 07:24:09 +02:00
* feat(uvx): add uvx (uv tool run) package executor Adds support for `uvx`, implemented as a PyPI Executor alongside pipx. uvx is an alias for `uv tool run`: it installs a tool into an ephemeral environment and runs it, so it has no install/list subcommand and the first positional argument (or --from) is the package to audit. Parsing highlights: - --from overrides the positional command as the package to audit - --with packages are audited as additional environment dependencies - name@version shorthand (ruff@0.3.0, ruff@latest) is normalized - flag parsing stops at the tool name so the tool's own flags are not misread as uvx options; uvx's value/boolean flags are registered so none greedily consume the package positional - VCS/URL/local-path specs are skipped for registry auditing Wires up command registration, analytics, shell alias/shim, cloud audit mapping, a dedicated `uvx` sandbox profile (UV_*/PIP_* env, uv cache and tool dirs), config policy, docs, unit tests and an E2E workflow step. Closes #326 https://claude.ai/code/session_011hyLxq7oWJX5Dp4tCEfG19 * chore(uvx): align docs and base profile with uvx support Incorporates the low-risk, non-parser improvements from the community PR #345 (author non-responsive) into our implementation: - list uvx (and the previously-missing pipx) as PyPI managers in the pypi-restrictive base profile package_managers and its README, so the base profile applies directly when selected via --sandbox-profile - document uvx in docs/github-action.md and docs/proxy-mode.md - add version / IsExplicitVersion assertions to the uvx parser tests Our pflag-based parser is kept as-is: unlike #345 it audits --with packages and handles all uvx short flags (e.g. -w), both of which the community PR misses. * fix(uvx): skip interpreter requests; use require in tests Addresses review feedback on PR #357: - uvx interpreter requests (`uvx python`, `uvx python@3.12`, `uvx pypy`, ...) launch an isolated interpreter rather than installing a PyPI tool. Treating the positional as a package made the guard flow resolve/analyze pkg:pypi/python (and python==3.12), which could wrongly block or fail a valid invocation. Skip these for the positional; --with packages on the same command are still audited. - Use require.NoError / require.Len for fatal assertions in the uvx tests, matching the repo's testing convention, so a failure stops the subtest before a nil dereference instead of panicking. * docs(uvx): document fail-open and --with-requirements trade-offs Record the two deliberate parsing decisions raised in review as in-code trade-off comments (no behavior change): - unknown flags are tolerated (fail open), consistent with the other executors; the residual gap only affects non-proxy guard mode since the default proxy flow intercepts every registry download. - --with-requirements / --with-editable values are consumed but not expanded into audit targets; expanding them needs manifest-extractor and guard changes, tracked as follow-up. Proxy mode still covers them. * docs(uvx): drop --with-requirements limitation note Per maintainer review: guard mode is being deprecated and auditing the contents of an existing requirements file is a scanner's responsibility, not PMG's. Remove the "known limitation / follow-up" note; the flags stay registered only so their values are not mistaken for the tool positional. --------- Co-authored-by: Claude <noreply@anthropic.com>
205 lines
8.0 KiB
Go
205 lines
8.0 KiB
Go
package packagemanager
|
|
|
|
import (
|
|
"io"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/safedep/dry/log"
|
|
"github.com/spf13/pflag"
|
|
)
|
|
|
|
// uvxInterpreterRequestRe matches the interpreter requests uv understands as a
|
|
// tool command (python, python3, python3.12, pypy, cpython, graalpy, ...). uv
|
|
// launches an isolated interpreter for these instead of installing a PyPI
|
|
// package, so there is nothing to audit.
|
|
var uvxInterpreterRequestRe = regexp.MustCompile(`^(python|cpython|pypy|graalpy)(\d+(\.\d+)?)?$`)
|
|
|
|
// DefaultUvxPackageExecutorConfig returns the config for the uvx executor.
|
|
// uvx is an alias for `uv tool run`: it installs a tool into an ephemeral
|
|
// environment and runs it. It shares the PyPI executor machinery but parses
|
|
// commands differently (there is no install/list subcommand).
|
|
func DefaultUvxPackageExecutorConfig() PypiPackageExecutorConfig {
|
|
return PypiPackageExecutorConfig{
|
|
CommandName: "uvx",
|
|
ImplicitRun: true,
|
|
}
|
|
}
|
|
|
|
// parseUvxCommand handles `uvx [flags] <command> [args...]`.
|
|
//
|
|
// uvx always runs a tool, so the package(s) to audit are:
|
|
// - the --from <spec> value when provided. In that case the positional
|
|
// <command> is just the executable name within that package, not a package
|
|
// to audit (e.g. `uvx --from httpie http`).
|
|
// - otherwise the first positional argument, since the command name doubles
|
|
// as the package name (e.g. `uvx ruff`).
|
|
// - plus any --with <spec> values, which are extra packages added to the
|
|
// ephemeral environment.
|
|
func (p *pypiPackageExecutor) parseUvxCommand(command Command, args []string) (*ParsedCommand, error) {
|
|
if len(args) == 0 {
|
|
return &ParsedCommand{Command: command}, nil
|
|
}
|
|
|
|
flagSet := pflag.NewFlagSet("uvx", pflag.ContinueOnError)
|
|
// Tolerate unknown flags (fail open) rather than refusing to run, matching
|
|
// the pipx/pip/uv executors. uv adds flags frequently; failing closed on an
|
|
// unrecognized flag would break otherwise-valid uvx invocations after a uv
|
|
// upgrade. The residual gap — a future value-taking flag consuming the tool
|
|
// positional and yielding no audit target — only affects non-proxy guard
|
|
// mode; the default proxy flow still intercepts every registry download.
|
|
flagSet.ParseErrorsAllowlist.UnknownFlags = true
|
|
flagSet.SetOutput(io.Discard)
|
|
|
|
// uvx only accepts options before the tool name; everything after the tool
|
|
// is passed through to it. Stopping at the first positional ensures a tool's
|
|
// own flags (e.g. `uvx ruff --fix` or `uvx mytool --with x`) are never parsed
|
|
// as uvx options.
|
|
flagSet.SetInterspersed(false)
|
|
|
|
fromSpec, withSpecs := setupUvxFlags(flagSet)
|
|
|
|
if err := flagSet.Parse(args); err != nil {
|
|
return &ParsedCommand{Command: command}, nil
|
|
}
|
|
|
|
var specs []string
|
|
if *fromSpec != "" {
|
|
specs = append(specs, *fromSpec)
|
|
} else if positional := flagSet.Args(); len(positional) > 0 && !uvxIsInterpreterRequest(positional[0]) {
|
|
// `uvx python`, `uvx python@3.12`, `uvx pypy` etc. launch an isolated
|
|
// interpreter rather than installing a PyPI tool, so there is nothing to
|
|
// audit for the positional. --with packages are still audited below.
|
|
specs = append(specs, positional[0])
|
|
}
|
|
specs = append(specs, *withSpecs...)
|
|
|
|
return p.buildUvxInstallTargets(command, specs)
|
|
}
|
|
|
|
// buildUvxInstallTargets normalizes uvx specifiers and builds audit targets,
|
|
// skipping specs that cannot be resolved against the PyPI registry.
|
|
func (p *pypiPackageExecutor) buildUvxInstallTargets(command Command, specs []string) (*ParsedCommand, error) {
|
|
normalized := make([]string, 0, len(specs))
|
|
for _, spec := range specs {
|
|
if !uvxIsAuditableSpec(spec) {
|
|
log.Debugf("uvx: skipping non-registry spec %q for audit", spec)
|
|
continue
|
|
}
|
|
normalized = append(normalized, uvxNormalizeSpec(spec))
|
|
}
|
|
|
|
return p.buildInstallTargets(command, normalized)
|
|
}
|
|
|
|
// uvxNormalizeSpec converts uvx's `name@version` shorthand (e.g. ruff@0.3.0,
|
|
// ruff@latest) into a standard PEP 508 specifier so the shared PyPI parser can
|
|
// extract the name and version. `@latest` (or a bare `@`) means no constraint.
|
|
// It is only called for registry specs (see uvxIsAuditableSpec), so the `@` is
|
|
// always the version separator and never part of a URL.
|
|
func uvxNormalizeSpec(spec string) string {
|
|
at := strings.Index(spec, "@")
|
|
if at == -1 {
|
|
return spec
|
|
}
|
|
|
|
name, version := spec[:at], spec[at+1:]
|
|
if version == "" || version == "latest" {
|
|
return name
|
|
}
|
|
|
|
// Keep an explicit operator (e.g. ruff@>=0.3.0); otherwise pin exactly.
|
|
if strings.ContainsAny(version[:1], "=<>~!") {
|
|
return name + version
|
|
}
|
|
|
|
return name + "==" + version
|
|
}
|
|
|
|
// uvxIsInterpreterRequest reports whether a uvx positional command is an
|
|
// interpreter request (e.g. `python`, `python@3.12`, `python3.11`, `pypy`)
|
|
// rather than a PyPI tool. The version suffix (`@...`) is ignored for matching.
|
|
func uvxIsInterpreterRequest(spec string) bool {
|
|
name := spec
|
|
if at := strings.Index(name, "@"); at != -1 {
|
|
name = name[:at]
|
|
}
|
|
|
|
return uvxInterpreterRequestRe.MatchString(name)
|
|
}
|
|
|
|
// uvxIsAuditableSpec reports whether a uvx specifier can be resolved against the
|
|
// PyPI registry. VCS, URL and local-path specifiers cannot, so we skip auditing
|
|
// them here; the proxy still guards any registry traffic they trigger.
|
|
func uvxIsAuditableSpec(spec string) bool {
|
|
if spec == "" {
|
|
return false
|
|
}
|
|
|
|
if strings.Contains(spec, "://") || strings.HasPrefix(spec, "git+") || strings.HasPrefix(spec, "file:") {
|
|
return false
|
|
}
|
|
|
|
if strings.HasPrefix(spec, ".") || strings.HasPrefix(spec, "~") || strings.Contains(spec, "/") {
|
|
return false
|
|
}
|
|
|
|
for _, ext := range []string{".whl", ".tar.gz", ".tar.bz2", ".zip"} {
|
|
if strings.HasSuffix(spec, ext) {
|
|
return false
|
|
}
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
// setupUvxFlags registers uvx's options on flagSet and returns the --from and
|
|
// --with values. Every value-taking option (e.g. --with-requirements,
|
|
// --with-editable, --python) is registered so its value is never mistaken for
|
|
// the tool positional, and every boolean option is registered so it does not
|
|
// greedily consume the following argument (pflag treats an unknown flag's next
|
|
// token as its value). The set mirrors `uvx --help`; unrecognized future flags
|
|
// are tolerated via the UnknownFlags allowlist.
|
|
func setupUvxFlags(flagSet *pflag.FlagSet) (fromSpec *string, withSpecs *[]string) {
|
|
fromSpec = flagSet.String("from", "", "")
|
|
withSpecs = flagSet.StringArrayP("with", "w", nil, "")
|
|
|
|
stringFlags := []struct{ name, short string }{
|
|
{"with-editable", ""}, {"with-requirements", ""}, {"python-platform", ""},
|
|
{"default-index", ""}, {"index-url", "i"}, {"index-strategy", ""},
|
|
{"keyring-provider", ""}, {"resolution", ""}, {"prerelease", ""},
|
|
{"fork-strategy", ""}, {"exclude-newer", ""}, {"link-mode", ""},
|
|
{"cache-dir", ""}, {"python", "p"}, {"color", ""}, {"directory", ""},
|
|
{"project", ""}, {"config-file", ""},
|
|
}
|
|
for _, f := range stringFlags {
|
|
flagSet.StringP(f.name, f.short, "", "")
|
|
}
|
|
|
|
arrayFlags := []struct{ name, short string }{
|
|
{"constraints", "c"}, {"build-constraints", "b"}, {"overrides", ""},
|
|
{"env-file", ""}, {"index", ""}, {"extra-index-url", ""}, {"find-links", "f"},
|
|
{"upgrade-package", "P"}, {"exclude-newer-package", ""}, {"reinstall-package", ""},
|
|
{"config-setting", "C"}, {"config-settings-package", ""},
|
|
{"no-build-isolation-package", ""}, {"no-build-package", ""},
|
|
{"no-binary-package", ""}, {"refresh-package", ""}, {"allow-insecure-host", ""},
|
|
}
|
|
for _, f := range arrayFlags {
|
|
flagSet.StringArrayP(f.name, f.short, nil, "")
|
|
}
|
|
|
|
boolFlags := []struct{ name, short string }{
|
|
{"isolated", ""}, {"no-env-file", ""}, {"version", "V"}, {"no-index", ""},
|
|
{"upgrade", "U"}, {"no-sources", ""}, {"reinstall", ""}, {"compile-bytecode", ""},
|
|
{"no-build-isolation", ""}, {"no-build", ""}, {"no-binary", ""}, {"no-cache", "n"},
|
|
{"refresh", ""}, {"managed-python", ""}, {"no-managed-python", ""},
|
|
{"no-python-downloads", ""}, {"quiet", "q"}, {"verbose", "v"}, {"native-tls", ""},
|
|
{"offline", ""}, {"no-progress", ""}, {"no-config", ""}, {"help", "h"},
|
|
}
|
|
for _, f := range boolFlags {
|
|
flagSet.BoolP(f.name, f.short, false, "")
|
|
}
|
|
|
|
return fromSpec, withSpecs
|
|
}
|