mirror of
https://github.com/lukaszraczylo/traefikoidc.git
synced 2026-06-05 22:44:17 +00:00
1b49e133da
* 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.
264 lines
6.5 KiB
Go
264 lines
6.5 KiB
Go
package traefikoidc
|
|
|
|
import (
|
|
"context"
|
|
"crypto/ecdsa"
|
|
"crypto/elliptic"
|
|
"crypto/rsa"
|
|
"crypto/x509"
|
|
"encoding/base64"
|
|
"encoding/binary"
|
|
"encoding/json"
|
|
"encoding/pem"
|
|
"fmt"
|
|
"io"
|
|
"math/big"
|
|
"net/http"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// JWK represents a JSON Web Key as defined in RFC 7517.
|
|
// It can represent different key types including RSA, EC, and symmetric keys.
|
|
type JWK struct {
|
|
// Key type (e.g., "RSA", "EC", "oct")
|
|
Kty string `json:"kty"`
|
|
// Key use (e.g., "sig" for signature, "enc" for encryption)
|
|
Use string `json:"use,omitempty"`
|
|
// Key operations allowed
|
|
KeyOps []string `json:"key_ops,omitempty"`
|
|
// Algorithm intended for use with this key
|
|
Alg string `json:"alg,omitempty"`
|
|
// Key ID
|
|
Kid string `json:"kid,omitempty"`
|
|
|
|
// RSA specific fields
|
|
N string `json:"n,omitempty"` // Modulus
|
|
E string `json:"e,omitempty"` // Exponent
|
|
|
|
// EC specific fields
|
|
Crv string `json:"crv,omitempty"` // Curve
|
|
X string `json:"x,omitempty"` // X coordinate
|
|
Y string `json:"y,omitempty"` // Y coordinate
|
|
}
|
|
|
|
// JWKSet represents a set of JSON Web Keys.
|
|
// Typically fetched from an OIDC provider's JWKS endpoint.
|
|
type JWKSet struct {
|
|
// Keys contains the array of JWK objects
|
|
Keys []JWK `json:"keys"`
|
|
}
|
|
|
|
// JWKCache provides thread-safe caching of JWKS using UniversalCache
|
|
type JWKCache struct {
|
|
cache *UniversalCache
|
|
mutex sync.RWMutex
|
|
}
|
|
|
|
// JWKCacheInterface defines the contract for JWK caching implementations.
|
|
type JWKCacheInterface interface {
|
|
GetJWKS(ctx context.Context, jwksURL string, httpClient *http.Client) (*JWKSet, error)
|
|
Cleanup()
|
|
Close()
|
|
}
|
|
|
|
// NewJWKCache creates a new JWK cache using the global cache manager
|
|
func NewJWKCache() *JWKCache {
|
|
manager := GetUniversalCacheManager(nil)
|
|
return &JWKCache{
|
|
cache: manager.GetJWKCache(),
|
|
}
|
|
}
|
|
|
|
// GetJWKS retrieves JWKS from cache or fetches from the remote URL if not cached.
|
|
func (c *JWKCache) GetJWKS(ctx context.Context, jwksURL string, httpClient *http.Client) (*JWKSet, error) {
|
|
// Check cache first
|
|
if cachedValue, found := c.cache.Get(jwksURL); found {
|
|
if jwks, ok := cachedValue.(*JWKSet); ok {
|
|
return jwks, nil
|
|
}
|
|
}
|
|
|
|
c.mutex.Lock()
|
|
defer c.mutex.Unlock()
|
|
|
|
// Double-check after acquiring lock
|
|
if cachedValue, found := c.cache.Get(jwksURL); found {
|
|
if jwks, ok := cachedValue.(*JWKSet); ok {
|
|
return jwks, nil
|
|
}
|
|
}
|
|
|
|
// Fetch from URL
|
|
jwks, err := fetchJWKS(ctx, jwksURL, httpClient)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if len(jwks.Keys) == 0 {
|
|
return nil, fmt.Errorf("JWKS response contains no keys")
|
|
}
|
|
|
|
// Cache for 1 hour
|
|
c.cache.Set(jwksURL, jwks, 1*time.Hour)
|
|
|
|
return jwks, nil
|
|
}
|
|
|
|
// Cleanup is a no-op as cleanup is handled by UniversalCache
|
|
func (c *JWKCache) Cleanup() {
|
|
// Handled internally by UniversalCache
|
|
}
|
|
|
|
// Close is a no-op as the cache is managed globally
|
|
func (c *JWKCache) Close() {
|
|
// Managed by global cache manager
|
|
}
|
|
|
|
// fetchJWKS fetches JWKS from a remote URL
|
|
func fetchJWKS(ctx context.Context, jwksURL string, httpClient *http.Client) (*JWKSet, error) {
|
|
req, err := http.NewRequestWithContext(ctx, "GET", jwksURL, nil)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error creating JWKS request: %w", err)
|
|
}
|
|
|
|
resp, err := httpClient.Do(req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching JWKS: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
body, _ := io.ReadAll(resp.Body)
|
|
return nil, fmt.Errorf("JWKS fetch failed with status %d: %s", resp.StatusCode, body)
|
|
}
|
|
|
|
body, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error reading JWKS response: %w", err)
|
|
}
|
|
|
|
var jwks JWKSet
|
|
if err := json.Unmarshal(body, &jwks); err != nil {
|
|
return nil, fmt.Errorf("error parsing JWKS: %w", err)
|
|
}
|
|
|
|
return &jwks, nil
|
|
}
|
|
|
|
// ToRSAPublicKey converts a JWK to an RSA public key.
|
|
// Returns an error if the JWK is not an RSA key or if the key data is invalid.
|
|
func (jwk *JWK) ToRSAPublicKey() (*rsa.PublicKey, error) {
|
|
if jwk.Kty != "RSA" {
|
|
return nil, fmt.Errorf("not an RSA key")
|
|
}
|
|
|
|
nBytes, err := base64.RawURLEncoding.DecodeString(jwk.N)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error decoding modulus: %w", err)
|
|
}
|
|
|
|
eBytes, err := base64.RawURLEncoding.DecodeString(jwk.E)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error decoding exponent: %w", err)
|
|
}
|
|
|
|
// Convert exponent bytes to int
|
|
var e int
|
|
if len(eBytes) <= 8 {
|
|
// Pad to 8 bytes for uint64
|
|
paddedE := make([]byte, 8)
|
|
copy(paddedE[8-len(eBytes):], eBytes)
|
|
e = int(binary.BigEndian.Uint64(paddedE))
|
|
} else {
|
|
return nil, fmt.Errorf("exponent too large")
|
|
}
|
|
|
|
return &rsa.PublicKey{
|
|
N: new(big.Int).SetBytes(nBytes),
|
|
E: e,
|
|
}, nil
|
|
}
|
|
|
|
// ToECDSAPublicKey converts a JWK to an ECDSA public key.
|
|
// Returns an error if the JWK is not an EC key or if the key data is invalid.
|
|
func (jwk *JWK) ToECDSAPublicKey() (*ecdsa.PublicKey, error) {
|
|
if jwk.Kty != "EC" {
|
|
return nil, fmt.Errorf("not an EC key")
|
|
}
|
|
|
|
var curve elliptic.Curve
|
|
switch jwk.Crv {
|
|
case "P-256":
|
|
curve = elliptic.P256()
|
|
case "P-384":
|
|
curve = elliptic.P384()
|
|
case "P-521":
|
|
curve = elliptic.P521()
|
|
default:
|
|
return nil, fmt.Errorf("unsupported curve: %s", jwk.Crv)
|
|
}
|
|
|
|
xBytes, err := base64.RawURLEncoding.DecodeString(jwk.X)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error decoding X coordinate: %w", err)
|
|
}
|
|
|
|
yBytes, err := base64.RawURLEncoding.DecodeString(jwk.Y)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error decoding Y coordinate: %w", err)
|
|
}
|
|
|
|
return &ecdsa.PublicKey{
|
|
Curve: curve,
|
|
X: new(big.Int).SetBytes(xBytes),
|
|
Y: new(big.Int).SetBytes(yBytes),
|
|
}, nil
|
|
}
|
|
|
|
// GetKey finds a key by its ID (kid) in the JWKSet.
|
|
// Returns nil if no key with the given ID is found.
|
|
func (jwks *JWKSet) GetKey(kid string) *JWK {
|
|
for _, key := range jwks.Keys {
|
|
if key.Kid == kid {
|
|
return &key
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// jwkToPEM converts a JWK to PEM format for signature verification
|
|
func jwkToPEM(jwk *JWK) ([]byte, error) {
|
|
var publicKey interface{}
|
|
var err error
|
|
|
|
switch jwk.Kty {
|
|
case "RSA":
|
|
publicKey, err = jwk.ToRSAPublicKey()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to convert RSA JWK: %w", err)
|
|
}
|
|
case "EC":
|
|
publicKey, err = jwk.ToECDSAPublicKey()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to convert EC JWK: %w", err)
|
|
}
|
|
default:
|
|
return nil, fmt.Errorf("unsupported key type: %s", jwk.Kty)
|
|
}
|
|
|
|
// Marshal the public key to DER format
|
|
pubKeyBytes, err := x509.MarshalPKIXPublicKey(publicKey)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to marshal public key: %w", err)
|
|
}
|
|
|
|
// Encode to PEM format
|
|
pemBlock := &pem.Block{
|
|
Type: "PUBLIC KEY",
|
|
Bytes: pubKeyBytes,
|
|
}
|
|
|
|
return pem.EncodeToMemory(pemBlock), nil
|
|
}
|