mirror of
https://github.com/safedep/pmg.git
synced 2026-08-03 07:24:09 +02:00
* refactor: remove guard mode execution paths and guard-only packages Guard (non-proxy) mode is removed; all package-manager commands now always run the proxy flow. Removes the guard engine, the common flow, the extractor package, the npm/pypi dependency resolvers and the PackageResolver plumbing that only guard mode consumed. The guard package retains only PackageManagerGuardInteraction, which the proxy flow and confirmation interceptors reuse for user prompts. Proxy behavior is unchanged. * refactor: remove proxy opt-out surfaces, guard references in config, action and docs Removes Config.ProxyMode, ProxyConfig.Enabled, IsProxyModeEnabled, the proxy_mode legacy fallback, PMG_PROXY_ENABLED handling and the --proxy-mode / --include-dev-dependencies flags. Proxy interception can no longer be disabled. Also removes the proxy-mode input from the GitHub Action, the proxy-mode doctor check and setup info row, updates the E2E workflow to stop passing --proxy-mode=false, and sweeps guard-mode wording from docs and the config template. The legacy proxy_install_only flat key and PMG_PROXY_INSTALL_ONLY env var remain supported. audit.FlowTypeGuard is kept so previously recorded audit events still translate for cloud sync. * feat: fail loudly when a removed proxy opt-out is still configured A leftover proxy.enabled: false / proxy_mode: false config key or PMG_PROXY_ENABLED=false / PMG_PROXY_MODE=false env var previously meant guard mode; silently ignoring it would switch those users to proxy interception without notice. PMG now exits with an actionable error naming the exact source. Precedence mirrors the old resolution order: env (ignored under lockdown) > proxy.enabled > legacy proxy_mode. The pmg config subtree is exempt so the config file can still be fixed with pmg config edit/set. The GitHub Action's proxy-mode input is kept as a tombstone that fails the action when set to false and warns otherwise. * refactor: extract flows.RunProxy and address review findings Collapses the identical parse-then-run body duplicated across the 12 package manager commands into flows.RunProxy. Documents the cache-hit / offline analysis trade-off versus the removed guard manifest path, fixes a stale non-proxy label in the E2E workflow and a stale guard reference in the uvx parser comment. * fix(config): mirror old proxy opt-out precedence exactly PMG_PROXY_MODE only ever took effect through the legacy fallback, which was gated on the presence of a proxy: key in the config file (even a null one). Promoting it to the top env tier caused two inversions: a stale PMG_PROXY_MODE=false hard-failed configs that resolved to proxy mode, and PMG_PROXY_MODE=true silently overrode an explicit proxy.enabled: false file opt-out. The check now resolves in the old order: PMG_PROXY_ENABLED > proxy: section (presence gates the legacy tier) > PMG_PROXY_MODE > flat proxy_mode. parseOptOutBool also accepts numeric values (0 = false) to match viper's WeaklyTypedInput/cast.ToBool coercion, so proxy.enabled: 0 and proxy_mode: 0 are detected as opt-outs. * refactor: move package manager interaction out of guard * refactor: trim package manager interaction * fix(config): normalize config keys viper-style in proxy opt-out check Viper resolved config file keys case-insensitively and expanded dotted keys, so spellings like Proxy:, Enabled:, a literal proxy.enabled key or Proxy_Mode selected guard mode before the removal. The opt-out check now lowercases keys recursively and nests dotted keys before matching, so those existing opt-outs fail loudly instead of being silently ignored. * refactor: remove inert transitive controls, dead parser state and guard audit variant transitive / transitive_depth lost their only consumers with the dependency resolvers; remove the config fields, flags, template and doc entries, and the report/audit plumbing that misreported transitive analysis as enabled. Remove write-only parser state (PackageInstallTarget.Extras, ParsedCommand.ManifestFiles, ShouldExtractFromManifest); IsManifestInstall stays as it feeds sandbox gating via IsInstallationCommand. Remove audit.FlowTypeGuard and its cloud mapping; guard events recorded by pre-removal versions in an unsynced WAL translate to UNSPECIFIED. * fix: address review findings on the opt-out wiring and cleanups Move the removed-opt-out rejection from the CLI PersistentPreRun into proxyFlow.Run: the check now fires exactly for package-manager runs, so non-install commands (pmg setup remove, doctor, config, version) stay usable to fix or remove an opted-out installation, and future commands inherit or avoid the check by construction instead of by exemption list. Also: make the e2e malicious-package assertion actually fail the job when an install is not blocked, route pmg go through flows.RunProxy, and drop the dead extras return from pypiParsePackageInfo (extras are still stripped from package names). * fix(config): make the removed opt-out check faithful to the old resolution The gate that silenced the legacy proxy_mode surfaces matched the raw proxy key case-sensitively in the old code, while values resolved viper-style (case-insensitive, dotted keys); applying each semantic where the old code did fixes both divergences: a case-variant Proxy: section no longer hides a flat proxy_mode: false opt-out, and a dotted proxy.enabled: false overridden by proxy_mode: true no longer errors. Replace the generic key-tree normalization with two targeted lookups (the check only ever resolves proxy.enabled and proxy_mode), which also makes colliding spellings resolve deterministically. Coerce legacy-tier values cast.ToBool-style so PMG_PROXY_MODE=off style opt-outs are detected, log the config read error instead of swallowing it, and shorten the error to a one-line statement with the specific remedy in the help text. Add lockdown coverage (env inert both directions) and a repeated-run determinism test. * fix(config): fall back to defaults for unrecognized proxy opt-out values The old loader swallowed viper errors and ran on defaults, so values like proxy.enabled: yes or PMG_PROXY_ENABLED=banana silently discarded the whole config and defaulted to proxy. Treat them the same way now: unrecognized values mean the default (proxy on) instead of a hard error, and the doc comment no longer claims the old loader failed loudly. Only values that actually meant guard mode fail. Also check the removed opt-out before the CA trust check in pmg go, restoring the old error precedence: a config problem must not steer the user into an unnecessary OS trust store change. * fix(e2e): PMG_PROXY_MODE assertion must match the legacy gate semantics The runner's setup step writes the template config, which has a proxy: section — and with one present the legacy PMG_PROXY_MODE was always inert, so expecting a loud failure there asserts pre-fidelity-fix behavior. Assert both sides instead: inert (command succeeds) with the standard config, loud failure against an empty config dir where the legacy fallback actually applied. * refactor(config): collapse parseOptOutBool to ParseBool over the string form YAML hands us typed values (bool, int), so route them through fmt.Sprintf %v and strconv.ParseBool instead of a per-type switch. Identical behavior for every recognized value; numbers other than 0/1 now read as no opinion instead of cast.ToBool's nonzero-true, which no real config relies on.
205 lines
7.9 KiB
Go
205 lines
7.9 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 — is contained because the 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
|
|
}
|