mirror of
https://github.com/safedep/pmg.git
synced 2026-08-03 07:24:09 +02:00
feat(cooldown): respect trusted_packages in dependency cooldown (#342)
* feat(cooldown): respect trusted_packages in dependency cooldown Trusted packages are now treated as a superset waiver that bypasses every PMG control (malware analysis, cooldown, and any future controls). A globally trusted package is automatically exempt from the cooldown window and no longer needs a duplicate entry in dependency_cooldown.skip. The skip list remains the narrower, cooldown-only waiver for packages that must bypass the cooldown wait but still be malware-scanned. * refactor(cooldown): tag skip reason and audit-log skipped packages Address review feedback on #342: - Restore cooldownSkip to a pure single-list function (SRP); the merge into trusted_packages now happens in a separate mergeCooldownSkip step, driven by the exported CooldownSkip wrapper. - Extend CooldownSkipInfo with a CooldownSkipReason (TrustedPackage / CooldownSkipList) on both SkipAll and per-version entries, so callers can tell apart the broad waiver from the cooldown-only one. When both lists match the same package, trusted_packages wins. - Add audit.LogCooldownSkipped and emit it from the npm and PyPI interceptors on the SkipAll path, alongside the existing info log, carrying the source list as the reason. * refactor(cooldown): inline list merge, audit per-version exemptions Address further review feedback: - Drop the separate mergeCooldownSkip helper; cooldownSkip now writes into a shared *CooldownSkipInfo and is called twice from CooldownSkip (cooldown skip list first, trusted_packages on top so trusted entries override the reason on overlap). - Audit log every exemption, not just SkipAll: a new auditCooldownSkip helper in proxy/interceptors/cooldown.go emits one event per match (package-wide or per-version), each tagged with its source list. LogCooldownSkipped gains a version argument for the per-version case. - Cover the trusted_packages reason path in TestCooldownSkip. * fix(cooldown): avoid double-auditing trusted package exemptions auditCooldownSkip now only emits EventTypeCooldownSkipped for entries that came from dependency_cooldown.skip. Trusted-package exemptions already get an EventTypeInstallTrustedAllowed event at tarball-download time (proxy/interceptors/base_registry.go), so emitting a cooldown event for them too would double-count the same waiver. * emit trusted and cooldown skip events to cloud * fix tests * refactor(cooldown): return value from collectCooldownSkip, short-circuit on trusted SkipAll Address PR review feedback: - Rename cooldownSkip to collectCooldownSkip and return CooldownSkipInfo instead of mutating an input pointer. - Add mergeCooldownSkip to combine per-list results with trusted_packages taking precedence on overlap. - CooldownSkip now consults trusted_packages first and returns immediately on a package-wide trusted exemption (DC skip list cannot add anything). - Extend tests to cover disjoint pinned entries across both lists and the case where DC version-less subsumes a trusted pinned entry. * fix(audit): address cooldown review feedback * fix(cooldown): audit cooldown skips at download time with concrete version Backend rejects PackageVersion messages without a version, and audit logs should reflect the runtime fact (a specific version was skipped) rather than the config rule. Move the audit emission from metadata-request handling to download-request handling, where the concrete version is known, and require version in LogCooldownSkipped. * chore(audit): drop dead scope assignment in LogCooldownSkipped * refactor(cooldown): move skip-list logic into cooldown handlers Registry interceptors no longer compute CooldownSkip or branch on SkipAll; they just call HandleMetadataRequest. The npm and pypi cooldown handlers own the skip lookup, the package-wide exemption short-circuit, and (for pypi) the canonical-name denormalization. Also align LogCooldownSkipped with other LogXxx signatures by taking *packagev1.PackageVersion. * fix: Simplify audit logging for dependency cooldown skip * refactor: Simplify cooldown handling and maintain separation of concepts for trusted and DC skip packages * fix: Code review fixes * fix: Emit cooldown skipped audit event ONLY when an in-window version is skipped --------- Co-authored-by: Abhisek Datta <abhisek.datta@gmail.com>
This commit is contained in:
co-authored by
Abhisek Datta
parent
c17b941ac3
commit
327c9c7068
@@ -6,9 +6,67 @@ import (
|
||||
|
||||
packagev1 "buf.build/gen/go/safedep/api/protocolbuffers/go/safedep/messages/package/v1"
|
||||
"github.com/Masterminds/semver"
|
||||
"github.com/safedep/dry/log"
|
||||
pmgconfig "github.com/safedep/pmg/config"
|
||||
"github.com/safedep/pmg/internal/audit"
|
||||
)
|
||||
|
||||
// cooldownExemptions describes the in-window versions that survive cooldown
|
||||
// stripping and why. all is the full exempt set; skipListed is the subset
|
||||
// attributable to dependency_cooldown.skip and is the only set that produces an
|
||||
// audit event — trusted versions surface as install_trusted_allowed via the
|
||||
// proxy fast-allow gate at download time.
|
||||
type cooldownExemptions struct {
|
||||
all map[string]bool
|
||||
skipListed []string
|
||||
}
|
||||
|
||||
// cooldownExemptVersions classifies the versions that must survive stripping
|
||||
// even though they fall within the cooldown window: those trusted via
|
||||
// trusted_packages or on the dependency_cooldown.skip list. Only in-window
|
||||
// versions are examined, bounding the per-version trusted lookup to recent
|
||||
// releases rather than the full (potentially large) version history. A version
|
||||
// that is both trusted and skip-listed is attributed to trusted, mirroring the
|
||||
// download-path precedence where the fast-allow gate wins.
|
||||
func cooldownExemptVersions(ecosystem packagev1.Ecosystem, name string, skip pmgconfig.CooldownSkipInfo, dates map[string]time.Time, cooldownDays int) cooldownExemptions {
|
||||
exempt := cooldownExemptions{all: make(map[string]bool)}
|
||||
for v, publishDate := range dates {
|
||||
if within, _, _ := cooldownIsWithinWindow(publishDate, cooldownDays); !within {
|
||||
continue
|
||||
}
|
||||
switch {
|
||||
case pmgconfig.IsTrustedPackageRef(ecosystem, name, v):
|
||||
exempt.all[v] = true
|
||||
case skip.SkipAll:
|
||||
// A whole-package skip is one waiver, not a per-version exemption:
|
||||
// keep the version but never emit per-version audit events.
|
||||
// HandleMetadataRequest also short-circuits this case upstream.
|
||||
exempt.all[v] = true
|
||||
case skip.ExemptsVersion(v):
|
||||
exempt.all[v] = true
|
||||
exempt.skipListed = append(exempt.skipListed, v)
|
||||
}
|
||||
}
|
||||
return exempt
|
||||
}
|
||||
|
||||
// auditCooldownSkips emits one dependency_cooldown_skipped audit event per
|
||||
// version that the skip list exempted from an active cooldown window. It is
|
||||
// called from the metadata modifier, where publish dates are known, so the
|
||||
// event only fires for versions a live cooldown would otherwise have stripped.
|
||||
func auditCooldownSkips(requestID string, ecosystem packagev1.Ecosystem, name string, exempt cooldownExemptions) {
|
||||
for _, version := range exempt.skipListed {
|
||||
log.Infof("[%s] Cooldown: %s@%s exempt by %s", requestID, name, version, audit.CooldownSkipReason)
|
||||
|
||||
pv := &packagev1.PackageVersion{}
|
||||
pv.SetPackage(&packagev1.Package{})
|
||||
pv.GetPackage().SetName(name)
|
||||
pv.GetPackage().SetEcosystem(ecosystem)
|
||||
pv.SetVersion(version)
|
||||
audit.LogCooldownSkipped(pv)
|
||||
}
|
||||
}
|
||||
|
||||
// cooldownIsWithinWindow reports whether a version published at publishDate is still
|
||||
// within the cooldown window of cooldownDays. Returns withinCooldown, daysSincePublish,
|
||||
// and daysRemaining.
|
||||
|
||||
Reference in New Issue
Block a user