mirror of
https://github.com/lukaszraczylo/traefikoidc.git
synced 2026-06-05 22:44:17 +00:00
546ceb949c
* fix(security): encrypt session cookies + fail closed on invalid config
Batch 1 of security audit remediation (ranks 1, 2, 6).
- session.go: derive independent HMAC + AES-256 keys via stdlib HKDF-SHA256
and build the gorilla cookie store with both, so session cookies are now
encrypted, not merely signed. The single-key store previously left OIDC
access/refresh/ID tokens recoverable from raw cookie bytes. Cookie format
changes, so existing sessions are invalidated on deploy (one-time re-login).
- main.go: call config.Validate() at construction and error out on failure,
instead of silently substituting a public hardcoded encryption key for
empty/short keys (which allowed session forgery). The yaegi analyzer
passes via .traefik.yml testData.
- settings.go: isValidSecureURL permits plaintext HTTP for loopback hosts
only (RFC 8252); remote providers must still use HTTPS.
- tests: complete configs that did not satisfy Validate(); add regression
tests in security_audit_fixes_test.go.
Configs below documented minimums (rateLimit < 10, key < 32 chars) are now
rejected at startup (fail closed).
* fix(security): validate discovered OIDC endpoints + pin introspection host
Batch 2 of security audit remediation (ranks 3, 4).
- url_helpers.go: add validateDiscoveredEndpoint, an SSRF screen for endpoints
taken from the provider discovery document (jwks_uri, token, authorization,
revocation, end_session, introspection, registration). Blocks link-local
(cloud metadata 169.254.169.254), multicast, unspecified and private
addresses (unless allowPrivateIPAddresses); blocks loopback unless the
configured providerURL is itself loopback (dev/test). Cross-domain JWKS
hosts (e.g. Google) stay allowed. Add sameHost helper.
- main.go: updateMetadataEndpoints screens every discovered endpoint and
blanks any that fail (fail closed downstream). The introspection endpoint
carries the client secret via HTTP Basic, so it is additionally pinned to
the providerURL host to stop a poisoned discovery document exfiltrating the
secret to an attacker-controlled host.
- tests: regression tests for the SSRF guard and the host pin.
* fix(security): close open redirects + anchor excluded-URL matching
Batch 3 of security audit remediation (ranks 5, 14, 15).
- auth_flow.go: run the stored incoming path through normalizeLogoutPath
before using it as the post-login redirect, so //evil.com and /\evil.com
payloads become host-relative (open-redirect, rank 5).
- url_helpers.go: excluded-URL matching is anchored at a natural boundary
(exact, sub-path "/", or file extension "."), so excluding "/public" no
longer also bypasses auth on "/publicsecret"; "/favicon" still matches
"/favicon.ico" (rank 14).
- internal/utils: X-Forwarded-Host is sanitized (first value only; reject
CRLF/whitespace/multi-value) before building redirect URLs (rank 15).
- helpers.go: the logout redirect used when there is no provider end-session
endpoint is host-relative, never an absolute URL derived from the
client-controllable request host (logout open-redirect, rank 15).
- tests: update two logout cases that asserted the old absolute redirect;
add regression tests.
* fix(security): reject unverified Azure tokens; fix transport TLS reuse
Batch 4 of security audit remediation (ranks 7, 11).
- token_validation_rs.go: an Azure nonce-bearing access token that cannot be
cryptographically verified no longer returns "authenticated" when there is
no ID token to corroborate it; it refreshes (if possible) or forces
re-authentication instead of failing open (rank 7).
- http_client_pool.go: the at-limit transport-reuse path now takes the write
lock before mutating refCount (fixes a data race) and only reuses a
transport whose TLS settings (CA pool + InsecureSkipVerify) match the
caller's, never one with a different trust store; if none matches it returns
nil so the caller falls back to a verifying default transport (rank 11).
- tests: add a transport-pool TLS-isolation regression test.
* fix(security): stop logging templated header values (token leak)
Batch 5 of security audit remediation (rank 16).
middleware.go: templated downstream headers commonly carry the access token
(e.g. "Authorization: Bearer {{.AccessToken}}"). The debug log line printed
the full header value, leaking credentials into logs. Log the header name and
byte length instead.
* fix(security): cache-key collision, cache-config divergence, fleet cleanup
Batch 6 of security audit remediation (ranks 9, 10, 12).
- token_manager.go: detectTokenType keys its cache on a SHA-256 hash of the
full token instead of the first 32 chars (which are only the base64url JWT
header). Distinct tokens sharing alg+kid no longer collide and get
mis-classified (rank 10).
- cache_manager.go: the process-global cache manager is initialized once and
shared across plugin instances; it now logs a loud warning when a later
instance requests a different explicit Redis backend that is silently
ignored, surfacing the cross-instance state-isolation hazard (rank 9).
- singleton_resources.go / main.go / utilities.go: track a process-global live
instance count; the shared singleton-token-cleanup task is stopped only when
the LAST instance shuts down, so one instance's Close() (e.g. a config reload)
no longer kills cleanup for surviving instances (rank 12).
- tests: update TestDetectTokenTypeCaching for the new key; add regression tests.
* fix(security): bound introspection cache + cookie lifetime to config
Batch 7 of security audit remediation (ranks 8, 13).
- token_introspection.go: when requireTokenIntrospection is enabled, cap the
positive introspection-result cache at 30s (instead of 5m) so a token
revoked at the provider stops passing within ~30s, matching the operator's
near-real-time revocation expectation (rank 8).
- session.go: bind the cookie store's MaxAge to the configured sessionMaxAge,
so the cookie codec's cryptographic timestamp validity is no longer fixed at
gorilla's 30-day default; a stolen cookie is valid only for the configured
session lifetime (rank 13).
- tests: add a cookie-lifetime regression test.
* fix(security): low-severity hardening (cache, DoS caps, PKCE, throttle)
Batch 8 of security audit remediation — low severity
(ranks 24, 25, 27, 29, 31, 36, 37, 41, 45, 46, 49).
- universal_cache.go: updateLocalCache updates an existing key in place instead
of orphaning its LRU element and double-counting currentSize/currentMemory
(rank 36 — the only production-reachable bug in this batch).
- jwk.go / metadata_cache.go / token_introspection.go: bound response bodies
with io.LimitReader (1 MiB) to prevent memory exhaustion from a hostile or
buggy provider (ranks 24, 25).
- jwk.go: skip JWKs not usable for signature verification (use != sig, or
key_ops without "verify") when building the key set (rank 49).
- auth_flow.go: fail closed at the callback when PKCE is enabled but the code
verifier is missing, instead of silently dropping it (rank 27).
- utilities.go / main.go: match allowedUserDomains case-insensitively (rank 31).
- bearer_auth.go: a single success no longer wipes an active per-IP penalty;
the counter resets only when no penalty is in effect (rank 29).
- main.go: handle (not discard) the NewSessionManager error (rank 37).
- error_recovery.go: take a write lock in isServiceDegraded (it deletes from a
map); compare retryable-error substrings case-insensitively (ranks 45, 46).
- singleton_resources.go: bind the generic-cache cleanup goroutine to the
resource-manager shutdown channel so it cannot outlive its owner (rank 41).
- tests: update the bearer throttle test to the corrected penalty semantics.
* fix(security): header sanitization, issuer pinning, fail-closed paths
Batch 9 of security audit remediation (ranks 18, 19, 20, 21, 22, 30, 33, 34).
- middleware.go / bearer_auth.go: sanitize claim-derived values on the cookie
auth path before injecting them into downstream headers. Drop group/role and
identifier values containing control chars, bidi-override runes, or the
, ; = delimiters (a comma would inject phantom entries into X-User-Groups);
reject control/bidi/over-length in rendered templated header output (but
permit , ; = in free-form values such as a bearer token). The bearer path
already sanitized; the cookie path did not (ranks 33, 34).
- main.go / metadata_cache.go: pin the discovered issuer to the configured
provider host (sameHost) and refuse/never-cache a mismatch, so a poisoned
discovery document cannot redefine the JWT trust anchor (ranks 21, 22).
- token_introspection.go: when a distinct API audience is configured, fail
closed on a missing or mismatched introspection audience; aud parsed as
string-or-array per RFC 7662 (rank 19).
- logout.go: front-channel logout requires a matching issuer; an empty iss is
rejected (blocks unauthenticated forced-logout via a known sid) (rank 30).
- token_validation_rs.go: an opaque access token with no ID token and no
successful introspection fails closed (re-auth) instead of authenticating
(ranks 18, 20).
- tests: realistic same-host provider mocks; regression tests for the header
sanitization distinction and the fail-closed paths.
* chore(security): remove unwired dead code with latent footguns
Batch 10 of security audit remediation — delete confirmed-dead, unwired
subsystems (ranks 26, 35, 50). None had a production caller (grep-verified);
removal eliminates the latent footguns and ~2.1k lines of dead code.
- token_validator.go (deleted): an unused *TokenValidator whose validateJWT set
Valid=true with NO signature verification — a severe footgun if ever wired
(rank 50). The wired RS-aware validators are unaffected.
- security_monitoring.go (deleted): an unused *SecurityMonitor / ExtractClientIP
that trusted spoofable X-Forwarded-For / X-Real-IP. The live bearer throttle
uses clientIPForBearer (RemoteAddr-only), unchanged (rank 35).
- dynamic_client_registration.go: removed the RFC 7592 management methods
(Update/Read/DeleteClientRegistration) that dereferenced an attacker-
influenced RegistrationClientURI with the registration token attached and no
HTTPS/SSRF gate, and had no callers. The wired RFC 7591 RegisterClient and
credential-store helpers are kept (rank 26).
- tests: removed the tests covering the deleted code.
* chore: add Makefile with yaegi load validation
No Makefile existed. The new `yaegi-validate` target interprets the plugin
under the yaegi interpreter the same way Traefik loads it, catching yaegi-only
incompatibilities (unsupported stdlib symbols, reflection edge cases) that the
native `go build` / `go test` toolchain does not. Importing the plugin forces
yaegi to interpret every file plus its vendored deps; CreateConfig + New
exercise the instantiation path.
- cmd/yaegicheck/main.go: the load driver, marked //go:build ignore so it is
excluded from `go build ./...` (avoids VCS-stamping a main binary, which
fails in git-worktree layouts) yet is run explicitly by yaegi.
- Makefile: build / fmt / vet / lint / test / vendor / yaegi-validate / check
targets; `make check` runs vet + tests + yaegi-validate.
Verified: `make yaegi-validate` passes on this branch — the HKDF cookie
encryption, net-based endpoint validation, and claim sanitizers all interpret
and instantiate cleanly under yaegi.
* ci: bump workflow Go toolchain to 1.25; pin yaegi-validate to v0.16.1
Traefik v3.7.1 (the deployed version) is built with `go 1.25.0`, so the PR and
release workflows now use Go 1.25.x to match the toolchain Traefik uses.
Important distinction: the CI Go version is the build TOOLCHAIN. The plugin's
actual interpreter-compatibility ceiling is the yaegi version Traefik bundles
(v0.16.1, which declares go 1.21 and ships a ~Go 1.22 stdlib symbol surface),
NOT the CI Go version. That ceiling is enforced by `make yaegi-validate` plus
the go.mod language directive — e.g. it is why HKDF is hand-rolled with
hmac+sha256 rather than Go 1.24's crypto/hkdf, which yaegi v0.16.1 lacks.
Also pin Makefile YAEGI_VERSION to v0.16.1 (what Traefik v3.7.1 vendors) so
yaegi-validate exercises the real deployed interpreter instead of @latest,
which could pass on a newer yaegi that supports symbols the deployed one does
not.
* docs: align README/CONFIGURATION with branch behavior changes
- excludedURLs: documented as segment/extension-boundary matching (was
"prefix-matched") — "/public" no longer also matches "/publicsecret" (rank 14).
- Front-channel logout now requires a matching `iss`; requests without one are
rejected with 400 (rank 30).
- Add an "Upgrading from an earlier release" note: session cookies are now
AES-256 encrypted with lifetime tracking sessionMaxAge (one-time re-login on
upgrade), and invalid configuration (rateLimit < 10, key < 32 bytes, missing
callbackURL, non-HTTPS remote providerURL) now fails closed at startup.
* fix: remove staticcheck-flagged unused functions; wire staticcheck into make check
CI Static Analysis (standalone staticcheck) failed with U1000 "unused":
- dynamic_client_registration.go: deleteCredentialsFromStore — its only caller
was the RFC 7592 DeleteClientRegistration removed in the dead-code batch.
- token_test.go: createTestJWTSimple — its only callers were the TokenValidator
tests removed in the same batch.
Both confirmed to have zero remaining callers and removed. build / vet /
go test ./... / staticcheck ./... all green.
The pre-commit hook runs golangci-lint, but CI runs standalone staticcheck
(which flags U1000). Add a `staticcheck` Makefile target and include it in
`make check` so this class of finding is caught locally before push.
* fix(test): stabilize flaky TestWorkerPool_TaskPanic
tasksFailed is incremented in the worker's deferred recover(), which runs after the panicking task's own defer wg.Done(). wg.Wait() could therefore return before the failure was recorded, so reading the counter immediately raced and flaked on slow CI runners. Poll until the failure lands (2s budget) instead. Verified 200x plain + 50x under -race/GOMAXPROCS=1.
611 lines
16 KiB
Go
611 lines
16 KiB
Go
package traefikoidc
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
)
|
|
|
|
var (
|
|
globalResourceManager *ResourceManager
|
|
resourceManagerOnce sync.Once
|
|
resourceManagerMutex sync.Mutex
|
|
)
|
|
|
|
// ResourceManager manages shared resources across all middleware instances
|
|
// to prevent duplication and goroutine leaks when Traefik recreates middleware
|
|
type ResourceManager struct {
|
|
references map[string]*int32
|
|
caches map[string]interface{}
|
|
httpClients map[string]*http.Client
|
|
tasks map[string]*BackgroundTask
|
|
shutdownChan chan struct{}
|
|
pools map[string]*GoroutinePool
|
|
logger *Logger
|
|
wg sync.WaitGroup
|
|
cachesMu sync.RWMutex
|
|
referencesMu sync.RWMutex
|
|
poolsMu sync.RWMutex
|
|
tasksMu sync.RWMutex
|
|
clientsMu sync.RWMutex
|
|
shutdownOnce sync.Once
|
|
}
|
|
|
|
// GetResourceManager returns the global singleton ResourceManager instance
|
|
func GetResourceManager() *ResourceManager {
|
|
resourceManagerOnce.Do(func() {
|
|
globalResourceManager = &ResourceManager{
|
|
httpClients: make(map[string]*http.Client),
|
|
caches: make(map[string]interface{}),
|
|
tasks: make(map[string]*BackgroundTask),
|
|
pools: make(map[string]*GoroutinePool),
|
|
references: make(map[string]*int32),
|
|
logger: GetSingletonNoOpLogger(),
|
|
shutdownChan: make(chan struct{}),
|
|
}
|
|
})
|
|
return globalResourceManager
|
|
}
|
|
|
|
// GetHTTPClient returns a shared HTTP client for the given key
|
|
func (rm *ResourceManager) GetHTTPClient(key string) *http.Client {
|
|
rm.clientsMu.RLock()
|
|
client, exists := rm.httpClients[key]
|
|
rm.clientsMu.RUnlock()
|
|
|
|
if exists {
|
|
return client
|
|
}
|
|
|
|
rm.clientsMu.Lock()
|
|
defer rm.clientsMu.Unlock()
|
|
|
|
// Double-check after acquiring write lock
|
|
if client, exists := rm.httpClients[key]; exists {
|
|
return client
|
|
}
|
|
|
|
// SECURITY FIX: Use secure HTTP client configuration with limits
|
|
config := DefaultHTTPClientConfig()
|
|
factory := NewHTTPClientFactory()
|
|
client = factory.CreateHTTPClient(config)
|
|
|
|
rm.httpClients[key] = client
|
|
return client
|
|
}
|
|
|
|
// GetCache returns a shared cache for the given key
|
|
func (rm *ResourceManager) GetCache(key string) interface{} {
|
|
rm.cachesMu.RLock()
|
|
cache, exists := rm.caches[key]
|
|
rm.cachesMu.RUnlock()
|
|
|
|
if exists {
|
|
return cache
|
|
}
|
|
|
|
rm.cachesMu.Lock()
|
|
defer rm.cachesMu.Unlock()
|
|
|
|
// Double-check after acquiring write lock
|
|
if cache, exists := rm.caches[key]; exists {
|
|
return cache
|
|
}
|
|
|
|
// Create cache based on key type
|
|
// Use global cache manager for proper singleton caches
|
|
cacheManager := GetGlobalCacheManager(&rm.wg)
|
|
switch key {
|
|
case "metadata-cache":
|
|
cache = cacheManager.GetSharedMetadataCache()
|
|
case "token-cache":
|
|
cache = cacheManager.GetSharedTokenCache()
|
|
case "jwk-cache":
|
|
cache = cacheManager.GetSharedJWKCache()
|
|
default:
|
|
// Generic cache implementation; bind cleanup goroutine to the manager's
|
|
// shutdown channel so it exits when the ResourceManager shuts down.
|
|
cache = newGenericCacheWithOwner(1*time.Hour, rm.logger, rm.shutdownChan)
|
|
}
|
|
|
|
rm.caches[key] = cache
|
|
return cache
|
|
}
|
|
|
|
// RegisterBackgroundTask registers a singleton background task
|
|
func (rm *ResourceManager) RegisterBackgroundTask(name string, interval time.Duration, taskFunc func()) error {
|
|
rm.tasksMu.Lock()
|
|
defer rm.tasksMu.Unlock()
|
|
|
|
// Check if task already exists
|
|
if _, exists := rm.tasks[name]; exists {
|
|
if rm.logger != nil {
|
|
rm.logger.Debugf("Background task %s already registered", name)
|
|
}
|
|
// Return existing task without error for idempotency
|
|
return nil
|
|
}
|
|
|
|
// Create new task with WaitGroup for proper cleanup
|
|
task := NewBackgroundTask(name, interval, taskFunc, rm.logger, &rm.wg)
|
|
rm.tasks[name] = task
|
|
|
|
if rm.logger != nil {
|
|
rm.logger.Infof("Registered singleton background task: %s", name)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// StartBackgroundTask starts a registered background task
|
|
func (rm *ResourceManager) StartBackgroundTask(name string) error {
|
|
rm.tasksMu.RLock()
|
|
task, exists := rm.tasks[name]
|
|
rm.tasksMu.RUnlock()
|
|
|
|
if !exists {
|
|
return fmt.Errorf("task %s not registered", name)
|
|
}
|
|
|
|
task.Start()
|
|
return nil
|
|
}
|
|
|
|
// StopBackgroundTask stops a running background task
|
|
func (rm *ResourceManager) StopBackgroundTask(name string) error {
|
|
rm.tasksMu.RLock()
|
|
task, exists := rm.tasks[name]
|
|
rm.tasksMu.RUnlock()
|
|
|
|
if !exists {
|
|
return fmt.Errorf("task %s not registered", name)
|
|
}
|
|
|
|
task.Stop()
|
|
return nil
|
|
}
|
|
|
|
// IsTaskRunning checks if a background task is running
|
|
func (rm *ResourceManager) IsTaskRunning(name string) bool {
|
|
rm.tasksMu.RLock()
|
|
task, exists := rm.tasks[name]
|
|
rm.tasksMu.RUnlock()
|
|
|
|
if !exists {
|
|
return false
|
|
}
|
|
|
|
// Check if task has been started and not stopped
|
|
return atomic.LoadInt32(&task.started) == 1 && atomic.LoadInt32(&task.stopped) == 0
|
|
}
|
|
|
|
// GetGoroutinePool returns a shared goroutine pool for controlled concurrency
|
|
func (rm *ResourceManager) GetGoroutinePool(key string, maxWorkers int) *GoroutinePool {
|
|
rm.poolsMu.RLock()
|
|
pool, exists := rm.pools[key]
|
|
rm.poolsMu.RUnlock()
|
|
|
|
if exists {
|
|
return pool
|
|
}
|
|
|
|
rm.poolsMu.Lock()
|
|
defer rm.poolsMu.Unlock()
|
|
|
|
// Double-check after acquiring write lock
|
|
if pool, exists := rm.pools[key]; exists {
|
|
return pool
|
|
}
|
|
|
|
// Create new pool
|
|
pool = NewGoroutinePool(maxWorkers, rm.logger)
|
|
rm.pools[key] = pool
|
|
|
|
return pool
|
|
}
|
|
|
|
// AddReference increments the reference count for a given instance
|
|
func (rm *ResourceManager) AddReference(instanceID string) {
|
|
rm.referencesMu.Lock()
|
|
defer rm.referencesMu.Unlock()
|
|
|
|
if count, exists := rm.references[instanceID]; exists {
|
|
atomic.AddInt32(count, 1)
|
|
} else {
|
|
initial := int32(1)
|
|
rm.references[instanceID] = &initial
|
|
}
|
|
|
|
if rm.logger != nil {
|
|
rm.logger.Debugf("Added reference for instance %s", instanceID)
|
|
}
|
|
}
|
|
|
|
// RemoveReference decrements the reference count and triggers cleanup if needed
|
|
func (rm *ResourceManager) RemoveReference(instanceID string) {
|
|
rm.referencesMu.Lock()
|
|
defer rm.referencesMu.Unlock()
|
|
|
|
if count, exists := rm.references[instanceID]; exists {
|
|
newCount := atomic.AddInt32(count, -1)
|
|
if newCount <= 0 {
|
|
delete(rm.references, instanceID)
|
|
if rm.logger != nil {
|
|
rm.logger.Debugf("Removed last reference for instance %s", instanceID)
|
|
}
|
|
// Trigger cleanup for this instance if needed
|
|
rm.cleanupInstance(instanceID)
|
|
}
|
|
}
|
|
}
|
|
|
|
// GetReferenceCount returns the current reference count for an instance
|
|
func (rm *ResourceManager) GetReferenceCount(instanceID string) int32 {
|
|
rm.referencesMu.RLock()
|
|
defer rm.referencesMu.RUnlock()
|
|
|
|
if count, exists := rm.references[instanceID]; exists {
|
|
return atomic.LoadInt32(count)
|
|
}
|
|
return 0
|
|
}
|
|
|
|
// cleanupInstance performs cleanup for a specific instance when its reference count reaches zero
|
|
func (rm *ResourceManager) cleanupInstance(instanceID string) {
|
|
// Instance-specific cleanup logic
|
|
if rm.logger != nil {
|
|
rm.logger.Infof("Cleaning up resources for instance %s", instanceID)
|
|
}
|
|
|
|
// Clean up any instance-specific resources
|
|
// This is a hook for future instance-specific cleanup needs
|
|
}
|
|
|
|
// liveInstanceCount tracks the number of fully-constructed TraefikOidc plugin
|
|
// instances alive in this process. Process-global singleton tasks (such as the
|
|
// shared token-cleanup) must only be stopped when the LAST instance shuts down,
|
|
// otherwise one instance's teardown would disable them for all survivors.
|
|
var liveInstanceCount int32
|
|
|
|
// registerLiveInstance records a newly constructed plugin instance.
|
|
func registerLiveInstance() { atomic.AddInt32(&liveInstanceCount, 1) }
|
|
|
|
// unregisterLiveInstance records a plugin instance shutting down and returns the
|
|
// number of instances still alive afterwards.
|
|
func unregisterLiveInstance() int32 { return atomic.AddInt32(&liveInstanceCount, -1) }
|
|
|
|
// Shutdown gracefully shuts down all managed resources
|
|
func (rm *ResourceManager) Shutdown(ctx context.Context) error {
|
|
var err error
|
|
|
|
rm.shutdownOnce.Do(func() {
|
|
close(rm.shutdownChan)
|
|
|
|
if rm.logger != nil {
|
|
rm.logger.Info("Starting ResourceManager shutdown")
|
|
}
|
|
|
|
// Stop all background tasks
|
|
rm.tasksMu.RLock()
|
|
tasks := make([]*BackgroundTask, 0, len(rm.tasks))
|
|
for _, task := range rm.tasks {
|
|
tasks = append(tasks, task)
|
|
}
|
|
rm.tasksMu.RUnlock()
|
|
|
|
for _, task := range tasks {
|
|
task.Stop()
|
|
}
|
|
|
|
// Shutdown all goroutine pools
|
|
rm.poolsMu.RLock()
|
|
pools := make([]*GoroutinePool, 0, len(rm.pools))
|
|
for _, pool := range rm.pools {
|
|
pools = append(pools, pool)
|
|
}
|
|
rm.poolsMu.RUnlock()
|
|
|
|
for _, pool := range pools {
|
|
if shutdownErr := pool.Shutdown(ctx); shutdownErr != nil && err == nil {
|
|
err = shutdownErr
|
|
}
|
|
}
|
|
|
|
// Wait for all goroutines with timeout
|
|
done := make(chan struct{})
|
|
go func() {
|
|
rm.wg.Wait()
|
|
close(done)
|
|
}()
|
|
|
|
select {
|
|
case <-done:
|
|
if rm.logger != nil {
|
|
rm.logger.Info("ResourceManager shutdown completed successfully")
|
|
}
|
|
case <-ctx.Done():
|
|
err = fmt.Errorf("shutdown timeout: %w", ctx.Err())
|
|
if rm.logger != nil {
|
|
rm.logger.Errorf("ResourceManager shutdown timeout: %v", err)
|
|
}
|
|
}
|
|
})
|
|
|
|
return err
|
|
}
|
|
|
|
// GoroutinePool provides a pool of workers for controlled concurrency
|
|
type GoroutinePool struct {
|
|
taskQueue chan func()
|
|
shutdownChan chan struct{}
|
|
logger *Logger
|
|
taskCond *sync.Cond
|
|
workerWG sync.WaitGroup
|
|
maxWorkers int
|
|
pendingTasks int64
|
|
shutdownOnce sync.Once
|
|
started int32
|
|
}
|
|
|
|
// NewGoroutinePool creates a new goroutine pool with the specified max workers
|
|
func NewGoroutinePool(maxWorkers int, logger *Logger) *GoroutinePool {
|
|
pool := &GoroutinePool{
|
|
maxWorkers: maxWorkers,
|
|
taskQueue: make(chan func(), maxWorkers*2), // Buffer for queuing
|
|
shutdownChan: make(chan struct{}),
|
|
logger: logger,
|
|
taskCond: sync.NewCond(&sync.Mutex{}),
|
|
pendingTasks: 0,
|
|
}
|
|
|
|
// Start workers
|
|
for i := 0; i < maxWorkers; i++ {
|
|
pool.workerWG.Add(1)
|
|
go pool.worker(i)
|
|
}
|
|
|
|
atomic.StoreInt32(&pool.started, 1)
|
|
|
|
if logger != nil {
|
|
logger.Infof("Created goroutine pool with %d workers", maxWorkers)
|
|
}
|
|
|
|
return pool
|
|
}
|
|
|
|
// worker is the main loop for a pool worker
|
|
func (p *GoroutinePool) worker(id int) {
|
|
defer p.workerWG.Done()
|
|
|
|
for {
|
|
select {
|
|
case task := <-p.taskQueue:
|
|
if task != nil {
|
|
// Execute task with panic recovery
|
|
func() {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
if p.logger != nil {
|
|
p.logger.Errorf("Worker %d panic recovered: %v", id, r)
|
|
}
|
|
}
|
|
}()
|
|
task()
|
|
}()
|
|
|
|
// Signal that task is complete - decrement pending count and notify waiters
|
|
newCount := atomic.AddInt64(&p.pendingTasks, -1)
|
|
if newCount == 0 {
|
|
p.taskCond.L.Lock()
|
|
p.taskCond.Broadcast() // Wake up all waiters when queue is empty
|
|
p.taskCond.L.Unlock()
|
|
}
|
|
}
|
|
case <-p.shutdownChan:
|
|
if p.logger != nil {
|
|
p.logger.Debugf("Worker %d shutting down", id)
|
|
}
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// Submit submits a task to the pool
|
|
func (p *GoroutinePool) Submit(task func()) error {
|
|
if atomic.LoadInt32(&p.started) == 0 {
|
|
return fmt.Errorf("pool is shutdown")
|
|
}
|
|
|
|
// Increment pending task count BEFORE queuing to avoid race with Wait()
|
|
atomic.AddInt64(&p.pendingTasks, 1)
|
|
|
|
select {
|
|
case p.taskQueue <- task:
|
|
return nil
|
|
case <-p.shutdownChan:
|
|
// Decrement since task won't be processed
|
|
atomic.AddInt64(&p.pendingTasks, -1)
|
|
return fmt.Errorf("pool is shutting down")
|
|
default:
|
|
// Queue is full, try with a small timeout
|
|
select {
|
|
case p.taskQueue <- task:
|
|
return nil
|
|
case <-time.After(100 * time.Millisecond):
|
|
// Decrement since task won't be processed
|
|
atomic.AddInt64(&p.pendingTasks, -1)
|
|
return fmt.Errorf("task queue is full")
|
|
case <-p.shutdownChan:
|
|
// Decrement since task won't be processed
|
|
atomic.AddInt64(&p.pendingTasks, -1)
|
|
return fmt.Errorf("pool is shutting down")
|
|
}
|
|
}
|
|
}
|
|
|
|
// Wait waits for all submitted tasks to complete using condition variable
|
|
// This is efficient and does not busy-poll, avoiding CPU spikes
|
|
func (p *GoroutinePool) Wait() {
|
|
p.taskCond.L.Lock()
|
|
defer p.taskCond.L.Unlock()
|
|
|
|
// Wait until all pending tasks are complete
|
|
// Uses condition variable to sleep efficiently instead of busy-polling
|
|
for atomic.LoadInt64(&p.pendingTasks) > 0 {
|
|
p.taskCond.Wait() // Efficiently blocks until signaled
|
|
}
|
|
}
|
|
|
|
// WaitWithTimeout waits for all submitted tasks to complete with a timeout
|
|
// Returns true if all tasks completed, false if timeout occurred
|
|
func (p *GoroutinePool) WaitWithTimeout(timeout time.Duration) bool {
|
|
done := make(chan struct{})
|
|
|
|
go func() {
|
|
p.Wait()
|
|
close(done)
|
|
}()
|
|
|
|
select {
|
|
case <-done:
|
|
return true
|
|
case <-time.After(timeout):
|
|
return false
|
|
}
|
|
}
|
|
|
|
// PendingTasks returns the number of tasks currently pending (queued or in-progress)
|
|
func (p *GoroutinePool) PendingTasks() int64 {
|
|
return atomic.LoadInt64(&p.pendingTasks)
|
|
}
|
|
|
|
// Shutdown gracefully shuts down the pool
|
|
func (p *GoroutinePool) Shutdown(ctx context.Context) error {
|
|
var err error
|
|
|
|
p.shutdownOnce.Do(func() {
|
|
atomic.StoreInt32(&p.started, 0)
|
|
close(p.shutdownChan)
|
|
|
|
// Wait for workers to finish with context timeout
|
|
done := make(chan struct{})
|
|
go func() {
|
|
p.workerWG.Wait()
|
|
close(done)
|
|
}()
|
|
|
|
select {
|
|
case <-done:
|
|
if p.logger != nil {
|
|
p.logger.Debug("Goroutine pool shutdown completed")
|
|
}
|
|
case <-ctx.Done():
|
|
err = fmt.Errorf("pool shutdown timeout: %w", ctx.Err())
|
|
if p.logger != nil {
|
|
p.logger.Errorf("Goroutine pool shutdown timeout: %v", err)
|
|
}
|
|
}
|
|
})
|
|
|
|
return err
|
|
}
|
|
|
|
// GenericCache provides a simple cache implementation for testing
|
|
type GenericCache struct {
|
|
data map[string]interface{}
|
|
// ownerStopChan, when non-nil, signals the cleanup goroutine to exit when
|
|
// the owning ResourceManager shuts down, so the goroutine cannot outlive it.
|
|
ownerStopChan <-chan struct{}
|
|
logger *Logger
|
|
stopChan chan struct{}
|
|
ttl time.Duration
|
|
mu sync.RWMutex
|
|
}
|
|
|
|
// NewGenericCache creates a new generic cache
|
|
func NewGenericCache(ttl time.Duration, logger *Logger) *GenericCache {
|
|
return newGenericCacheWithOwner(ttl, logger, nil)
|
|
}
|
|
|
|
// newGenericCacheWithOwner creates a generic cache whose cleanup goroutine also
|
|
// exits when ownerStopChan is closed (typically the ResourceManager shutdown
|
|
// channel), guaranteeing the goroutine is stoppable on shutdown.
|
|
func newGenericCacheWithOwner(ttl time.Duration, logger *Logger, ownerStopChan <-chan struct{}) *GenericCache {
|
|
cache := &GenericCache{
|
|
data: make(map[string]interface{}),
|
|
ttl: ttl,
|
|
logger: logger,
|
|
stopChan: make(chan struct{}),
|
|
ownerStopChan: ownerStopChan,
|
|
}
|
|
|
|
// Start cleanup routine
|
|
go cache.cleanupRoutine()
|
|
|
|
return cache
|
|
}
|
|
|
|
// Get retrieves a value from the cache
|
|
func (gc *GenericCache) Get(key string) (interface{}, bool) {
|
|
gc.mu.RLock()
|
|
defer gc.mu.RUnlock()
|
|
|
|
val, exists := gc.data[key]
|
|
return val, exists
|
|
}
|
|
|
|
// Set stores a value in the cache
|
|
func (gc *GenericCache) Set(key string, value interface{}) {
|
|
gc.mu.Lock()
|
|
defer gc.mu.Unlock()
|
|
|
|
gc.data[key] = value
|
|
}
|
|
|
|
// Delete removes a value from the cache
|
|
func (gc *GenericCache) Delete(key string) {
|
|
gc.mu.Lock()
|
|
defer gc.mu.Unlock()
|
|
|
|
delete(gc.data, key)
|
|
}
|
|
|
|
// cleanupRoutine periodically wipes the cache.
|
|
//
|
|
// NOTE: GenericCache does not track per-entry timestamps, so this is a
|
|
// "clear-all on tick" strategy — every `gc.ttl` interval the entire map
|
|
// is replaced, regardless of when each entry was written. This is the
|
|
// intentional (simplified) behavior of GenericCache, which exists mainly
|
|
// as a generic fallback for tests and non-typed caches. Callers that
|
|
// require true per-entry TTL must use UniversalCache / UnifiedCache which
|
|
// track expiry per entry.
|
|
func (gc *GenericCache) cleanupRoutine() {
|
|
wipeTicker := time.NewTicker(gc.ttl)
|
|
defer wipeTicker.Stop()
|
|
|
|
for {
|
|
select {
|
|
case <-wipeTicker.C:
|
|
gc.mu.Lock()
|
|
// Clear-all on tick, not per-entry TTL (see function doc).
|
|
gc.data = make(map[string]interface{})
|
|
gc.mu.Unlock()
|
|
case <-gc.stopChan:
|
|
return
|
|
case <-gc.ownerStopChan:
|
|
// Owning ResourceManager is shutting down; exit so the goroutine
|
|
// does not outlive its owner. A nil channel blocks forever, so this
|
|
// case is inert when no owner is set.
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// Stop stops the cleanup routine
|
|
func (gc *GenericCache) Stop() {
|
|
close(gc.stopChan)
|
|
}
|