Optimise the JWT token cache / creation and verification.

jwt.go

@@ -14,119 +14,175 @@ import (
 )
 
 type JWT struct {
-    Header    map[string]interface{}
+	Header    map[string]interface{}
-    Claims    map[string]interface{}
+	Claims    map[string]interface{}
-    Signature string
+	Signature string
 }
 
 func parseJWT(token string) (*JWT, error) {
-    parts := strings.Split(token, ".")
+	parts := strings.Split(token, ".")
-    if len(parts) != 3 {
+	if len(parts) != 3 {
-        return nil, fmt.Errorf("invalid token format")
+		return nil, fmt.Errorf("invalid token format")
-    }
+	}
 
-    header, err := decodeSegment(parts[0])
+	header, err := decodeSegment(parts[0])
-    if err != nil {
+	if err != nil {
-        return nil, fmt.Errorf("failed to decode header: %w", err)
+		return nil, fmt.Errorf("failed to decode header: %w", err)
-    }
+	}
 
-    claims, err := decodeSegment(parts[1])
+	claims, err := decodeSegment(parts[1])
-    if err != nil {
+	if err != nil {
-        return nil, fmt.Errorf("failed to decode claims: %w", err)
+		return nil, fmt.Errorf("failed to decode claims: %w", err)
-    }
+	}
 
-    return &JWT{
+	return &JWT{
-        Header:    header,
+		Header:    header,
-        Claims:    claims,
+		Claims:    claims,
-        Signature: parts[2],
+		Signature: parts[2],
-    }, nil
+	}, nil
 }
 
 func (j *JWT) Verify(issuerURL, clientID string) error {
-    claims := j.Claims
+	claims := j.Claims
 
-    if err := verifyIssuer(claims["iss"].(string), issuerURL); err != nil {
+	if err := verifyIssuer(claims["iss"].(string), issuerURL); err != nil {
-        return err
+		return err
-    }
+	}
 
-    if err := verifyAudience(claims["aud"].(string), clientID); err != nil {
+	if err := verifyAudience(claims["aud"].(string), clientID); err != nil {
-        return err
+		return err
-    }
+	}
 
-    if err := verifyExpiration(claims["exp"].(float64)); err != nil {
+	if err := verifyExpiration(claims["exp"].(float64)); err != nil {
-        return err
+		return err
-    }
+	}
 
-    if err := verifyIssuedAt(claims["iat"].(float64)); err != nil {
+	if err := verifyIssuedAt(claims["iat"].(float64)); err != nil {
-        return err
+		return err
-    }
+	}
 
-    return nil
+	return nil
 }
 
 func verifyExpiration(expiration float64) error {
-    expirationTime := time.Unix(int64(expiration), 0)
+	expirationTime := time.Unix(int64(expiration), 0)
-    if time.Now().After(expirationTime) {
+	if time.Now().After(expirationTime) {
-        return fmt.Errorf("token has expired")
+		return fmt.Errorf("token has expired")
-    }
+	}
-    return nil
+	return nil
 }
 
 func verifySignature(token string, publicKeyPEM []byte) error {
-    parts := strings.Split(token, ".")
+	parts := strings.Split(token, ".")
-    if len(parts) != 3 {
+	if len(parts) != 3 {
-        return fmt.Errorf("invalid token format")
+		return fmt.Errorf("invalid token format")
-    }
+	}
 
-    block, _ := pem.Decode(publicKeyPEM)
+	block, _ := pem.Decode(publicKeyPEM)
-    if block == nil {
+	if block == nil {
-        return fmt.Errorf("failed to parse PEM block containing the public key")
+		return fmt.Errorf("failed to parse PEM block containing the public key")
-    }
+	}
 
-    pub, err := x509.ParsePKIXPublicKey(block.Bytes)
+	pub, err := x509.ParsePKIXPublicKey(block.Bytes)
-    if err != nil {
+	if err != nil {
-        return fmt.Errorf("failed to parse public key: %w", err)
+		return fmt.Errorf("failed to parse public key: %w", err)
-    }
+	}
 
-    rsaPublicKey, ok := pub.(*rsa.PublicKey)
+	rsaPublicKey, ok := pub.(*rsa.PublicKey)
-    if !ok {
+	if !ok {
-        return fmt.Errorf("not an RSA public key")
+		return fmt.Errorf("not an RSA public key")
-    }
+	}
 
-    signedContent := parts[0] + "." + parts[1]
+	signedContent := parts[0] + "." + parts[1]
-    signature, err := base64.RawURLEncoding.DecodeString(parts[2])
+	signature, err := base64.RawURLEncoding.DecodeString(parts[2])
-    if err != nil {
+	if err != nil {
-        return fmt.Errorf("failed to decode signature: %w", err)
+		return fmt.Errorf("failed to decode signature: %w", err)
-    }
+	}
 
-    hash := sha256.Sum256([]byte(signedContent))
+	hash := sha256.Sum256([]byte(signedContent))
-    err = rsa.VerifyPKCS1v15(rsaPublicKey, crypto.SHA256, hash[:], signature)
+	err = rsa.VerifyPKCS1v15(rsaPublicKey, crypto.SHA256, hash[:], signature)
-    if err != nil {
+	if err != nil {
-        return fmt.Errorf("invalid token signature: %w", err)
+		return fmt.Errorf("invalid token signature: %w", err)
-    }
+	}
 
-    return nil
+	return nil
 }
 
 func verifyIssuedAt(issuedAt float64) error {
-    issuedAtTime := time.Unix(int64(issuedAt), 0)
+	issuedAtTime := time.Unix(int64(issuedAt), 0)
-    if time.Now().Before(issuedAtTime) {
+	if time.Now().Before(issuedAtTime) {
-        return fmt.Errorf("token used before issued")
+		return fmt.Errorf("token used before issued")
-    }
+	}
-    return nil
+	return nil
 }
 
 func decodeSegment(seg string) (map[string]interface{}, error) {
-    data, err := base64.RawURLEncoding.DecodeString(seg)
+	data, err := base64.RawURLEncoding.DecodeString(seg)
-    if err != nil {
+	if err != nil {
-        return nil, fmt.Errorf("failed to decode segment: %w", err)
+		return nil, fmt.Errorf("failed to decode segment: %w", err)
-    }
+	}
 
-    var result map[string]interface{}
+	var result map[string]interface{}
-    err = json.Unmarshal(data, &result)
+	err = json.Unmarshal(data, &result)
-    if err != nil {
+	if err != nil {
-        return nil, fmt.Errorf("failed to unmarshal segment: %w", err)
+		return nil, fmt.Errorf("failed to unmarshal segment: %w", err)
-    }
+	}
 
-    return result, nil
+	return result, nil
+}
+
+func (t *TraefikOidc) verifyAndCacheToken(token string) error {
+	if !t.limiter.Allow() {
+		return fmt.Errorf("rate limit exceeded")
+	}
+
+	if _, exists := t.tokenCache.Get(token); exists {
+		return nil // Token is valid and cached
+	}
+
+	jwt, err := parseJWT(token)
+	if err != nil {
+		return fmt.Errorf("failed to parse JWT: %w", err)
+	}
+
+	if err := t.verifyJWTSignatureAndClaims(jwt, token); err != nil {
+		return err
+	}
+
+	expirationTime := time.Unix(int64(jwt.Claims["exp"].(float64)), 0)
+	t.tokenCache.Set(token, expirationTime)
+
+	return nil
+}
+
+func (t *TraefikOidc) verifyJWTSignatureAndClaims(jwt *JWT, token string) error {
+	jwks, err := t.jwkCache.GetJWKS(t.jwksURL, t.httpClient)
+	if err != nil {
+		return fmt.Errorf("failed to get JWKS: %w", err)
+	}
+
+	kid, ok := jwt.Header["kid"].(string)
+	if !ok {
+		return fmt.Errorf("missing key ID in token header")
+	}
+
+	publicKeyPEM, err := getPublicKeyPEM(jwks, kid)
+	if err != nil {
+		return err
+	}
+
+	if err := verifySignature(token, publicKeyPEM); err != nil {
+		return fmt.Errorf("signature verification failed: %w", err)
+	}
+
+	return jwt.Verify(t.issuerURL, t.clientID)
+}
+
+func getPublicKeyPEM(jwks *JWKSet, kid string) ([]byte, error) {
+	for _, key := range jwks.Keys {
+		if key.Kid == kid {
+			return jwkToPEM(&key)
+		}
+	}
+	return nil, fmt.Errorf("unable to find matching public key")
 }

