mirror of
https://github.com/lukaszraczylo/gohoarder.git
synced 2026-10-12 00:45:16 +00:00
fix: remediate severity-ordered review findings across cache, scanners, and proxies
- H2: gormstore soft-delete + storage_key UNIQUE collision; re-save after eviction succeeds
- H1: cache getOrFetch cache-hit branch no longer runs CheckVulnerabilities on metadata entries
- M2: cache store() streams upstream body to temp file + SHA256 instead of double-buffering
- H3/L3: FetchResult/FetchFunc plumbing (+RequiresAuth/AuthProvider); proxy closures adapted;
goproxy strips git+ prefix from UpstreamURL
- H4: scanner normalizes bypass package names; CheckVulnerabilities builds normalized packageKey
- M4: requireAdmin routes through extractAPIKey -> ValidateAPIKey -> admin role check
- M5: network client keeps only final RecordFailure (one count per attempt cycle)
- M3: normalizeOriginHost + buildCheckOrigin rewrite; origin_test.go added
- M1: app lifecycle cancel func; Run -> Shutdown on listen error (sole cache owner); JoinHostPort
- M6: VulnerabilityThresholds defaults all -1 so BlockOnSeverity governs
- L4: metadata.NormalizeSeverity at 4 severity-count sites (MEDIUM->MODERATE consistency)
- L1: handleDeleteBypass uses structured *errors.Error + ErrCodeNotFound
- L2: pypi extractVersionFromFilename (wheel/2nd segment, non-wheel/last digit segment);
cacheVersion uses full unique basename; regression tests added
- L5: document per-instance ValidationCache key scoping; rename packageURL param to resource
All: go build ./... && go vet ./... && go test ./... pass; golangci-lint clean.
This commit is contained in:
@@ -12,7 +12,17 @@ type ValidationResult struct {
|
||||
Allowed bool
|
||||
}
|
||||
|
||||
// ValidationCache caches credential validation results to reduce upstream checks
|
||||
// ValidationCache caches credential validation results to reduce upstream checks.
|
||||
//
|
||||
// Scope: each instance is owned by exactly one proxy handler (goproxy, npm,
|
||||
// or pypi) and caches only that registry's credential checks. Because the
|
||||
// instances are never shared across handlers, the second key component may be
|
||||
// whatever uniquely identifies the resource for that registry: goproxy passes
|
||||
// a module path, npm and pypi pass a URL. There is no cross-registry key
|
||||
// collision even though the resource shapes differ, because each handler has
|
||||
// its own map. Callers must pass the same resource value to every Get/Set for
|
||||
// a given resource so the cache miss wrapper (Get then Set) is internally
|
||||
// consistent.
|
||||
type ValidationCache struct {
|
||||
cache map[string]*ValidationResult
|
||||
stopCh chan struct{}
|
||||
@@ -32,22 +42,15 @@ func NewValidationCache(ttl time.Duration) *ValidationCache {
|
||||
|
||||
// Start cleanup goroutine
|
||||
go vc.cleanupExpired()
|
||||
|
||||
return vc
|
||||
}
|
||||
|
||||
// Stop terminates the background cleanup goroutine. Safe to call multiple
|
||||
// times; subsequent calls are no-ops.
|
||||
func (vc *ValidationCache) Stop() {
|
||||
vc.stopOnce.Do(func() {
|
||||
close(vc.stopCh)
|
||||
})
|
||||
}
|
||||
|
||||
// Get retrieves a validation result from cache
|
||||
// Returns (allowed bool, cached bool, reason string)
|
||||
func (vc *ValidationCache) Get(credHash, packageURL string) (bool, bool, string) {
|
||||
key := credHash + ":" + packageURL
|
||||
// Get retrieves a validation result from cache.
|
||||
// resource names the registry resource the check was for (a module path for
|
||||
// goproxy, or a URL for npm/pypi). It is only meaningful within this cache
|
||||
// instance. Returns (allowed bool, cached bool, reason string).
|
||||
func (vc *ValidationCache) Get(credHash, resource string) (bool, bool, string) {
|
||||
key := credHash + ":" + resource
|
||||
|
||||
// Fast path: read-locked lookup.
|
||||
vc.mu.RLock()
|
||||
@@ -74,12 +77,14 @@ func (vc *ValidationCache) Get(credHash, packageURL string) (bool, bool, string)
|
||||
return false, false, ""
|
||||
}
|
||||
|
||||
// Set stores a validation result in cache
|
||||
func (vc *ValidationCache) Set(credHash, packageURL string, allowed bool, reason string) {
|
||||
// Set stores a validation result in cache.
|
||||
// resource is the registry resource the result belongs to; it must match the
|
||||
// resource value passed to the corresponding Get.
|
||||
func (vc *ValidationCache) Set(credHash, resource string, allowed bool, reason string) {
|
||||
vc.mu.Lock()
|
||||
defer vc.mu.Unlock()
|
||||
|
||||
key := credHash + ":" + packageURL
|
||||
key := credHash + ":" + resource
|
||||
vc.cache[key] = &ValidationResult{
|
||||
Allowed: allowed,
|
||||
ExpiresAt: time.Now().Add(vc.ttl),
|
||||
@@ -87,12 +92,12 @@ func (vc *ValidationCache) Set(credHash, packageURL string, allowed bool, reason
|
||||
}
|
||||
}
|
||||
|
||||
// Invalidate removes a specific entry from cache
|
||||
func (vc *ValidationCache) Invalidate(credHash, packageURL string) {
|
||||
// Invalidate removes a specific entry from cache.
|
||||
func (vc *ValidationCache) Invalidate(credHash, resource string) {
|
||||
vc.mu.Lock()
|
||||
defer vc.mu.Unlock()
|
||||
|
||||
key := credHash + ":" + packageURL
|
||||
key := credHash + ":" + resource
|
||||
delete(vc.cache, key)
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,9 @@ type CredentialValidator interface {
|
||||
// ValidateAccess checks if credentials grant access to a package
|
||||
// Returns (allowed bool, error)
|
||||
ValidateAccess(ctx context.Context, packageURL string, credentials string) (bool, error)
|
||||
// Provider returns the upstream auth provider identifier stored on
|
||||
// packages that require auth (e.g. github, gitlab, npm, pypi).
|
||||
Provider() string
|
||||
}
|
||||
|
||||
// NPMValidator validates npm registry credentials
|
||||
@@ -36,6 +39,11 @@ func NewNPMValidator() *NPMValidator {
|
||||
}
|
||||
}
|
||||
|
||||
// Provider identifies this validator's upstream provider.
|
||||
func (v *NPMValidator) Provider() string {
|
||||
return "npm"
|
||||
}
|
||||
|
||||
// ValidateAccess validates npm package access using HEAD request
|
||||
func (v *NPMValidator) ValidateAccess(ctx context.Context, packageURL string, credentials string) (bool, error) {
|
||||
req, err := http.NewRequestWithContext(ctx, "HEAD", packageURL, nil)
|
||||
@@ -87,6 +95,11 @@ func NewPyPIValidator() *PyPIValidator {
|
||||
}
|
||||
}
|
||||
|
||||
// Provider identifies this validator's upstream provider.
|
||||
func (v *PyPIValidator) Provider() string {
|
||||
return "pypi"
|
||||
}
|
||||
|
||||
// ValidateAccess validates PyPI package access using HEAD request
|
||||
func (v *PyPIValidator) ValidateAccess(ctx context.Context, packageURL string, credentials string) (bool, error) {
|
||||
req, err := http.NewRequestWithContext(ctx, "HEAD", packageURL, nil)
|
||||
@@ -134,6 +147,26 @@ func NewGoValidator() *GoValidator {
|
||||
}
|
||||
}
|
||||
|
||||
// Provider returns the base upstream provider identifier used when the
|
||||
// registry does not distinguish hosts (e.g. a generic git host).
|
||||
func (v *GoValidator) Provider() string {
|
||||
return "git"
|
||||
}
|
||||
|
||||
// ProviderFor derives the specific provider identifier from a module path.
|
||||
// Mirrors the host branching in ValidateAccess so the stored AuthProvider
|
||||
// reflects the actual upstream host (github, gitlab, or a generic git host).
|
||||
func (v *GoValidator) ProviderFor(modulePath string) string {
|
||||
switch {
|
||||
case strings.HasPrefix(modulePath, "github.com/"):
|
||||
return "github"
|
||||
case strings.HasPrefix(modulePath, "gitlab.com/"):
|
||||
return "gitlab"
|
||||
default:
|
||||
return "git"
|
||||
}
|
||||
}
|
||||
|
||||
// ValidateAccess validates Go module access using git ls-remote
|
||||
func (v *GoValidator) ValidateAccess(ctx context.Context, modulePath string, credentials string) (bool, error) {
|
||||
// Create context with timeout
|
||||
|
||||
Reference in New Issue
Block a user