mirror of
https://github.com/safedep/pmg.git
synced 2026-08-03 07:24:09 +02:00
987bda5d6a
* feat: Add dependency cooldown for npm packages Strip recently-published package versions from npm registry metadata responses so npm's resolver naturally falls back to older versions. Overrides the Accept header to force full packument responses (which include the "time" field needed for publish-date checks). Reports cooldown blocks only when all versions are stripped (remaining == 0), matching npm's --min-release-age behavior for silent fallback. * fix: Report oldest version in cooldown block (shortest wait) When all versions are blocked by cooldown, report the oldest version since it exits the cooldown window first — giving the user the shortest wait time instead of the longest. * fix: Handle resp.Body.Close error return for errcheck linter * test: Add dependency cooldown assertions to template config tests * fix: config template for dependency cooldown * fix: Prevent npm from caching cooldown-stripped metadata responses * fix: Restore body on ReadAll failure and log Close errors in response modifier * fix: Close response body before replacing to prevent connection leak * fix: Correct daysLeft ceiling math and update ContentLength on error recovery * fix: Clear Status on status code change and update ContentLength in modifier error path * refactor: address review comments on dependency cooldown PR - Make NpmCooldownHandler and constructor package-private - Pass cooldown days as parameter instead of reading config internally - Convert standalone functions to methods on npmCooldownHandler - Set Accept-Encoding: identity to prevent gzip responses breaking JSON parsing - Return 503 with descriptive message when upstream body read fails * fix: log errors in stripCooldownVersions instead of swallowing them * fix: Config preserve fallback defaults * fix: Code review fixes * fix: correct cooldown tip to show wait time instead of incorrect trusted_packages advice * fix: prevent integer overflow in cooldown duration calculation with large days values * refactor: deduplicate CooldownBlock into internal/models, fix misleading variable names - Move CooldownBlock struct to internal/models to eliminate duplication between proxy/interceptors and internal/ui packages - Simplify proxy_flow.go by using direct assignment instead of field copy - Rename latestStripped/latestDate to oldestVer/oldestDate for clarity * fix: Dependency Cooldown Check Encapsulation (#207) * fix: Encapsulate cooldown check * feat: Add --skip-dependency-cooldown override * fix: Code review fixes --------- Co-authored-by: Abhisek Datta <abhisek.datta@gmail.com>
68 lines
2.7 KiB
Go
68 lines
2.7 KiB
Go
package config
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/spf13/viper"
|
|
"github.com/stretchr/testify/assert"
|
|
"gopkg.in/yaml.v3"
|
|
)
|
|
|
|
func TestTemplateParsesAsYAML(t *testing.T) {
|
|
var cfg Config
|
|
|
|
// Defensive check: Ensure template is valid YAML (not used for mapstructure mapping)
|
|
var raw map[string]any
|
|
err := yaml.Unmarshal([]byte(templateConfig), &raw)
|
|
assert.NoError(t, err, "templateConfig must be valid YAML")
|
|
|
|
// Ensure Viper (mapstructure) maps to Config as expected
|
|
v := viper.New()
|
|
v.SetConfigType("yaml")
|
|
err = v.ReadConfig(strings.NewReader(templateConfig))
|
|
assert.NoError(t, err, "expected no error while reading config")
|
|
|
|
err = v.Unmarshal(&cfg)
|
|
assert.NoError(t, err, "expected no error while unmarshalling config")
|
|
|
|
assert.True(t, true, cfg.Transitive, "expected Transitive true")
|
|
assert.Equal(t, 5, cfg.TransitiveDepth, "expected TransitiveDepth 5")
|
|
assert.False(t, false, cfg.IncludeDevDependencies, "expected IncludeDevDependencies false")
|
|
assert.False(t, false, cfg.Paranoid, "expected Paranoid false")
|
|
assert.False(t, false, cfg.SkipEventLogging, "expected SkipEventLogging false")
|
|
assert.Equal(t, 7, cfg.EventLogRetentionDays, "expected EventLogRetentionDays 7")
|
|
assert.Len(t, cfg.TrustedPackages, 1)
|
|
}
|
|
|
|
func TestTemplateMatchesDefaults(t *testing.T) {
|
|
var parsed Config
|
|
|
|
v := viper.New()
|
|
v.SetConfigType("yaml")
|
|
err := v.ReadConfig(strings.NewReader(templateConfig))
|
|
assert.NoError(t, err, "expected no error while reading config")
|
|
|
|
err = v.Unmarshal(&parsed)
|
|
assert.NoError(t, err, "expected no error while unmarshalling config")
|
|
|
|
def := DefaultConfig().Config
|
|
|
|
assert.Equal(t, def.Transitive, parsed.Transitive, "transitive mismatch")
|
|
assert.Equal(t, def.TransitiveDepth, parsed.TransitiveDepth, "transitive_depth mismatch")
|
|
assert.Equal(t, def.IncludeDevDependencies, parsed.IncludeDevDependencies, "include_dev_dependencies mismatch")
|
|
assert.Equal(t, def.Paranoid, parsed.Paranoid, "paranoid mismatch")
|
|
assert.Equal(t, def.SkipEventLogging, parsed.SkipEventLogging, "skip_event_logging mismatch")
|
|
assert.Equal(t, def.EventLogRetentionDays, parsed.EventLogRetentionDays, "event_log_retention_days mismatch")
|
|
assert.Equal(t, def.Verbosity, parsed.Verbosity, "verbosity mismatch")
|
|
|
|
assert.NotEmpty(t, parsed.TrustedPackages, "expected at least one trusted_packages entry")
|
|
|
|
first := parsed.TrustedPackages[0]
|
|
assert.NotEmpty(t, first.Purl, "first trusted package has empty purl")
|
|
assert.NotEmpty(t, first.Reason, "first trusted package has empty reason")
|
|
|
|
assert.Equal(t, def.DependencyCooldown.Enabled, parsed.DependencyCooldown.Enabled, "dependency_cooldown.enabled mismatch")
|
|
assert.Equal(t, def.DependencyCooldown.Days, parsed.DependencyCooldown.Days, "dependency_cooldown.days mismatch")
|
|
}
|