main.go

@@ -202,56 +202,7 @@ func (t *TraefikOidc) initiateAuthentication(rw http.ResponseWriter, req *http.R
 }
 
 func (t *TraefikOidc) verifyToken(token string) error {
-	if !t.limiter.Allow() {
+	return t.verifyAndCacheToken(token)
-		return fmt.Errorf("rate limit exceeded")
-	}
-
-	if _, exists := t.tokenCache.Get(token); exists {
-		return nil // Token is valid and cached
-	}
-
-	jwt, err := parseJWT(token)
-	if err != nil {
-		return fmt.Errorf("failed to parse JWT: %w", err)
-	}
-
-	jwks, err := t.jwkCache.GetJWKS(t.jwksURL, t.httpClient)
-	if err != nil {
-		return fmt.Errorf("failed to get JWKS: %w", err)
-	}
-
-	kid, ok := jwt.Header["kid"].(string)
-	if !ok {
-		return fmt.Errorf("missing key ID in token header")
-	}
-
-	var publicKeyPEM []byte
-	for _, key := range jwks.Keys {
-		if key.Kid == kid {
-			publicKeyPEM, err = jwkToPEM(&key)
-			if err != nil {
-				return fmt.Errorf("failed to convert JWK to PEM: %w", err)
-			}
-			break
-		}
-	}
-
-	if publicKeyPEM == nil {
-		return fmt.Errorf("unable to find matching public key")
-	}
-
-	if err := verifySignature(token, publicKeyPEM); err != nil {
-		return fmt.Errorf("signature verification failed: %w", err)
-	}
-
-	if err := jwt.Verify(t.issuerURL, t.clientID); err != nil {
-		return fmt.Errorf("JWT verification failed: %w", err)
-	}
-
-	expirationTime := time.Unix(int64(jwt.Claims["exp"].(float64)), 0)
-	t.tokenCache.Set(token, expirationTime)
-
-	return nil
 }
 
 func (t *TraefikOidc) buildAuthURL(redirectURL, state, nonce string) string {