mirror of
https://github.com/lukaszraczylo/traefikoidc.git
synced 2026-10-14 04:07:46 +00:00
Complete rebuild of the plugin
* Fix bug affecting Azure OIDC authentication ( and most likely others ) * Fixes issue #51 * Ensure that appended roles are unique. Update the documentation. * Improvements targetting possible memory usage spikes. * Additional fixes and cleanup * Refactoring code to fix the issues identified by the users. * Modernize run * Fieldalignment * Multiple changes to improve performance and reduce complexity. - Optimise the errors and recovery. - Deduplicate code in metadata cache. - Remove unused performance monitoring code. - Simplify session management and settings handling. * Fix claims issue. * Add ability to overwrite the default scopes in the settings file * Well.. that escalated quickly. Completely forgot that Traefik uses outdated Yaegi and requires compatibility with 1.20 ( pre-generic Go code ). * Bugfix #51: Ensures that user provided scopes overrides work. * fixup! Bugfix #51: Ensures that user provided scopes overrides work. * fixup! fixup! Bugfix #51: Ensures that user provided scopes overrides work. * Abstract the provider logic into a separate package. * Additional micro fixes and cleanups. * Simplify all the things. * fixup! Simplify all the things. * fixup! fixup! Simplify all the things. * fixup! fixup! fixup! Simplify all the things. * fixup! fixup! fixup! fixup! Simplify all the things. * ... * Cleanup tests. * fixup! Cleanup tests. * fixup! fixup! fixup! Cleanup tests. * fixup! fixup! fixup! fixup! Cleanup tests. * fixup! fixup! fixup! fixup! fixup! Cleanup tests. * Issue #53: Fix CSRF token handling in reverse proxy 1. ✅ HTTPS Detection Fixed (session.go:723) - Now uses X-Forwarded-Proto header instead of r.URL.Scheme - Properly detects HTTPS in reverse proxy environments 2. ✅ SameSite Cookie Attribute Fixed - Removed automatic SameSiteStrictMode for HTTPS (would break OAuth) - Keeps SameSiteLaxMode to allow OAuth callbacks from external domains - Only uses Strict for AJAX requests which don't involve OAuth redirects 3. ✅ Cookie Domain Handling Fixed - Now respects X-Forwarded-Host header for cookie domain - Ensures cookies are set for the public domain, not internal proxy domain 4. ✅ EnhanceSessionSecurity Properly Integrated - Function is now actually called during session save - Applies security enhancements without breaking OAuth flow Why Issue #53 Failed Before: 1. Cookies were not marked Secure in HTTPS environments (browser wouldn't send them back) 2. If they had been Secure with SameSite=Strict, Azure callbacks would still fail 3. Cookie domain might have been wrong (internal vs public domain) Why It Works Now: 1. Cookies are properly marked Secure for HTTPS 2. Uses SameSite=Lax to allow OAuth provider callbacks 3. Cookie domain uses public domain from X-Forwarded-Host 4. CSRF token persists through the entire OAuth flow * Next set of enhancements together with memory usage improvements. * Memory leak fixes and optimisations. * CSRF and Cookie Domain fixes * fixup! CSRF and Cookie Domain fixes * Metadata cache leak fix + profiling * fixup! Metadata cache leak fix + profiling * Memory leaks hunting, part 1337. * Further pursue of perfection. * fixup! Further pursue of perfection. * fixup! fixup! Further pursue of perfection. * fixup! fixup! fixup! Further pursue of perfection. * fixup! fixup! fixup! fixup! Further pursue of perfection. * fixup! fixup! fixup! fixup! fixup! Further pursue of perfection. * fixup! fixup! fixup! fixup! fixup! fixup! Further pursue of perfection. * fixup! fixup! fixup! fixup! fixup! fixup! fixup! Further pursue of perfection. * fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Further pursue of perfection. * fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Further pursue of perfection. * Clear race conditions * fixup! Clear race conditions * Weekend fun with memory leaks * Splitting code into multiple files with reasonable testing coverage. ``` ok github.com/lukaszraczylo/traefikoidc 117.017s coverage: 72.6% of statements ok github.com/lukaszraczylo/traefikoidc/auth 0.505s coverage: 87.1% of statements ok github.com/lukaszraczylo/traefikoidc/circuit_breaker 0.283s coverage: 99.0% of statements github.com/lukaszraczylo/traefikoidc/config coverage: 0.0% of statements ok github.com/lukaszraczylo/traefikoidc/handlers 0.349s coverage: 98.2% of statements ok github.com/lukaszraczylo/traefikoidc/internal/providers (cached) coverage: 94.3% of statements ok github.com/lukaszraczylo/traefikoidc/middleware 0.808s coverage: 78.0% of statements ok github.com/lukaszraczylo/traefikoidc/recovery 0.653s coverage: 100.0% of statements ok github.com/lukaszraczylo/traefikoidc/session/chunking (cached) coverage: 87.8% of statements ok github.com/lukaszraczylo/traefikoidc/session/core (cached) coverage: 85.6% of statements ok github.com/lukaszraczylo/traefikoidc/session/crypto (cached) coverage: 81.8% of statements ok github.com/lukaszraczylo/traefikoidc/session/storage (cached) coverage: 93.5% of statements ok github.com/lukaszraczylo/traefikoidc/session/validators (cached) coverage: 98.8% of statements ```` * fixup! Splitting code into multiple files with reasonable testing coverage. * fixup! fixup! Splitting code into multiple files with reasonable testing coverage. * Weekend fun with further optimisations. * fixup! Weekend fun with further optimisations. * fixup! fixup! Weekend fun with further optimisations. * fixup! fixup! fixup! Weekend fun with further optimisations. * fixup! fixup! fixup! fixup! Weekend fun with further optimisations. * fixup! fixup! fixup! fixup! fixup! Weekend fun with further optimisations. * Pre-release cleanup. * Enhance test coverage. * fixup! Enhance test coverage. * fixup! fixup! Enhance test coverage. * fixup! fixup! fixup! Enhance test coverage.
This commit is contained in:
@@ -0,0 +1,182 @@
|
||||
package logger
|
||||
|
||||
import (
|
||||
"io"
|
||||
"os"
|
||||
"sync"
|
||||
)
|
||||
|
||||
// Factory creates and manages logger instances with singleton support
|
||||
// for common logger types to reduce memory allocation.
|
||||
type Factory struct {
|
||||
mu sync.RWMutex
|
||||
defaultLogger Logger
|
||||
noOpLogger Logger
|
||||
loggers map[string]Logger
|
||||
defaultLogLevel string
|
||||
}
|
||||
|
||||
var (
|
||||
// globalFactory is the singleton factory instance
|
||||
globalFactory *Factory
|
||||
// factoryOnce ensures the factory is created only once
|
||||
factoryOnce sync.Once
|
||||
)
|
||||
|
||||
// GetFactory returns the global logger factory instance
|
||||
func GetFactory() *Factory {
|
||||
factoryOnce.Do(func() {
|
||||
globalFactory = &Factory{
|
||||
loggers: make(map[string]Logger),
|
||||
defaultLogLevel: "info",
|
||||
}
|
||||
})
|
||||
return globalFactory
|
||||
}
|
||||
|
||||
// SetDefaultLogLevel sets the default log level for new loggers
|
||||
func (f *Factory) SetDefaultLogLevel(level string) {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
f.defaultLogLevel = level
|
||||
}
|
||||
|
||||
// GetLogger returns a logger for the given name, creating one if it doesn't exist
|
||||
func (f *Factory) GetLogger(name string) Logger {
|
||||
f.mu.RLock()
|
||||
if logger, exists := f.loggers[name]; exists {
|
||||
f.mu.RUnlock()
|
||||
return logger
|
||||
}
|
||||
f.mu.RUnlock()
|
||||
|
||||
// Create new logger
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
|
||||
// Double check after acquiring write lock
|
||||
if logger, exists := f.loggers[name]; exists {
|
||||
return logger
|
||||
}
|
||||
|
||||
logger := f.createLogger(name)
|
||||
f.loggers[name] = logger
|
||||
return logger
|
||||
}
|
||||
|
||||
// createLogger creates a new logger instance
|
||||
func (f *Factory) createLogger(name string) Logger {
|
||||
if name == "noop" || name == "no-op" || name == "discard" {
|
||||
return GetNoOpLogger()
|
||||
}
|
||||
|
||||
// Create logger with appropriate outputs based on environment
|
||||
var errorOut, infoOut, debugOut io.Writer
|
||||
|
||||
if os.Getenv("OIDC_LOG_TO_FILE") == "true" {
|
||||
// Log to files if configured
|
||||
errorOut = getOrCreateLogFile("error.log")
|
||||
infoOut = getOrCreateLogFile("info.log")
|
||||
debugOut = getOrCreateLogFile("debug.log")
|
||||
} else {
|
||||
// Default to stdout/stderr
|
||||
errorOut = os.Stderr
|
||||
infoOut = os.Stdout
|
||||
debugOut = os.Stdout
|
||||
}
|
||||
|
||||
return NewStandardLogger(f.defaultLogLevel, errorOut, infoOut, debugOut)
|
||||
}
|
||||
|
||||
// GetDefaultLogger returns the default logger instance
|
||||
func (f *Factory) GetDefaultLogger() Logger {
|
||||
f.mu.RLock()
|
||||
if f.defaultLogger != nil {
|
||||
f.mu.RUnlock()
|
||||
return f.defaultLogger
|
||||
}
|
||||
f.mu.RUnlock()
|
||||
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
|
||||
if f.defaultLogger == nil {
|
||||
f.defaultLogger = f.createLogger("default")
|
||||
}
|
||||
|
||||
return f.defaultLogger
|
||||
}
|
||||
|
||||
// GetNoOpLogger returns the singleton no-op logger
|
||||
func (f *Factory) GetNoOpLogger() Logger {
|
||||
f.mu.RLock()
|
||||
if f.noOpLogger != nil {
|
||||
f.mu.RUnlock()
|
||||
return f.noOpLogger
|
||||
}
|
||||
f.mu.RUnlock()
|
||||
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
|
||||
if f.noOpLogger == nil {
|
||||
f.noOpLogger = GetNoOpLogger()
|
||||
}
|
||||
|
||||
return f.noOpLogger
|
||||
}
|
||||
|
||||
// Clear removes all cached loggers (useful for testing)
|
||||
func (f *Factory) Clear() {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
|
||||
f.loggers = make(map[string]Logger)
|
||||
f.defaultLogger = nil
|
||||
// Don't clear noOpLogger as it's a singleton
|
||||
}
|
||||
|
||||
// getOrCreateLogFile returns a file writer for the given log file
|
||||
func getOrCreateLogFile(filename string) io.Writer {
|
||||
logDir := os.Getenv("OIDC_LOG_DIR")
|
||||
if logDir == "" {
|
||||
logDir = "/var/log/traefik-oidc"
|
||||
}
|
||||
|
||||
// Ensure log directory exists
|
||||
if err := os.MkdirAll(logDir, 0755); err != nil {
|
||||
// Fall back to stderr if we can't create the directory
|
||||
return os.Stderr
|
||||
}
|
||||
|
||||
filepath := logDir + "/" + filename
|
||||
file, err := os.OpenFile(filepath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
|
||||
if err != nil {
|
||||
// Fall back to stderr if we can't open the file
|
||||
return os.Stderr
|
||||
}
|
||||
|
||||
return file
|
||||
}
|
||||
|
||||
// Global convenience functions
|
||||
|
||||
// New creates a new logger with the specified level
|
||||
func New(level string) Logger {
|
||||
return GetFactory().GetLogger(level)
|
||||
}
|
||||
|
||||
// Default returns the default logger
|
||||
func Default() Logger {
|
||||
return GetFactory().GetDefaultLogger()
|
||||
}
|
||||
|
||||
// NoOp returns a no-op logger
|
||||
func NoOp() Logger {
|
||||
return GetFactory().GetNoOpLogger()
|
||||
}
|
||||
|
||||
// WithLevel creates a new logger with the specified level
|
||||
func WithLevel(level string) Logger {
|
||||
return NewStandardLogger(level, os.Stderr, os.Stdout, os.Stdout)
|
||||
}
|
||||
Reference in New Issue
Block a user