mirror of
https://github.com/lukaszraczylo/traefikoidc.git
synced 2026-06-06 22:49:43 +00:00
2d1b04c637
* Multiple fixes - refresh coordinator dedup + memory pressure wire - middleware sse consolidation + timer leak + claim cache - universal cache sync backfill + isDebug gate - lazy background task race - memory monitor stw cached + refresh() api * fix(auth): suppress OIDC redirects on non-navigation requests - [x] Add isNonNavigationRequest using Sec-Fetch-Mode and Accept headers - [x] Add comprehensive TestIsNonNavigationRequest - [x] Update ServeHTTP to 401 non-navigation and AJAX requests Fixes #129 * feat(config): add custom CA and insecure skip verify for OIDC TLS - [x] Add CACertPath, CACertPEM, InsecureSkipVerify to Config - [x] Implement loadCACertPool for CA bundle loading - [x] Update HTTPClientConfig with RootCAs and InsecureSkipVerify - [x] Apply CA pool and skip verify to pooled HTTP clients - [x] Enhance configKey to distinguish TLS configs - [x] Add comprehensive ca_cert_test.go Fixes #125 * feat(oidc): add custom CA certificate support for private OIDC providers - [x] Add caCertPath, caCertPEM, insecureSkipVerify config options - [x] Update traefik.yml with new OIDC client config fields - [x] Add configuration schema descriptions for new options - [x] Update README table and add Custom CA Certificates section * Fix the documentation. * test(redis): add oversized argument rejection test - [x] Add TestRedisConn_RejectOversizedArgumentBytes - [x] Import strings package * Dependencies cleanup
267 lines
7.4 KiB
Go
267 lines
7.4 KiB
Go
package traefikoidc
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
)
|
|
|
|
// SharedTransportPool manages a pool of shared HTTP transports to prevent connection exhaustion
|
|
type SharedTransportPool struct {
|
|
ctx context.Context
|
|
transports map[string]*sharedTransport
|
|
cancel context.CancelFunc
|
|
maxConns int
|
|
mu sync.RWMutex
|
|
clientCount int32
|
|
maxClients int32
|
|
}
|
|
|
|
type sharedTransport struct {
|
|
lastUsed time.Time
|
|
transport *http.Transport
|
|
refCount int
|
|
}
|
|
|
|
var (
|
|
globalTransportPool *SharedTransportPool
|
|
globalTransportPoolOnce sync.Once
|
|
)
|
|
|
|
// GetGlobalTransportPool returns the singleton transport pool instance
|
|
func GetGlobalTransportPool() *SharedTransportPool {
|
|
globalTransportPoolOnce.Do(func() {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
globalTransportPool = &SharedTransportPool{
|
|
transports: make(map[string]*sharedTransport),
|
|
maxConns: 20, // SECURITY FIX: Reduced from 100 to prevent resource exhaustion
|
|
ctx: ctx,
|
|
cancel: cancel,
|
|
clientCount: 0,
|
|
maxClients: 5, // SECURITY FIX: Maximum 5 HTTP clients
|
|
}
|
|
// Start cleanup goroutine with context cancellation
|
|
go globalTransportPool.cleanupIdleTransports(ctx)
|
|
})
|
|
return globalTransportPool
|
|
}
|
|
|
|
// GetOrCreateTransport gets or creates a shared transport with the given config
|
|
func (p *SharedTransportPool) GetOrCreateTransport(config HTTPClientConfig) *http.Transport {
|
|
// SECURITY FIX: Check client limit before creating new transport
|
|
if atomic.LoadInt32(&p.clientCount) >= p.maxClients {
|
|
// Return existing transport if limit reached
|
|
p.mu.RLock()
|
|
defer p.mu.RUnlock()
|
|
for _, shared := range p.transports {
|
|
if shared != nil && shared.transport != nil {
|
|
shared.refCount++
|
|
shared.lastUsed = time.Now()
|
|
return shared.transport
|
|
}
|
|
}
|
|
// If no transport available, return nil (caller should handle)
|
|
return nil
|
|
}
|
|
|
|
p.mu.Lock()
|
|
defer p.mu.Unlock()
|
|
|
|
key := p.configKey(config)
|
|
|
|
if shared, exists := p.transports[key]; exists {
|
|
shared.refCount++
|
|
shared.lastUsed = time.Now()
|
|
return shared.transport
|
|
}
|
|
|
|
// Increment client count
|
|
atomic.AddInt32(&p.clientCount, 1)
|
|
|
|
// Create new transport with conservative limits
|
|
transport := &http.Transport{
|
|
Proxy: http.ProxyFromEnvironment,
|
|
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
|
|
dialer := &net.Dialer{
|
|
Timeout: config.DialTimeout,
|
|
KeepAlive: config.KeepAlive,
|
|
}
|
|
return dialer.DialContext(ctx, network, addr)
|
|
},
|
|
// SECURITY FIX: Enforce TLS 1.2+ and secure cipher suites
|
|
TLSClientConfig: &tls.Config{
|
|
MinVersion: tls.VersionTLS12,
|
|
MaxVersion: tls.VersionTLS13,
|
|
CipherSuites: []uint16{
|
|
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
|
|
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
|
|
},
|
|
PreferServerCipherSuites: true,
|
|
RootCAs: config.RootCAs,
|
|
InsecureSkipVerify: config.InsecureSkipVerify, //nolint:gosec // opt-in, loud warning emitted at plugin startup
|
|
},
|
|
ForceAttemptHTTP2: config.ForceHTTP2,
|
|
TLSHandshakeTimeout: config.TLSHandshakeTimeout,
|
|
ExpectContinueTimeout: config.ExpectContinueTimeout,
|
|
MaxIdleConns: 10, // SECURITY FIX: Further reduced
|
|
MaxIdleConnsPerHost: 2, // SECURITY FIX: Limited connections
|
|
IdleConnTimeout: 30 * time.Second, // Reduced from 5 minutes
|
|
DisableKeepAlives: config.DisableKeepAlives,
|
|
MaxConnsPerHost: 5, // SECURITY FIX: Strict limit
|
|
ResponseHeaderTimeout: config.ResponseHeaderTimeout,
|
|
DisableCompression: config.DisableCompression,
|
|
WriteBufferSize: config.WriteBufferSize,
|
|
ReadBufferSize: config.ReadBufferSize,
|
|
}
|
|
|
|
p.transports[key] = &sharedTransport{
|
|
transport: transport,
|
|
refCount: 1,
|
|
lastUsed: time.Now(),
|
|
}
|
|
|
|
return transport
|
|
}
|
|
|
|
// ReleaseTransport decrements the reference count for a transport
|
|
func (p *SharedTransportPool) ReleaseTransport(transport *http.Transport) {
|
|
p.mu.Lock()
|
|
defer p.mu.Unlock()
|
|
|
|
for _, shared := range p.transports {
|
|
if shared.transport == transport {
|
|
shared.refCount--
|
|
if shared.refCount <= 0 {
|
|
// Mark for cleanup but don't immediately close
|
|
shared.lastUsed = time.Now()
|
|
}
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// cleanupIdleTransports periodically cleans up unused transports
|
|
// Uses two-phase cleanup to minimize lock contention:
|
|
// 1. Find candidates while holding read lock
|
|
// 2. Remove and close transports with minimal lock duration
|
|
func (p *SharedTransportPool) cleanupIdleTransports(ctx context.Context) {
|
|
ticker := time.NewTicker(1 * time.Minute)
|
|
defer ticker.Stop()
|
|
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
return
|
|
case <-ticker.C:
|
|
p.performCleanup()
|
|
}
|
|
}
|
|
}
|
|
|
|
// performCleanup does the actual cleanup with optimized locking
|
|
func (p *SharedTransportPool) performCleanup() {
|
|
now := time.Now()
|
|
|
|
// Phase 1: Find candidates while holding read lock (fast)
|
|
p.mu.RLock()
|
|
candidates := make([]string, 0)
|
|
for transportKey, shared := range p.transports {
|
|
// Clean up transports not used for 2 minutes with no references
|
|
if shared.refCount <= 0 && now.Sub(shared.lastUsed) > 2*time.Minute {
|
|
candidates = append(candidates, transportKey)
|
|
}
|
|
}
|
|
p.mu.RUnlock()
|
|
|
|
if len(candidates) == 0 {
|
|
return
|
|
}
|
|
|
|
// Phase 2: Remove and close each candidate individually
|
|
// This minimizes lock contention and allows concurrent access
|
|
for _, key := range candidates {
|
|
p.mu.Lock()
|
|
shared, exists := p.transports[key]
|
|
if exists && shared.refCount <= 0 && now.Sub(shared.lastUsed) > 2*time.Minute {
|
|
// Remove from map first (releases memory)
|
|
delete(p.transports, key)
|
|
atomic.AddInt32(&p.clientCount, -1)
|
|
p.mu.Unlock()
|
|
|
|
// Close idle connections outside the lock (can be slow)
|
|
if shared.transport != nil {
|
|
shared.transport.CloseIdleConnections()
|
|
}
|
|
} else {
|
|
p.mu.Unlock()
|
|
}
|
|
}
|
|
}
|
|
|
|
// configKey generates a unique key for a config
|
|
func (p *SharedTransportPool) configKey(config HTTPClientConfig) string {
|
|
// Pool transports by the parameters that change TLS or connection
|
|
// behavior. RootCAs and InsecureSkipVerify MUST be part of the key:
|
|
// otherwise a middleware configured with a custom CA would share a
|
|
// transport with one using the system store, silently bypassing its
|
|
// CA configuration.
|
|
skip := "0"
|
|
if config.InsecureSkipVerify {
|
|
skip = "1"
|
|
}
|
|
return fmt.Sprintf("%d|%d|%p|%s",
|
|
config.MaxConnsPerHost,
|
|
config.MaxIdleConnsPerHost,
|
|
config.RootCAs,
|
|
skip,
|
|
)
|
|
}
|
|
|
|
// Cleanup closes all transports and stops the cleanup goroutine
|
|
func (p *SharedTransportPool) Cleanup() {
|
|
p.mu.Lock()
|
|
defer p.mu.Unlock()
|
|
|
|
// Stop the cleanup goroutine
|
|
if p.cancel != nil {
|
|
p.cancel()
|
|
}
|
|
|
|
for _, shared := range p.transports {
|
|
shared.transport.CloseIdleConnections()
|
|
}
|
|
p.transports = make(map[string]*sharedTransport)
|
|
}
|
|
|
|
// CreatePooledHTTPClient creates an HTTP client using the shared transport pool
|
|
func CreatePooledHTTPClient(config HTTPClientConfig) *http.Client {
|
|
pool := GetGlobalTransportPool()
|
|
transport := pool.GetOrCreateTransport(config)
|
|
|
|
client := &http.Client{
|
|
Timeout: config.Timeout,
|
|
Transport: transport,
|
|
}
|
|
|
|
// Configure redirect policy
|
|
maxRedirects := config.MaxRedirects
|
|
if maxRedirects == 0 {
|
|
maxRedirects = 10
|
|
}
|
|
client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
|
|
if len(via) >= maxRedirects {
|
|
return http.ErrUseLastResponse
|
|
}
|
|
return nil
|
|
}
|
|
|
|
return client
|
|
}
|