commit 6c4762985506fe00b28eaa758f53af7e7da622c0 · bretton.dev/coves

+484

internal/atproto/auth/dpop.go

···

       1
       1
       +
       package auth

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"crypto/ecdsa"

     

       5
       5
       +
       	"crypto/elliptic"

     

       6
       6
       +
       	"crypto/sha256"

     

       7
       7
       +
       	"encoding/base64"

     

       8
       8
       +
       	"encoding/json"

     

       9
       9
       +
       	"fmt"

     

       10
       10
       +
       	"math/big"

     

       11
       11
       +
       	"strings"

     

       12
       12
       +
       	"sync"

     

       13
       13
       +
       	"time"

     

       14
       14
       +
       

     

       15
       15
       +
       	indigoCrypto "github.com/bluesky-social/indigo/atproto/atcrypto"

     

       16
       16
       +
       	"github.com/golang-jwt/jwt/v5"

     

       17
       17
       +
       )

     

       18
       18
       +
       

     

       19
       19
       +
       // NonceCache provides replay protection for DPoP proofs by tracking seen jti values.

     

       20
       20
       +
       // This prevents an attacker from reusing a captured DPoP proof within the validity window.

     

       21
       21
       +
       // Per RFC 9449 Section 11.1, servers SHOULD prevent replay attacks.

     

       22
       22
       +
       type NonceCache struct {

     

       23
       23
       +
       	seen    map[string]time.Time // jti -> expiration time

     

       24
       24
       +
       	stopCh  chan struct{}

     

       25
       25
       +
       	maxAge  time.Duration // How long to keep entries

     

       26
       26
       +
       	cleanup time.Duration // How often to clean up expired entries

     

       27
       27
       +
       	mu      sync.RWMutex

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       // NewNonceCache creates a new nonce cache for DPoP replay protection.

     

       31
       31
       +
       // maxAge should match or exceed DPoPVerifier.MaxProofAge.

     

       32
       32
       +
       func NewNonceCache(maxAge time.Duration) *NonceCache {

     

       33
       33
       +
       	nc := &NonceCache{

     

       34
       34
       +
       		seen:    make(map[string]time.Time),

     

       35
       35
       +
       		maxAge:  maxAge,

     

       36
       36
       +
       		cleanup: maxAge / 2, // Clean up at half the max age

     

       37
       37
       +
       		stopCh:  make(chan struct{}),

     

       38
       38
       +
       	}

     

       39
       39
       +
       

     

       40
       40
       +
       	// Start background cleanup goroutine

     

       41
       41
       +
       	go nc.cleanupLoop()

     

       42
       42
       +
       

     

       43
       43
       +
       	return nc

     

       44
       44
       +
       }

     

       45
       45
       +
       

     

       46
       46
       +
       // CheckAndStore checks if a jti has been seen before and stores it if not.

     

       47
       47
       +
       // Returns true if the jti is fresh (not a replay), false if it's a replay.

     

       48
       48
       +
       func (nc *NonceCache) CheckAndStore(jti string) bool {

     

       49
       49
       +
       	nc.mu.Lock()

     

       50
       50
       +
       	defer nc.mu.Unlock()

     

       51
       51
       +
       

     

       52
       52
       +
       	now := time.Now()

     

       53
       53
       +
       	expiry := now.Add(nc.maxAge)

     

       54
       54
       +
       

     

       55
       55
       +
       	// Check if already seen

     

       56
       56
       +
       	if existingExpiry, seen := nc.seen[jti]; seen {

     

       57
       57
       +
       		// Still valid (not expired) - this is a replay

     

       58
       58
       +
       		if existingExpiry.After(now) {

     

       59
       59
       +
       			return false

     

       60
       60
       +
       		}

     

       61
       61
       +
       		// Expired entry - allow reuse and update expiry

     

       62
       62
       +
       	}

     

       63
       63
       +
       

     

       64
       64
       +
       	// Store the new jti

     

       65
       65
       +
       	nc.seen[jti] = expiry

     

       66
       66
       +
       	return true

     

       67
       67
       +
       }

     

       68
       68
       +
       

     

       69
       69
       +
       // cleanupLoop periodically removes expired entries from the cache

     

       70
       70
       +
       func (nc *NonceCache) cleanupLoop() {

     

       71
       71
       +
       	ticker := time.NewTicker(nc.cleanup)

     

       72
       72
       +
       	defer ticker.Stop()

     

       73
       73
       +
       

     

       74
       74
       +
       	for {

     

       75
       75
       +
       		select {

     

       76
       76
       +
       		case <-ticker.C:

     

       77
       77
       +
       			nc.cleanupExpired()

     

       78
       78
       +
       		case <-nc.stopCh:

     

       79
       79
       +
       			return

     

       80
       80
       +
       		}

     

       81
       81
       +
       	}

     

       82
       82
       +
       }

     

       83
       83
       +
       

     

       84
       84
       +
       // cleanupExpired removes expired entries from the cache

     

       85
       85
       +
       func (nc *NonceCache) cleanupExpired() {

     

       86
       86
       +
       	nc.mu.Lock()

     

       87
       87
       +
       	defer nc.mu.Unlock()

     

       88
       88
       +
       

     

       89
       89
       +
       	now := time.Now()

     

       90
       90
       +
       	for jti, expiry := range nc.seen {

     

       91
       91
       +
       		if expiry.Before(now) {

     

       92
       92
       +
       			delete(nc.seen, jti)

     

       93
       93
       +
       		}

     

       94
       94
       +
       	}

     

       95
       95
       +
       }

     

       96
       96
       +
       

     

       97
       97
       +
       // Stop stops the cleanup goroutine. Call this when done with the cache.

     

       98
       98
       +
       func (nc *NonceCache) Stop() {

     

       99
       99
       +
       	close(nc.stopCh)

     

       100
       100
       +
       }

     

       101
       101
       +
       

     

       102
       102
       +
       // Size returns the number of entries in the cache (for testing/monitoring)

     

       103
       103
       +
       func (nc *NonceCache) Size() int {

     

       104
       104
       +
       	nc.mu.RLock()

     

       105
       105
       +
       	defer nc.mu.RUnlock()

     

       106
       106
       +
       	return len(nc.seen)

     

       107
       107
       +
       }

     

       108
       108
       +
       

     

       109
       109
       +
       // DPoPClaims represents the claims in a DPoP proof JWT (RFC 9449)

     

       110
       110
       +
       type DPoPClaims struct {

     

       111
       111
       +
       	jwt.RegisteredClaims

     

       112
       112
       +
       

     

       113
       113
       +
       	// HTTP method of the request (e.g., "GET", "POST")

     

       114
       114
       +
       	HTTPMethod string `json:"htm"`

     

       115
       115
       +
       

     

       116
       116
       +
       	// HTTP URI of the request (without query and fragment parts)

     

       117
       117
       +
       	HTTPURI string `json:"htu"`

     

       118
       118
       +
       

     

       119
       119
       +
       	// Access token hash (optional, for token binding)

     

       120
       120
       +
       	AccessTokenHash string `json:"ath,omitempty"`

     

       121
       121
       +
       }

     

       122
       122
       +
       

     

       123
       123
       +
       // DPoPProof represents a parsed and verified DPoP proof

     

       124
       124
       +
       type DPoPProof struct {

     

       125
       125
       +
       	RawPublicJWK map[string]interface{}

     

       126
       126
       +
       	Claims       *DPoPClaims

     

       127
       127
       +
       	PublicKey    interface{} // *ecdsa.PublicKey or similar

     

       128
       128
       +
       	Thumbprint   string      // JWK thumbprint (base64url)

     

       129
       129
       +
       }

     

       130
       130
       +
       

     

       131
       131
       +
       // DPoPVerifier verifies DPoP proofs for OAuth token binding

     

       132
       132
       +
       type DPoPVerifier struct {

     

       133
       133
       +
       	// Optional: custom nonce validation function (for server-issued nonces)

     

       134
       134
       +
       	ValidateNonce func(nonce string) bool

     

       135
       135
       +
       

     

       136
       136
       +
       	// NonceCache for replay protection (optional but recommended)

     

       137
       137
       +
       	// If nil, jti replay protection is disabled

     

       138
       138
       +
       	NonceCache *NonceCache

     

       139
       139
       +
       

     

       140
       140
       +
       	// Maximum allowed clock skew for timestamp validation

     

       141
       141
       +
       	MaxClockSkew time.Duration

     

       142
       142
       +
       

     

       143
       143
       +
       	// Maximum age of DPoP proof (prevents replay with old proofs)

     

       144
       144
       +
       	MaxProofAge time.Duration

     

       145
       145
       +
       }

     

       146
       146
       +
       

     

       147
       147
       +
       // NewDPoPVerifier creates a DPoP verifier with sensible defaults including replay protection

     

       148
       148
       +
       func NewDPoPVerifier() *DPoPVerifier {

     

       149
       149
       +
       	maxProofAge := 5 * time.Minute

     

       150
       150
       +
       	return &DPoPVerifier{

     

       151
       151
       +
       		MaxClockSkew: 30 * time.Second,

     

       152
       152
       +
       		MaxProofAge:  maxProofAge,

     

       153
       153
       +
       		NonceCache:   NewNonceCache(maxProofAge),

     

       154
       154
       +
       	}

     

       155
       155
       +
       }

     

       156
       156
       +
       

     

       157
       157
       +
       // NewDPoPVerifierWithoutReplayProtection creates a DPoP verifier without replay protection.

     

       158
       158
       +
       // This should only be used in testing or when replay protection is handled externally.

     

       159
       159
       +
       func NewDPoPVerifierWithoutReplayProtection() *DPoPVerifier {

     

       160
       160
       +
       	return &DPoPVerifier{

     

       161
       161
       +
       		MaxClockSkew: 30 * time.Second,

     

       162
       162
       +
       		MaxProofAge:  5 * time.Minute,

     

       163
       163
       +
       		NonceCache:   nil, // No replay protection

     

       164
       164
       +
       	}

     

       165
       165
       +
       }

     

       166
       166
       +
       

     

       167
       167
       +
       // Stop stops background goroutines. Call this when shutting down.

     

       168
       168
       +
       func (v *DPoPVerifier) Stop() {

     

       169
       169
       +
       	if v.NonceCache != nil {

     

       170
       170
       +
       		v.NonceCache.Stop()

     

       171
       171
       +
       	}

     

       172
       172
       +
       }

     

       173
       173
       +
       

     

       174
       174
       +
       // VerifyDPoPProof verifies a DPoP proof JWT and returns the parsed proof

     

       175
       175
       +
       func (v *DPoPVerifier) VerifyDPoPProof(dpopProof, httpMethod, httpURI string) (*DPoPProof, error) {

     

       176
       176
       +
       	// Parse the DPoP JWT without verification first to extract the header

     

       177
       177
       +
       	parser := jwt.NewParser(jwt.WithoutClaimsValidation())

     

       178
       178
       +
       	token, _, err := parser.ParseUnverified(dpopProof, &DPoPClaims{})

     

       179
       179
       +
       	if err != nil {

     

       180
       180
       +
       		return nil, fmt.Errorf("failed to parse DPoP proof: %w", err)

     

       181
       181
       +
       	}

     

       182
       182
       +
       

     

       183
       183
       +
       	// Extract and validate the header

     

       184
       184
       +
       	header, ok := token.Header["typ"].(string)

     

       185
       185
       +
       	if !ok || header != "dpop+jwt" {

     

       186
       186
       +
       		return nil, fmt.Errorf("invalid DPoP proof: typ must be 'dpop+jwt', got '%s'", header)

     

       187
       187
       +
       	}

     

       188
       188
       +
       

     

       189
       189
       +
       	alg, ok := token.Header["alg"].(string)

     

       190
       190
       +
       	if !ok {

     

       191
       191
       +
       		return nil, fmt.Errorf("invalid DPoP proof: missing alg header")

     

       192
       192
       +
       	}

     

       193
       193
       +
       

     

       194
       194
       +
       	// Extract the JWK from the header

     

       195
       195
       +
       	jwkRaw, ok := token.Header["jwk"]

     

       196
       196
       +
       	if !ok {

     

       197
       197
       +
       		return nil, fmt.Errorf("invalid DPoP proof: missing jwk header")

     

       198
       198
       +
       	}

     

       199
       199
       +
       

     

       200
       200
       +
       	jwkMap, ok := jwkRaw.(map[string]interface{})

     

       201
       201
       +
       	if !ok {

     

       202
       202
       +
       		return nil, fmt.Errorf("invalid DPoP proof: jwk must be an object")

     

       203
       203
       +
       	}

     

       204
       204
       +
       

     

       205
       205
       +
       	// Parse the public key from JWK

     

       206
       206
       +
       	publicKey, err := parseJWKToPublicKey(jwkMap)

     

       207
       207
       +
       	if err != nil {

     

       208
       208
       +
       		return nil, fmt.Errorf("invalid DPoP proof JWK: %w", err)

     

       209
       209
       +
       	}

     

       210
       210
       +
       

     

       211
       211
       +
       	// Calculate the JWK thumbprint

     

       212
       212
       +
       	thumbprint, err := CalculateJWKThumbprint(jwkMap)

     

       213
       213
       +
       	if err != nil {

     

       214
       214
       +
       		return nil, fmt.Errorf("failed to calculate JWK thumbprint: %w", err)

     

       215
       215
       +
       	}

     

       216
       216
       +
       

     

       217
       217
       +
       	// Now verify the signature

     

       218
       218
       +
       	verifiedToken, err := jwt.ParseWithClaims(dpopProof, &DPoPClaims{}, func(token *jwt.Token) (interface{}, error) {

     

       219
       219
       +
       		// Verify the signing method matches what we expect

     

       220
       220
       +
       		switch alg {

     

       221
       221
       +
       		case "ES256":

     

       222
       222
       +
       			if _, ok := token.Method.(*jwt.SigningMethodECDSA); !ok {

     

       223
       223
       +
       				return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])

     

       224
       224
       +
       			}

     

       225
       225
       +
       		case "ES384", "ES512":

     

       226
       226
       +
       			if _, ok := token.Method.(*jwt.SigningMethodECDSA); !ok {

     

       227
       227
       +
       				return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])

     

       228
       228
       +
       			}

     

       229
       229
       +
       		case "RS256", "RS384", "RS512", "PS256", "PS384", "PS512":

     

       230
       230
       +
       			// RSA methods - we primarily support ES256 for atproto

     

       231
       231
       +
       			return nil, fmt.Errorf("RSA algorithms not yet supported for DPoP: %s", alg)

     

       232
       232
       +
       		default:

     

       233
       233
       +
       			return nil, fmt.Errorf("unsupported DPoP algorithm: %s", alg)

     

       234
       234
       +
       		}

     

       235
       235
       +
       		return publicKey, nil

     

       236
       236
       +
       	})

     

       237
       237
       +
       	if err != nil {

     

       238
       238
       +
       		return nil, fmt.Errorf("DPoP proof signature verification failed: %w", err)

     

       239
       239
       +
       	}

     

       240
       240
       +
       

     

       241
       241
       +
       	claims, ok := verifiedToken.Claims.(*DPoPClaims)

     

       242
       242
       +
       	if !ok {

     

       243
       243
       +
       		return nil, fmt.Errorf("invalid DPoP claims type")

     

       244
       244
       +
       	}

     

       245
       245
       +
       

     

       246
       246
       +
       	// Validate the claims

     

       247
       247
       +
       	if err := v.validateDPoPClaims(claims, httpMethod, httpURI); err != nil {

     

       248
       248
       +
       		return nil, err

     

       249
       249
       +
       	}

     

       250
       250
       +
       

     

       251
       251
       +
       	return &DPoPProof{

     

       252
       252
       +
       		Claims:       claims,

     

       253
       253
       +
       		PublicKey:    publicKey,

     

       254
       254
       +
       		Thumbprint:   thumbprint,

     

       255
       255
       +
       		RawPublicJWK: jwkMap,

     

       256
       256
       +
       	}, nil

     

       257
       257
       +
       }

     

       258
       258
       +
       

     

       259
       259
       +
       // validateDPoPClaims validates the DPoP proof claims

     

       260
       260
       +
       func (v *DPoPVerifier) validateDPoPClaims(claims *DPoPClaims, expectedMethod, expectedURI string) error {

     

       261
       261
       +
       	// Validate jti (unique identifier) is present

     

       262
       262
       +
       	if claims.ID == "" {

     

       263
       263
       +
       		return fmt.Errorf("DPoP proof missing jti claim")

     

       264
       264
       +
       	}

     

       265
       265
       +
       

     

       266
       266
       +
       	// Validate htm (HTTP method)

     

       267
       267
       +
       	if !strings.EqualFold(claims.HTTPMethod, expectedMethod) {

     

       268
       268
       +
       		return fmt.Errorf("DPoP proof htm mismatch: expected %s, got %s", expectedMethod, claims.HTTPMethod)

     

       269
       269
       +
       	}

     

       270
       270
       +
       

     

       271
       271
       +
       	// Validate htu (HTTP URI) - compare without query/fragment

     

       272
       272
       +
       	expectedURIBase := stripQueryFragment(expectedURI)

     

       273
       273
       +
       	claimURIBase := stripQueryFragment(claims.HTTPURI)

     

       274
       274
       +
       	if expectedURIBase != claimURIBase {

     

       275
       275
       +
       		return fmt.Errorf("DPoP proof htu mismatch: expected %s, got %s", expectedURIBase, claimURIBase)

     

       276
       276
       +
       	}

     

       277
       277
       +
       

     

       278
       278
       +
       	// Validate iat (issued at) is present and recent

     

       279
       279
       +
       	if claims.IssuedAt == nil {

     

       280
       280
       +
       		return fmt.Errorf("DPoP proof missing iat claim")

     

       281
       281
       +
       	}

     

       282
       282
       +
       

     

       283
       283
       +
       	now := time.Now()

     

       284
       284
       +
       	iat := claims.IssuedAt.Time

     

       285
       285
       +
       

     

       286
       286
       +
       	// Check clock skew (not too far in the future)

     

       287
       287
       +
       	if iat.After(now.Add(v.MaxClockSkew)) {

     

       288
       288
       +
       		return fmt.Errorf("DPoP proof iat is in the future")

     

       289
       289
       +
       	}

     

       290
       290
       +
       

     

       291
       291
       +
       	// Check proof age (not too old)

     

       292
       292
       +
       	if now.Sub(iat) > v.MaxProofAge {

     

       293
       293
       +
       		return fmt.Errorf("DPoP proof is too old (issued %v ago, max %v)", now.Sub(iat), v.MaxProofAge)

     

       294
       294
       +
       	}

     

       295
       295
       +
       

     

       296
       296
       +
       	// SECURITY: Check for replay attack using jti

     

       297
       297
       +
       	// Per RFC 9449 Section 11.1, servers SHOULD prevent replay attacks

     

       298
       298
       +
       	if v.NonceCache != nil {

     

       299
       299
       +
       		if !v.NonceCache.CheckAndStore(claims.ID) {

     

       300
       300
       +
       			return fmt.Errorf("DPoP proof replay detected: jti %s already used", claims.ID)

     

       301
       301
       +
       		}

     

       302
       302
       +
       	}

     

       303
       303
       +
       

     

       304
       304
       +
       	return nil

     

       305
       305
       +
       }

     

       306
       306
       +
       

     

       307
       307
       +
       // VerifyTokenBinding verifies that the DPoP proof binds to the access token

     

       308
       308
       +
       // by comparing the proof's thumbprint to the token's cnf.jkt claim

     

       309
       309
       +
       func (v *DPoPVerifier) VerifyTokenBinding(proof *DPoPProof, expectedThumbprint string) error {

     

       310
       310
       +
       	if proof.Thumbprint != expectedThumbprint {

     

       311
       311
       +
       		return fmt.Errorf("DPoP proof thumbprint mismatch: token expects %s, proof has %s",

     

       312
       312
       +
       			expectedThumbprint, proof.Thumbprint)

     

       313
       313
       +
       	}

     

       314
       314
       +
       	return nil

     

       315
       315
       +
       }

     

       316
       316
       +
       

     

       317
       317
       +
       // CalculateJWKThumbprint calculates the JWK thumbprint per RFC 7638

     

       318
       318
       +
       // The thumbprint is the base64url-encoded SHA-256 hash of the canonical JWK representation

     

       319
       319
       +
       func CalculateJWKThumbprint(jwk map[string]interface{}) (string, error) {

     

       320
       320
       +
       	kty, ok := jwk["kty"].(string)

     

       321
       321
       +
       	if !ok {

     

       322
       322
       +
       		return "", fmt.Errorf("JWK missing kty")

     

       323
       323
       +
       	}

     

       324
       324
       +
       

     

       325
       325
       +
       	// Build the canonical JWK representation based on key type

     

       326
       326
       +
       	// Per RFC 7638, only specific members are included, in lexicographic order

     

       327
       327
       +
       	var canonical map[string]string

     

       328
       328
       +
       

     

       329
       329
       +
       	switch kty {

     

       330
       330
       +
       	case "EC":

     

       331
       331
       +
       		crv, ok := jwk["crv"].(string)

     

       332
       332
       +
       		if !ok {

     

       333
       333
       +
       			return "", fmt.Errorf("EC JWK missing crv")

     

       334
       334
       +
       		}

     

       335
       335
       +
       		x, ok := jwk["x"].(string)

     

       336
       336
       +
       		if !ok {

     

       337
       337
       +
       			return "", fmt.Errorf("EC JWK missing x")

     

       338
       338
       +
       		}

     

       339
       339
       +
       		y, ok := jwk["y"].(string)

     

       340
       340
       +
       		if !ok {

     

       341
       341
       +
       			return "", fmt.Errorf("EC JWK missing y")

     

       342
       342
       +
       		}

     

       343
       343
       +
       		// Lexicographic order: crv, kty, x, y

     

       344
       344
       +
       		canonical = map[string]string{

     

       345
       345
       +
       			"crv": crv,

     

       346
       346
       +
       			"kty": kty,

     

       347
       347
       +
       			"x":   x,

     

       348
       348
       +
       			"y":   y,

     

       349
       349
       +
       		}

     

       350
       350
       +
       	case "RSA":

     

       351
       351
       +
       		e, ok := jwk["e"].(string)

     

       352
       352
       +
       		if !ok {

     

       353
       353
       +
       			return "", fmt.Errorf("RSA JWK missing e")

     

       354
       354
       +
       		}

     

       355
       355
       +
       		n, ok := jwk["n"].(string)

     

       356
       356
       +
       		if !ok {

     

       357
       357
       +
       			return "", fmt.Errorf("RSA JWK missing n")

     

       358
       358
       +
       		}

     

       359
       359
       +
       		// Lexicographic order: e, kty, n

     

       360
       360
       +
       		canonical = map[string]string{

     

       361
       361
       +
       			"e":   e,

     

       362
       362
       +
       			"kty": kty,

     

       363
       363
       +
       			"n":   n,

     

       364
       364
       +
       		}

     

       365
       365
       +
       	case "OKP":

     

       366
       366
       +
       		crv, ok := jwk["crv"].(string)

     

       367
       367
       +
       		if !ok {

     

       368
       368
       +
       			return "", fmt.Errorf("OKP JWK missing crv")

     

       369
       369
       +
       		}

     

       370
       370
       +
       		x, ok := jwk["x"].(string)

     

       371
       371
       +
       		if !ok {

     

       372
       372
       +
       			return "", fmt.Errorf("OKP JWK missing x")

     

       373
       373
       +
       		}

     

       374
       374
       +
       		// Lexicographic order: crv, kty, x

     

       375
       375
       +
       		canonical = map[string]string{

     

       376
       376
       +
       			"crv": crv,

     

       377
       377
       +
       			"kty": kty,

     

       378
       378
       +
       			"x":   x,

     

       379
       379
       +
       		}

     

       380
       380
       +
       	default:

     

       381
       381
       +
       		return "", fmt.Errorf("unsupported JWK key type: %s", kty)

     

       382
       382
       +
       	}

     

       383
       383
       +
       

     

       384
       384
       +
       	// Serialize to JSON (Go's json.Marshal produces lexicographically ordered keys for map[string]string)

     

       385
       385
       +
       	canonicalJSON, err := json.Marshal(canonical)

     

       386
       386
       +
       	if err != nil {

     

       387
       387
       +
       		return "", fmt.Errorf("failed to serialize canonical JWK: %w", err)

     

       388
       388
       +
       	}

     

       389
       389
       +
       

     

       390
       390
       +
       	// SHA-256 hash

     

       391
       391
       +
       	hash := sha256.Sum256(canonicalJSON)

     

       392
       392
       +
       

     

       393
       393
       +
       	// Base64url encode (no padding)

     

       394
       394
       +
       	thumbprint := base64.RawURLEncoding.EncodeToString(hash[:])

     

       395
       395
       +
       

     

       396
       396
       +
       	return thumbprint, nil

     

       397
       397
       +
       }

     

       398
       398
       +
       

     

       399
       399
       +
       // parseJWKToPublicKey parses a JWK map to a Go public key

     

       400
       400
       +
       func parseJWKToPublicKey(jwkMap map[string]interface{}) (interface{}, error) {

     

       401
       401
       +
       	// Convert map to JSON bytes for indigo's parser

     

       402
       402
       +
       	jwkBytes, err := json.Marshal(jwkMap)

     

       403
       403
       +
       	if err != nil {

     

       404
       404
       +
       		return nil, fmt.Errorf("failed to serialize JWK: %w", err)

     

       405
       405
       +
       	}

     

       406
       406
       +
       

     

       407
       407
       +
       	// Try to parse with indigo's crypto package

     

       408
       408
       +
       	pubKey, err := indigoCrypto.ParsePublicJWKBytes(jwkBytes)

     

       409
       409
       +
       	if err != nil {

     

       410
       410
       +
       		return nil, fmt.Errorf("failed to parse JWK: %w", err)

     

       411
       411
       +
       	}

     

       412
       412
       +
       

     

       413
       413
       +
       	// Convert indigo's PublicKey to Go's ecdsa.PublicKey

     

       414
       414
       +
       	jwk, err := pubKey.JWK()

     

       415
       415
       +
       	if err != nil {

     

       416
       416
       +
       		return nil, fmt.Errorf("failed to get JWK from public key: %w", err)

     

       417
       417
       +
       	}

     

       418
       418
       +
       

     

       419
       419
       +
       	// Use our existing conversion function

     

       420
       420
       +
       	return atcryptoJWKToECDSAFromIndigoJWK(jwk)

     

       421
       421
       +
       }

     

       422
       422
       +
       

     

       423
       423
       +
       // atcryptoJWKToECDSAFromIndigoJWK converts an indigo JWK to Go ecdsa.PublicKey

     

       424
       424
       +
       func atcryptoJWKToECDSAFromIndigoJWK(jwk *indigoCrypto.JWK) (*ecdsa.PublicKey, error) {

     

       425
       425
       +
       	if jwk.KeyType != "EC" {

     

       426
       426
       +
       		return nil, fmt.Errorf("unsupported JWK key type: %s (expected EC)", jwk.KeyType)

     

       427
       427
       +
       	}

     

       428
       428
       +
       

     

       429
       429
       +
       	xBytes, err := base64.RawURLEncoding.DecodeString(jwk.X)

     

       430
       430
       +
       	if err != nil {

     

       431
       431
       +
       		return nil, fmt.Errorf("invalid JWK X coordinate: %w", err)

     

       432
       432
       +
       	}

     

       433
       433
       +
       	yBytes, err := base64.RawURLEncoding.DecodeString(jwk.Y)

     

       434
       434
       +
       	if err != nil {

     

       435
       435
       +
       		return nil, fmt.Errorf("invalid JWK Y coordinate: %w", err)

     

       436
       436
       +
       	}

     

       437
       437
       +
       

     

       438
       438
       +
       	var curve ecdsa.PublicKey

     

       439
       439
       +
       	switch jwk.Curve {

     

       440
       440
       +
       	case "P-256":

     

       441
       441
       +
       		curve.Curve = ecdsaP256Curve()

     

       442
       442
       +
       	case "P-384":

     

       443
       443
       +
       		curve.Curve = ecdsaP384Curve()

     

       444
       444
       +
       	case "P-521":

     

       445
       445
       +
       		curve.Curve = ecdsaP521Curve()

     

       446
       446
       +
       	default:

     

       447
       447
       +
       		return nil, fmt.Errorf("unsupported curve: %s", jwk.Curve)

     

       448
       448
       +
       	}

     

       449
       449
       +
       

     

       450
       450
       +
       	curve.X = new(big.Int).SetBytes(xBytes)

     

       451
       451
       +
       	curve.Y = new(big.Int).SetBytes(yBytes)

     

       452
       452
       +
       

     

       453
       453
       +
       	return &curve, nil

     

       454
       454
       +
       }

     

       455
       455
       +
       

     

       456
       456
       +
       // Helper functions for elliptic curves

     

       457
       457
       +
       func ecdsaP256Curve() elliptic.Curve { return elliptic.P256() }

     

       458
       458
       +
       func ecdsaP384Curve() elliptic.Curve { return elliptic.P384() }

     

       459
       459
       +
       func ecdsaP521Curve() elliptic.Curve { return elliptic.P521() }

     

       460
       460
       +
       

     

       461
       461
       +
       // stripQueryFragment removes query and fragment from a URI

     

       462
       462
       +
       func stripQueryFragment(uri string) string {

     

       463
       463
       +
       	if idx := strings.Index(uri, "?"); idx != -1 {

     

       464
       464
       +
       		uri = uri[:idx]

     

       465
       465
       +
       	}

     

       466
       466
       +
       	if idx := strings.Index(uri, "#"); idx != -1 {

     

       467
       467
       +
       		uri = uri[:idx]

     

       468
       468
       +
       	}

     

       469
       469
       +
       	return uri

     

       470
       470
       +
       }

     

       471
       471
       +
       

     

       472
       472
       +
       // ExtractCnfJkt extracts the cnf.jkt (confirmation key thumbprint) from JWT claims

     

       473
       473
       +
       func ExtractCnfJkt(claims *Claims) (string, error) {

     

       474
       474
       +
       	if claims.Confirmation == nil {

     

       475
       475
       +
       		return "", fmt.Errorf("token missing cnf claim (no DPoP binding)")

     

       476
       476
       +
       	}

     

       477
       477
       +
       

     

       478
       478
       +
       	jkt, ok := claims.Confirmation["jkt"].(string)

     

       479
       479
       +
       	if !ok || jkt == "" {

     

       480
       480
       +
       		return "", fmt.Errorf("token cnf claim missing jkt (DPoP key thumbprint)")

     

       481
       481
       +
       	}

     

       482
       482
       +
       

     

       483
       483
       +
       	return jkt, nil

     

       484
       484
       +
       }

+921

internal/atproto/auth/dpop_test.go

···

       1
       1
       +
       package auth

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"crypto/ecdsa"

     

       5
       5
       +
       	"crypto/elliptic"

     

       6
       6
       +
       	"crypto/rand"

     

       7
       7
       +
       	"crypto/sha256"

     

       8
       8
       +
       	"encoding/base64"

     

       9
       9
       +
       	"encoding/json"

     

       10
       10
       +
       	"strings"

     

       11
       11
       +
       	"testing"

     

       12
       12
       +
       	"time"

     

       13
       13
       +
       

     

       14
       14
       +
       	"github.com/golang-jwt/jwt/v5"

     

       15
       15
       +
       	"github.com/google/uuid"

     

       16
       16
       +
       )

     

       17
       17
       +
       

     

       18
       18
       +
       // === Test Helpers ===

     

       19
       19
       +
       

     

       20
       20
       +
       // testECKey holds a test ES256 key pair

     

       21
       21
       +
       type testECKey struct {

     

       22
       22
       +
       	privateKey *ecdsa.PrivateKey

     

       23
       23
       +
       	publicKey  *ecdsa.PublicKey

     

       24
       24
       +
       	jwk        map[string]interface{}

     

       25
       25
       +
       	thumbprint string

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       // generateTestES256Key generates a test ES256 key pair and JWK

     

       29
       29
       +
       func generateTestES256Key(t *testing.T) *testECKey {

     

       30
       30
       +
       	t.Helper()

     

       31
       31
       +
       

     

       32
       32
       +
       	privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)

     

       33
       33
       +
       	if err != nil {

     

       34
       34
       +
       		t.Fatalf("Failed to generate test key: %v", err)

     

       35
       35
       +
       	}

     

       36
       36
       +
       

     

       37
       37
       +
       	// Encode public key coordinates as base64url

     

       38
       38
       +
       	xBytes := privateKey.PublicKey.X.Bytes()

     

       39
       39
       +
       	yBytes := privateKey.PublicKey.Y.Bytes()

     

       40
       40
       +
       

     

       41
       41
       +
       	// P-256 coordinates must be 32 bytes (pad if needed)

     

       42
       42
       +
       	xBytes = padTo32Bytes(xBytes)

     

       43
       43
       +
       	yBytes = padTo32Bytes(yBytes)

     

       44
       44
       +
       

     

       45
       45
       +
       	x := base64.RawURLEncoding.EncodeToString(xBytes)

     

       46
       46
       +
       	y := base64.RawURLEncoding.EncodeToString(yBytes)

     

       47
       47
       +
       

     

       48
       48
       +
       	jwk := map[string]interface{}{

     

       49
       49
       +
       		"kty": "EC",

     

       50
       50
       +
       		"crv": "P-256",

     

       51
       51
       +
       		"x":   x,

     

       52
       52
       +
       		"y":   y,

     

       53
       53
       +
       	}

     

       54
       54
       +
       

     

       55
       55
       +
       	// Calculate thumbprint

     

       56
       56
       +
       	thumbprint, err := CalculateJWKThumbprint(jwk)

     

       57
       57
       +
       	if err != nil {

     

       58
       58
       +
       		t.Fatalf("Failed to calculate thumbprint: %v", err)

     

       59
       59
       +
       	}

     

       60
       60
       +
       

     

       61
       61
       +
       	return &testECKey{

     

       62
       62
       +
       		privateKey: privateKey,

     

       63
       63
       +
       		publicKey:  &privateKey.PublicKey,

     

       64
       64
       +
       		jwk:        jwk,

     

       65
       65
       +
       		thumbprint: thumbprint,

     

       66
       66
       +
       	}

     

       67
       67
       +
       }

     

       68
       68
       +
       

     

       69
       69
       +
       // padTo32Bytes pads a byte slice to 32 bytes (required for P-256 coordinates)

     

       70
       70
       +
       func padTo32Bytes(b []byte) []byte {

     

       71
       71
       +
       	if len(b) >= 32 {

     

       72
       72
       +
       		return b

     

       73
       73
       +
       	}

     

       74
       74
       +
       	padded := make([]byte, 32)

     

       75
       75
       +
       	copy(padded[32-len(b):], b)

     

       76
       76
       +
       	return padded

     

       77
       77
       +
       }

     

       78
       78
       +
       

     

       79
       79
       +
       // createDPoPProof creates a DPoP proof JWT for testing

     

       80
       80
       +
       func createDPoPProof(t *testing.T, key *testECKey, method, uri string, iat time.Time, jti string) string {

     

       81
       81
       +
       	t.Helper()

     

       82
       82
       +
       

     

       83
       83
       +
       	claims := &DPoPClaims{

     

       84
       84
       +
       		RegisteredClaims: jwt.RegisteredClaims{

     

       85
       85
       +
       			ID:       jti,

     

       86
       86
       +
       			IssuedAt: jwt.NewNumericDate(iat),

     

       87
       87
       +
       		},

     

       88
       88
       +
       		HTTPMethod: method,

     

       89
       89
       +
       		HTTPURI:    uri,

     

       90
       90
       +
       	}

     

       91
       91
       +
       

     

       92
       92
       +
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       93
       93
       +
       	token.Header["typ"] = "dpop+jwt"

     

       94
       94
       +
       	token.Header["jwk"] = key.jwk

     

       95
       95
       +
       

     

       96
       96
       +
       	tokenString, err := token.SignedString(key.privateKey)

     

       97
       97
       +
       	if err != nil {

     

       98
       98
       +
       		t.Fatalf("Failed to create DPoP proof: %v", err)

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	return tokenString

     

       102
       102
       +
       }

     

       103
       103
       +
       

     

       104
       104
       +
       // === JWK Thumbprint Tests (RFC 7638) ===

     

       105
       105
       +
       

     

       106
       106
       +
       func TestCalculateJWKThumbprint_EC_P256(t *testing.T) {

     

       107
       107
       +
       	// Test with known values from RFC 7638 Appendix A (adapted for P-256)

     

       108
       108
       +
       	jwk := map[string]interface{}{

     

       109
       109
       +
       		"kty": "EC",

     

       110
       110
       +
       		"crv": "P-256",

     

       111
       111
       +
       		"x":   "WKn-ZIGevcwGIyyrzFoZNBdaq9_TsqzGl96oc0CWuis",

     

       112
       112
       +
       		"y":   "y77t-RvAHRKTsSGdIYUfweuOvwrvDD-Q3Hv5J0fSKbE",

     

       113
       113
       +
       	}

     

       114
       114
       +
       

     

       115
       115
       +
       	thumbprint, err := CalculateJWKThumbprint(jwk)

     

       116
       116
       +
       	if err != nil {

     

       117
       117
       +
       		t.Fatalf("CalculateJWKThumbprint failed: %v", err)

     

       118
       118
       +
       	}

     

       119
       119
       +
       

     

       120
       120
       +
       	if thumbprint == "" {

     

       121
       121
       +
       		t.Error("Expected non-empty thumbprint")

     

       122
       122
       +
       	}

     

       123
       123
       +
       

     

       124
       124
       +
       	// Verify it's valid base64url

     

       125
       125
       +
       	_, err = base64.RawURLEncoding.DecodeString(thumbprint)

     

       126
       126
       +
       	if err != nil {

     

       127
       127
       +
       		t.Errorf("Thumbprint is not valid base64url: %v", err)

     

       128
       128
       +
       	}

     

       129
       129
       +
       

     

       130
       130
       +
       	// Verify length (SHA-256 produces 32 bytes = 43 base64url chars)

     

       131
       131
       +
       	if len(thumbprint) != 43 {

     

       132
       132
       +
       		t.Errorf("Expected thumbprint length 43, got %d", len(thumbprint))

     

       133
       133
       +
       	}

     

       134
       134
       +
       }

     

       135
       135
       +
       

     

       136
       136
       +
       func TestCalculateJWKThumbprint_Deterministic(t *testing.T) {

     

       137
       137
       +
       	// Same key should produce same thumbprint

     

       138
       138
       +
       	jwk := map[string]interface{}{

     

       139
       139
       +
       		"kty": "EC",

     

       140
       140
       +
       		"crv": "P-256",

     

       141
       141
       +
       		"x":   "test-x-coordinate",

     

       142
       142
       +
       		"y":   "test-y-coordinate",

     

       143
       143
       +
       	}

     

       144
       144
       +
       

     

       145
       145
       +
       	thumbprint1, err := CalculateJWKThumbprint(jwk)

     

       146
       146
       +
       	if err != nil {

     

       147
       147
       +
       		t.Fatalf("First CalculateJWKThumbprint failed: %v", err)

     

       148
       148
       +
       	}

     

       149
       149
       +
       

     

       150
       150
       +
       	thumbprint2, err := CalculateJWKThumbprint(jwk)

     

       151
       151
       +
       	if err != nil {

     

       152
       152
       +
       		t.Fatalf("Second CalculateJWKThumbprint failed: %v", err)

     

       153
       153
       +
       	}

     

       154
       154
       +
       

     

       155
       155
       +
       	if thumbprint1 != thumbprint2 {

     

       156
       156
       +
       		t.Errorf("Thumbprints are not deterministic: %s != %s", thumbprint1, thumbprint2)

     

       157
       157
       +
       	}

     

       158
       158
       +
       }

     

       159
       159
       +
       

     

       160
       160
       +
       func TestCalculateJWKThumbprint_DifferentKeys(t *testing.T) {

     

       161
       161
       +
       	// Different keys should produce different thumbprints

     

       162
       162
       +
       	jwk1 := map[string]interface{}{

     

       163
       163
       +
       		"kty": "EC",

     

       164
       164
       +
       		"crv": "P-256",

     

       165
       165
       +
       		"x":   "coordinate-x-1",

     

       166
       166
       +
       		"y":   "coordinate-y-1",

     

       167
       167
       +
       	}

     

       168
       168
       +
       

     

       169
       169
       +
       	jwk2 := map[string]interface{}{

     

       170
       170
       +
       		"kty": "EC",

     

       171
       171
       +
       		"crv": "P-256",

     

       172
       172
       +
       		"x":   "coordinate-x-2",

     

       173
       173
       +
       		"y":   "coordinate-y-2",

     

       174
       174
       +
       	}

     

       175
       175
       +
       

     

       176
       176
       +
       	thumbprint1, err := CalculateJWKThumbprint(jwk1)

     

       177
       177
       +
       	if err != nil {

     

       178
       178
       +
       		t.Fatalf("First CalculateJWKThumbprint failed: %v", err)

     

       179
       179
       +
       	}

     

       180
       180
       +
       

     

       181
       181
       +
       	thumbprint2, err := CalculateJWKThumbprint(jwk2)

     

       182
       182
       +
       	if err != nil {

     

       183
       183
       +
       		t.Fatalf("Second CalculateJWKThumbprint failed: %v", err)

     

       184
       184
       +
       	}

     

       185
       185
       +
       

     

       186
       186
       +
       	if thumbprint1 == thumbprint2 {

     

       187
       187
       +
       		t.Error("Different keys produced same thumbprint (collision)")

     

       188
       188
       +
       	}

     

       189
       189
       +
       }

     

       190
       190
       +
       

     

       191
       191
       +
       func TestCalculateJWKThumbprint_MissingKty(t *testing.T) {

     

       192
       192
       +
       	jwk := map[string]interface{}{

     

       193
       193
       +
       		"crv": "P-256",

     

       194
       194
       +
       		"x":   "test-x",

     

       195
       195
       +
       		"y":   "test-y",

     

       196
       196
       +
       	}

     

       197
       197
       +
       

     

       198
       198
       +
       	_, err := CalculateJWKThumbprint(jwk)

     

       199
       199
       +
       	if err == nil {

     

       200
       200
       +
       		t.Error("Expected error for missing kty, got nil")

     

       201
       201
       +
       	}

     

       202
       202
       +
       	if err != nil && !contains(err.Error(), "missing kty") {

     

       203
       203
       +
       		t.Errorf("Expected error about missing kty, got: %v", err)

     

       204
       204
       +
       	}

     

       205
       205
       +
       }

     

       206
       206
       +
       

     

       207
       207
       +
       func TestCalculateJWKThumbprint_EC_MissingCrv(t *testing.T) {

     

       208
       208
       +
       	jwk := map[string]interface{}{

     

       209
       209
       +
       		"kty": "EC",

     

       210
       210
       +
       		"x":   "test-x",

     

       211
       211
       +
       		"y":   "test-y",

     

       212
       212
       +
       	}

     

       213
       213
       +
       

     

       214
       214
       +
       	_, err := CalculateJWKThumbprint(jwk)

     

       215
       215
       +
       	if err == nil {

     

       216
       216
       +
       		t.Error("Expected error for missing crv, got nil")

     

       217
       217
       +
       	}

     

       218
       218
       +
       	if err != nil && !contains(err.Error(), "missing crv") {

     

       219
       219
       +
       		t.Errorf("Expected error about missing crv, got: %v", err)

     

       220
       220
       +
       	}

     

       221
       221
       +
       }

     

       222
       222
       +
       

     

       223
       223
       +
       func TestCalculateJWKThumbprint_EC_MissingX(t *testing.T) {

     

       224
       224
       +
       	jwk := map[string]interface{}{

     

       225
       225
       +
       		"kty": "EC",

     

       226
       226
       +
       		"crv": "P-256",

     

       227
       227
       +
       		"y":   "test-y",

     

       228
       228
       +
       	}

     

       229
       229
       +
       

     

       230
       230
       +
       	_, err := CalculateJWKThumbprint(jwk)

     

       231
       231
       +
       	if err == nil {

     

       232
       232
       +
       		t.Error("Expected error for missing x, got nil")

     

       233
       233
       +
       	}

     

       234
       234
       +
       	if err != nil && !contains(err.Error(), "missing x") {

     

       235
       235
       +
       		t.Errorf("Expected error about missing x, got: %v", err)

     

       236
       236
       +
       	}

     

       237
       237
       +
       }

     

       238
       238
       +
       

     

       239
       239
       +
       func TestCalculateJWKThumbprint_EC_MissingY(t *testing.T) {

     

       240
       240
       +
       	jwk := map[string]interface{}{

     

       241
       241
       +
       		"kty": "EC",

     

       242
       242
       +
       		"crv": "P-256",

     

       243
       243
       +
       		"x":   "test-x",

     

       244
       244
       +
       	}

     

       245
       245
       +
       

     

       246
       246
       +
       	_, err := CalculateJWKThumbprint(jwk)

     

       247
       247
       +
       	if err == nil {

     

       248
       248
       +
       		t.Error("Expected error for missing y, got nil")

     

       249
       249
       +
       	}

     

       250
       250
       +
       	if err != nil && !contains(err.Error(), "missing y") {

     

       251
       251
       +
       		t.Errorf("Expected error about missing y, got: %v", err)

     

       252
       252
       +
       	}

     

       253
       253
       +
       }

     

       254
       254
       +
       

     

       255
       255
       +
       func TestCalculateJWKThumbprint_RSA(t *testing.T) {

     

       256
       256
       +
       	// Test RSA key thumbprint calculation

     

       257
       257
       +
       	jwk := map[string]interface{}{

     

       258
       258
       +
       		"kty": "RSA",

     

       259
       259
       +
       		"e":   "AQAB",

     

       260
       260
       +
       		"n":   "test-modulus",

     

       261
       261
       +
       	}

     

       262
       262
       +
       

     

       263
       263
       +
       	thumbprint, err := CalculateJWKThumbprint(jwk)

     

       264
       264
       +
       	if err != nil {

     

       265
       265
       +
       		t.Fatalf("CalculateJWKThumbprint failed for RSA: %v", err)

     

       266
       266
       +
       	}

     

       267
       267
       +
       

     

       268
       268
       +
       	if thumbprint == "" {

     

       269
       269
       +
       		t.Error("Expected non-empty thumbprint for RSA key")

     

       270
       270
       +
       	}

     

       271
       271
       +
       }

     

       272
       272
       +
       

     

       273
       273
       +
       func TestCalculateJWKThumbprint_OKP(t *testing.T) {

     

       274
       274
       +
       	// Test OKP (Octet Key Pair) thumbprint calculation

     

       275
       275
       +
       	jwk := map[string]interface{}{

     

       276
       276
       +
       		"kty": "OKP",

     

       277
       277
       +
       		"crv": "Ed25519",

     

       278
       278
       +
       		"x":   "test-x-coordinate",

     

       279
       279
       +
       	}

     

       280
       280
       +
       

     

       281
       281
       +
       	thumbprint, err := CalculateJWKThumbprint(jwk)

     

       282
       282
       +
       	if err != nil {

     

       283
       283
       +
       		t.Fatalf("CalculateJWKThumbprint failed for OKP: %v", err)

     

       284
       284
       +
       	}

     

       285
       285
       +
       

     

       286
       286
       +
       	if thumbprint == "" {

     

       287
       287
       +
       		t.Error("Expected non-empty thumbprint for OKP key")

     

       288
       288
       +
       	}

     

       289
       289
       +
       }

     

       290
       290
       +
       

     

       291
       291
       +
       func TestCalculateJWKThumbprint_UnsupportedKeyType(t *testing.T) {

     

       292
       292
       +
       	jwk := map[string]interface{}{

     

       293
       293
       +
       		"kty": "UNKNOWN",

     

       294
       294
       +
       	}

     

       295
       295
       +
       

     

       296
       296
       +
       	_, err := CalculateJWKThumbprint(jwk)

     

       297
       297
       +
       	if err == nil {

     

       298
       298
       +
       		t.Error("Expected error for unsupported key type, got nil")

     

       299
       299
       +
       	}

     

       300
       300
       +
       	if err != nil && !contains(err.Error(), "unsupported JWK key type") {

     

       301
       301
       +
       		t.Errorf("Expected error about unsupported key type, got: %v", err)

     

       302
       302
       +
       	}

     

       303
       303
       +
       }

     

       304
       304
       +
       

     

       305
       305
       +
       func TestCalculateJWKThumbprint_CanonicalJSON(t *testing.T) {

     

       306
       306
       +
       	// RFC 7638 requires lexicographic ordering of keys in canonical JSON

     

       307
       307
       +
       	// This test verifies that the canonical JSON is correctly ordered

     

       308
       308
       +
       

     

       309
       309
       +
       	jwk := map[string]interface{}{

     

       310
       310
       +
       		"kty": "EC",

     

       311
       311
       +
       		"crv": "P-256",

     

       312
       312
       +
       		"x":   "x-coord",

     

       313
       313
       +
       		"y":   "y-coord",

     

       314
       314
       +
       	}

     

       315
       315
       +
       

     

       316
       316
       +
       	// The canonical JSON should be: {"crv":"P-256","kty":"EC","x":"x-coord","y":"y-coord"}

     

       317
       317
       +
       	// (lexicographically ordered: crv, kty, x, y)

     

       318
       318
       +
       

     

       319
       319
       +
       	canonical := map[string]string{

     

       320
       320
       +
       		"crv": "P-256",

     

       321
       321
       +
       		"kty": "EC",

     

       322
       322
       +
       		"x":   "x-coord",

     

       323
       323
       +
       		"y":   "y-coord",

     

       324
       324
       +
       	}

     

       325
       325
       +
       

     

       326
       326
       +
       	canonicalJSON, err := json.Marshal(canonical)

     

       327
       327
       +
       	if err != nil {

     

       328
       328
       +
       		t.Fatalf("Failed to marshal canonical JSON: %v", err)

     

       329
       329
       +
       	}

     

       330
       330
       +
       

     

       331
       331
       +
       	expectedHash := sha256.Sum256(canonicalJSON)

     

       332
       332
       +
       	expectedThumbprint := base64.RawURLEncoding.EncodeToString(expectedHash[:])

     

       333
       333
       +
       

     

       334
       334
       +
       	actualThumbprint, err := CalculateJWKThumbprint(jwk)

     

       335
       335
       +
       	if err != nil {

     

       336
       336
       +
       		t.Fatalf("CalculateJWKThumbprint failed: %v", err)

     

       337
       337
       +
       	}

     

       338
       338
       +
       

     

       339
       339
       +
       	if actualThumbprint != expectedThumbprint {

     

       340
       340
       +
       		t.Errorf("Thumbprint doesn't match expected canonical JSON hash\nExpected: %s\nGot: %s",

     

       341
       341
       +
       			expectedThumbprint, actualThumbprint)

     

       342
       342
       +
       	}

     

       343
       343
       +
       }

     

       344
       344
       +
       

     

       345
       345
       +
       // === DPoP Proof Verification Tests ===

     

       346
       346
       +
       

     

       347
       347
       +
       func TestVerifyDPoPProof_Valid(t *testing.T) {

     

       348
       348
       +
       	verifier := NewDPoPVerifier()

     

       349
       349
       +
       	key := generateTestES256Key(t)

     

       350
       350
       +
       

     

       351
       351
       +
       	method := "POST"

     

       352
       352
       +
       	uri := "https://api.example.com/resource"

     

       353
       353
       +
       	iat := time.Now()

     

       354
       354
       +
       	jti := uuid.New().String()

     

       355
       355
       +
       

     

       356
       356
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       357
       357
       +
       

     

       358
       358
       +
       	result, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       359
       359
       +
       	if err != nil {

     

       360
       360
       +
       		t.Fatalf("VerifyDPoPProof failed for valid proof: %v", err)

     

       361
       361
       +
       	}

     

       362
       362
       +
       

     

       363
       363
       +
       	if result == nil {

     

       364
       364
       +
       		t.Fatal("Expected non-nil proof result")

     

       365
       365
       +
       	}

     

       366
       366
       +
       

     

       367
       367
       +
       	if result.Claims.HTTPMethod != method {

     

       368
       368
       +
       		t.Errorf("Expected method %s, got %s", method, result.Claims.HTTPMethod)

     

       369
       369
       +
       	}

     

       370
       370
       +
       

     

       371
       371
       +
       	if result.Claims.HTTPURI != uri {

     

       372
       372
       +
       		t.Errorf("Expected URI %s, got %s", uri, result.Claims.HTTPURI)

     

       373
       373
       +
       	}

     

       374
       374
       +
       

     

       375
       375
       +
       	if result.Claims.ID != jti {

     

       376
       376
       +
       		t.Errorf("Expected jti %s, got %s", jti, result.Claims.ID)

     

       377
       377
       +
       	}

     

       378
       378
       +
       

     

       379
       379
       +
       	if result.Thumbprint != key.thumbprint {

     

       380
       380
       +
       		t.Errorf("Expected thumbprint %s, got %s", key.thumbprint, result.Thumbprint)

     

       381
       381
       +
       	}

     

       382
       382
       +
       }

     

       383
       383
       +
       

     

       384
       384
       +
       func TestVerifyDPoPProof_InvalidSignature(t *testing.T) {

     

       385
       385
       +
       	verifier := NewDPoPVerifier()

     

       386
       386
       +
       	key := generateTestES256Key(t)

     

       387
       387
       +
       	wrongKey := generateTestES256Key(t)

     

       388
       388
       +
       

     

       389
       389
       +
       	method := "POST"

     

       390
       390
       +
       	uri := "https://api.example.com/resource"

     

       391
       391
       +
       	iat := time.Now()

     

       392
       392
       +
       	jti := uuid.New().String()

     

       393
       393
       +
       

     

       394
       394
       +
       	// Create proof with one key

     

       395
       395
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       396
       396
       +
       

     

       397
       397
       +
       	// Parse and modify to use wrong key's JWK in header (signature won't match)

     

       398
       398
       +
       	parts := splitJWT(proof)

     

       399
       399
       +
       	header := parseJWTHeader(t, parts[0])

     

       400
       400
       +
       	header["jwk"] = wrongKey.jwk

     

       401
       401
       +
       	modifiedHeader := encodeJSON(t, header)

     

       402
       402
       +
       	tamperedProof := modifiedHeader + "." + parts[1] + "." + parts[2]

     

       403
       403
       +
       

     

       404
       404
       +
       	_, err := verifier.VerifyDPoPProof(tamperedProof, method, uri)

     

       405
       405
       +
       	if err == nil {

     

       406
       406
       +
       		t.Error("Expected error for invalid signature, got nil")

     

       407
       407
       +
       	}

     

       408
       408
       +
       	if err != nil && !contains(err.Error(), "signature verification failed") {

     

       409
       409
       +
       		t.Errorf("Expected signature verification error, got: %v", err)

     

       410
       410
       +
       	}

     

       411
       411
       +
       }

     

       412
       412
       +
       

     

       413
       413
       +
       func TestVerifyDPoPProof_WrongHTTPMethod(t *testing.T) {

     

       414
       414
       +
       	verifier := NewDPoPVerifier()

     

       415
       415
       +
       	key := generateTestES256Key(t)

     

       416
       416
       +
       

     

       417
       417
       +
       	method := "POST"

     

       418
       418
       +
       	wrongMethod := "GET"

     

       419
       419
       +
       	uri := "https://api.example.com/resource"

     

       420
       420
       +
       	iat := time.Now()

     

       421
       421
       +
       	jti := uuid.New().String()

     

       422
       422
       +
       

     

       423
       423
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       424
       424
       +
       

     

       425
       425
       +
       	_, err := verifier.VerifyDPoPProof(proof, wrongMethod, uri)

     

       426
       426
       +
       	if err == nil {

     

       427
       427
       +
       		t.Error("Expected error for HTTP method mismatch, got nil")

     

       428
       428
       +
       	}

     

       429
       429
       +
       	if err != nil && !contains(err.Error(), "htm mismatch") {

     

       430
       430
       +
       		t.Errorf("Expected htm mismatch error, got: %v", err)

     

       431
       431
       +
       	}

     

       432
       432
       +
       }

     

       433
       433
       +
       

     

       434
       434
       +
       func TestVerifyDPoPProof_WrongURI(t *testing.T) {

     

       435
       435
       +
       	verifier := NewDPoPVerifier()

     

       436
       436
       +
       	key := generateTestES256Key(t)

     

       437
       437
       +
       

     

       438
       438
       +
       	method := "POST"

     

       439
       439
       +
       	uri := "https://api.example.com/resource"

     

       440
       440
       +
       	wrongURI := "https://api.example.com/different"

     

       441
       441
       +
       	iat := time.Now()

     

       442
       442
       +
       	jti := uuid.New().String()

     

       443
       443
       +
       

     

       444
       444
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       445
       445
       +
       

     

       446
       446
       +
       	_, err := verifier.VerifyDPoPProof(proof, method, wrongURI)

     

       447
       447
       +
       	if err == nil {

     

       448
       448
       +
       		t.Error("Expected error for URI mismatch, got nil")

     

       449
       449
       +
       	}

     

       450
       450
       +
       	if err != nil && !contains(err.Error(), "htu mismatch") {

     

       451
       451
       +
       		t.Errorf("Expected htu mismatch error, got: %v", err)

     

       452
       452
       +
       	}

     

       453
       453
       +
       }

     

       454
       454
       +
       

     

       455
       455
       +
       func TestVerifyDPoPProof_URIWithQuery(t *testing.T) {

     

       456
       456
       +
       	// URI comparison should strip query and fragment

     

       457
       457
       +
       	verifier := NewDPoPVerifier()

     

       458
       458
       +
       	key := generateTestES256Key(t)

     

       459
       459
       +
       

     

       460
       460
       +
       	method := "POST"

     

       461
       461
       +
       	baseURI := "https://api.example.com/resource"

     

       462
       462
       +
       	uriWithQuery := baseURI + "?param=value"

     

       463
       463
       +
       	iat := time.Now()

     

       464
       464
       +
       	jti := uuid.New().String()

     

       465
       465
       +
       

     

       466
       466
       +
       	proof := createDPoPProof(t, key, method, baseURI, iat, jti)

     

       467
       467
       +
       

     

       468
       468
       +
       	// Should succeed because query is stripped

     

       469
       469
       +
       	_, err := verifier.VerifyDPoPProof(proof, method, uriWithQuery)

     

       470
       470
       +
       	if err != nil {

     

       471
       471
       +
       		t.Fatalf("VerifyDPoPProof failed for URI with query: %v", err)

     

       472
       472
       +
       	}

     

       473
       473
       +
       }

     

       474
       474
       +
       

     

       475
       475
       +
       func TestVerifyDPoPProof_URIWithFragment(t *testing.T) {

     

       476
       476
       +
       	// URI comparison should strip query and fragment

     

       477
       477
       +
       	verifier := NewDPoPVerifier()

     

       478
       478
       +
       	key := generateTestES256Key(t)

     

       479
       479
       +
       

     

       480
       480
       +
       	method := "POST"

     

       481
       481
       +
       	baseURI := "https://api.example.com/resource"

     

       482
       482
       +
       	uriWithFragment := baseURI + "#section"

     

       483
       483
       +
       	iat := time.Now()

     

       484
       484
       +
       	jti := uuid.New().String()

     

       485
       485
       +
       

     

       486
       486
       +
       	proof := createDPoPProof(t, key, method, baseURI, iat, jti)

     

       487
       487
       +
       

     

       488
       488
       +
       	// Should succeed because fragment is stripped

     

       489
       489
       +
       	_, err := verifier.VerifyDPoPProof(proof, method, uriWithFragment)

     

       490
       490
       +
       	if err != nil {

     

       491
       491
       +
       		t.Fatalf("VerifyDPoPProof failed for URI with fragment: %v", err)

     

       492
       492
       +
       	}

     

       493
       493
       +
       }

     

       494
       494
       +
       

     

       495
       495
       +
       func TestVerifyDPoPProof_ExpiredProof(t *testing.T) {

     

       496
       496
       +
       	verifier := NewDPoPVerifier()

     

       497
       497
       +
       	key := generateTestES256Key(t)

     

       498
       498
       +
       

     

       499
       499
       +
       	method := "POST"

     

       500
       500
       +
       	uri := "https://api.example.com/resource"

     

       501
       501
       +
       	// Proof issued 10 minutes ago (exceeds default MaxProofAge of 5 minutes)

     

       502
       502
       +
       	iat := time.Now().Add(-10 * time.Minute)

     

       503
       503
       +
       	jti := uuid.New().String()

     

       504
       504
       +
       

     

       505
       505
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       506
       506
       +
       

     

       507
       507
       +
       	_, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       508
       508
       +
       	if err == nil {

     

       509
       509
       +
       		t.Error("Expected error for expired proof, got nil")

     

       510
       510
       +
       	}

     

       511
       511
       +
       	if err != nil && !contains(err.Error(), "too old") {

     

       512
       512
       +
       		t.Errorf("Expected 'too old' error, got: %v", err)

     

       513
       513
       +
       	}

     

       514
       514
       +
       }

     

       515
       515
       +
       

     

       516
       516
       +
       func TestVerifyDPoPProof_FutureProof(t *testing.T) {

     

       517
       517
       +
       	verifier := NewDPoPVerifier()

     

       518
       518
       +
       	key := generateTestES256Key(t)

     

       519
       519
       +
       

     

       520
       520
       +
       	method := "POST"

     

       521
       521
       +
       	uri := "https://api.example.com/resource"

     

       522
       522
       +
       	// Proof issued 1 minute in the future (exceeds MaxClockSkew)

     

       523
       523
       +
       	iat := time.Now().Add(1 * time.Minute)

     

       524
       524
       +
       	jti := uuid.New().String()

     

       525
       525
       +
       

     

       526
       526
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       527
       527
       +
       

     

       528
       528
       +
       	_, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       529
       529
       +
       	if err == nil {

     

       530
       530
       +
       		t.Error("Expected error for future proof, got nil")

     

       531
       531
       +
       	}

     

       532
       532
       +
       	if err != nil && !contains(err.Error(), "in the future") {

     

       533
       533
       +
       		t.Errorf("Expected 'in the future' error, got: %v", err)

     

       534
       534
       +
       	}

     

       535
       535
       +
       }

     

       536
       536
       +
       

     

       537
       537
       +
       func TestVerifyDPoPProof_WithinClockSkew(t *testing.T) {

     

       538
       538
       +
       	verifier := NewDPoPVerifier()

     

       539
       539
       +
       	key := generateTestES256Key(t)

     

       540
       540
       +
       

     

       541
       541
       +
       	method := "POST"

     

       542
       542
       +
       	uri := "https://api.example.com/resource"

     

       543
       543
       +
       	// Proof issued 15 seconds in the future (within MaxClockSkew of 30s)

     

       544
       544
       +
       	iat := time.Now().Add(15 * time.Second)

     

       545
       545
       +
       	jti := uuid.New().String()

     

       546
       546
       +
       

     

       547
       547
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       548
       548
       +
       

     

       549
       549
       +
       	_, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       550
       550
       +
       	if err != nil {

     

       551
       551
       +
       		t.Fatalf("VerifyDPoPProof failed for proof within clock skew: %v", err)

     

       552
       552
       +
       	}

     

       553
       553
       +
       }

     

       554
       554
       +
       

     

       555
       555
       +
       func TestVerifyDPoPProof_MissingJti(t *testing.T) {

     

       556
       556
       +
       	verifier := NewDPoPVerifier()

     

       557
       557
       +
       	key := generateTestES256Key(t)

     

       558
       558
       +
       

     

       559
       559
       +
       	method := "POST"

     

       560
       560
       +
       	uri := "https://api.example.com/resource"

     

       561
       561
       +
       	iat := time.Now()

     

       562
       562
       +
       

     

       563
       563
       +
       	claims := &DPoPClaims{

     

       564
       564
       +
       		RegisteredClaims: jwt.RegisteredClaims{

     

       565
       565
       +
       			// No ID (jti)

     

       566
       566
       +
       			IssuedAt: jwt.NewNumericDate(iat),

     

       567
       567
       +
       		},

     

       568
       568
       +
       		HTTPMethod: method,

     

       569
       569
       +
       		HTTPURI:    uri,

     

       570
       570
       +
       	}

     

       571
       571
       +
       

     

       572
       572
       +
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       573
       573
       +
       	token.Header["typ"] = "dpop+jwt"

     

       574
       574
       +
       	token.Header["jwk"] = key.jwk

     

       575
       575
       +
       

     

       576
       576
       +
       	proof, err := token.SignedString(key.privateKey)

     

       577
       577
       +
       	if err != nil {

     

       578
       578
       +
       		t.Fatalf("Failed to create test proof: %v", err)

     

       579
       579
       +
       	}

     

       580
       580
       +
       

     

       581
       581
       +
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       582
       582
       +
       	if err == nil {

     

       583
       583
       +
       		t.Error("Expected error for missing jti, got nil")

     

       584
       584
       +
       	}

     

       585
       585
       +
       	if err != nil && !contains(err.Error(), "missing jti") {

     

       586
       586
       +
       		t.Errorf("Expected missing jti error, got: %v", err)

     

       587
       587
       +
       	}

     

       588
       588
       +
       }

     

       589
       589
       +
       

     

       590
       590
       +
       func TestVerifyDPoPProof_MissingTypHeader(t *testing.T) {

     

       591
       591
       +
       	verifier := NewDPoPVerifier()

     

       592
       592
       +
       	key := generateTestES256Key(t)

     

       593
       593
       +
       

     

       594
       594
       +
       	method := "POST"

     

       595
       595
       +
       	uri := "https://api.example.com/resource"

     

       596
       596
       +
       	iat := time.Now()

     

       597
       597
       +
       	jti := uuid.New().String()

     

       598
       598
       +
       

     

       599
       599
       +
       	claims := &DPoPClaims{

     

       600
       600
       +
       		RegisteredClaims: jwt.RegisteredClaims{

     

       601
       601
       +
       			ID:       jti,

     

       602
       602
       +
       			IssuedAt: jwt.NewNumericDate(iat),

     

       603
       603
       +
       		},

     

       604
       604
       +
       		HTTPMethod: method,

     

       605
       605
       +
       		HTTPURI:    uri,

     

       606
       606
       +
       	}

     

       607
       607
       +
       

     

       608
       608
       +
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       609
       609
       +
       	// Don't set typ header

     

       610
       610
       +
       	token.Header["jwk"] = key.jwk

     

       611
       611
       +
       

     

       612
       612
       +
       	proof, err := token.SignedString(key.privateKey)

     

       613
       613
       +
       	if err != nil {

     

       614
       614
       +
       		t.Fatalf("Failed to create test proof: %v", err)

     

       615
       615
       +
       	}

     

       616
       616
       +
       

     

       617
       617
       +
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       618
       618
       +
       	if err == nil {

     

       619
       619
       +
       		t.Error("Expected error for missing typ header, got nil")

     

       620
       620
       +
       	}

     

       621
       621
       +
       	if err != nil && !contains(err.Error(), "typ must be 'dpop+jwt'") {

     

       622
       622
       +
       		t.Errorf("Expected typ header error, got: %v", err)

     

       623
       623
       +
       	}

     

       624
       624
       +
       }

     

       625
       625
       +
       

     

       626
       626
       +
       func TestVerifyDPoPProof_WrongTypHeader(t *testing.T) {

     

       627
       627
       +
       	verifier := NewDPoPVerifier()

     

       628
       628
       +
       	key := generateTestES256Key(t)

     

       629
       629
       +
       

     

       630
       630
       +
       	method := "POST"

     

       631
       631
       +
       	uri := "https://api.example.com/resource"

     

       632
       632
       +
       	iat := time.Now()

     

       633
       633
       +
       	jti := uuid.New().String()

     

       634
       634
       +
       

     

       635
       635
       +
       	claims := &DPoPClaims{

     

       636
       636
       +
       		RegisteredClaims: jwt.RegisteredClaims{

     

       637
       637
       +
       			ID:       jti,

     

       638
       638
       +
       			IssuedAt: jwt.NewNumericDate(iat),

     

       639
       639
       +
       		},

     

       640
       640
       +
       		HTTPMethod: method,

     

       641
       641
       +
       		HTTPURI:    uri,

     

       642
       642
       +
       	}

     

       643
       643
       +
       

     

       644
       644
       +
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       645
       645
       +
       	token.Header["typ"] = "JWT" // Wrong typ

     

       646
       646
       +
       	token.Header["jwk"] = key.jwk

     

       647
       647
       +
       

     

       648
       648
       +
       	proof, err := token.SignedString(key.privateKey)

     

       649
       649
       +
       	if err != nil {

     

       650
       650
       +
       		t.Fatalf("Failed to create test proof: %v", err)

     

       651
       651
       +
       	}

     

       652
       652
       +
       

     

       653
       653
       +
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       654
       654
       +
       	if err == nil {

     

       655
       655
       +
       		t.Error("Expected error for wrong typ header, got nil")

     

       656
       656
       +
       	}

     

       657
       657
       +
       	if err != nil && !contains(err.Error(), "typ must be 'dpop+jwt'") {

     

       658
       658
       +
       		t.Errorf("Expected typ header error, got: %v", err)

     

       659
       659
       +
       	}

     

       660
       660
       +
       }

     

       661
       661
       +
       

     

       662
       662
       +
       func TestVerifyDPoPProof_MissingJWK(t *testing.T) {

     

       663
       663
       +
       	verifier := NewDPoPVerifier()

     

       664
       664
       +
       	key := generateTestES256Key(t)

     

       665
       665
       +
       

     

       666
       666
       +
       	method := "POST"

     

       667
       667
       +
       	uri := "https://api.example.com/resource"

     

       668
       668
       +
       	iat := time.Now()

     

       669
       669
       +
       	jti := uuid.New().String()

     

       670
       670
       +
       

     

       671
       671
       +
       	claims := &DPoPClaims{

     

       672
       672
       +
       		RegisteredClaims: jwt.RegisteredClaims{

     

       673
       673
       +
       			ID:       jti,

     

       674
       674
       +
       			IssuedAt: jwt.NewNumericDate(iat),

     

       675
       675
       +
       		},

     

       676
       676
       +
       		HTTPMethod: method,

     

       677
       677
       +
       		HTTPURI:    uri,

     

       678
       678
       +
       	}

     

       679
       679
       +
       

     

       680
       680
       +
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       681
       681
       +
       	token.Header["typ"] = "dpop+jwt"

     

       682
       682
       +
       	// Don't include JWK

     

       683
       683
       +
       

     

       684
       684
       +
       	proof, err := token.SignedString(key.privateKey)

     

       685
       685
       +
       	if err != nil {

     

       686
       686
       +
       		t.Fatalf("Failed to create test proof: %v", err)

     

       687
       687
       +
       	}

     

       688
       688
       +
       

     

       689
       689
       +
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       690
       690
       +
       	if err == nil {

     

       691
       691
       +
       		t.Error("Expected error for missing jwk header, got nil")

     

       692
       692
       +
       	}

     

       693
       693
       +
       	if err != nil && !contains(err.Error(), "missing jwk") {

     

       694
       694
       +
       		t.Errorf("Expected missing jwk error, got: %v", err)

     

       695
       695
       +
       	}

     

       696
       696
       +
       }

     

       697
       697
       +
       

     

       698
       698
       +
       func TestVerifyDPoPProof_CustomTimeSettings(t *testing.T) {

     

       699
       699
       +
       	verifier := &DPoPVerifier{

     

       700
       700
       +
       		MaxClockSkew: 1 * time.Minute,

     

       701
       701
       +
       		MaxProofAge:  10 * time.Minute,

     

       702
       702
       +
       	}

     

       703
       703
       +
       	key := generateTestES256Key(t)

     

       704
       704
       +
       

     

       705
       705
       +
       	method := "POST"

     

       706
       706
       +
       	uri := "https://api.example.com/resource"

     

       707
       707
       +
       	// Proof issued 50 seconds in the future (within custom MaxClockSkew)

     

       708
       708
       +
       	iat := time.Now().Add(50 * time.Second)

     

       709
       709
       +
       	jti := uuid.New().String()

     

       710
       710
       +
       

     

       711
       711
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       712
       712
       +
       

     

       713
       713
       +
       	_, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       714
       714
       +
       	if err != nil {

     

       715
       715
       +
       		t.Fatalf("VerifyDPoPProof failed with custom time settings: %v", err)

     

       716
       716
       +
       	}

     

       717
       717
       +
       }

     

       718
       718
       +
       

     

       719
       719
       +
       func TestVerifyDPoPProof_HTTPMethodCaseInsensitive(t *testing.T) {

     

       720
       720
       +
       	// HTTP method comparison should be case-insensitive per spec

     

       721
       721
       +
       	verifier := NewDPoPVerifier()

     

       722
       722
       +
       	key := generateTestES256Key(t)

     

       723
       723
       +
       

     

       724
       724
       +
       	method := "post"

     

       725
       725
       +
       	uri := "https://api.example.com/resource"

     

       726
       726
       +
       	iat := time.Now()

     

       727
       727
       +
       	jti := uuid.New().String()

     

       728
       728
       +
       

     

       729
       729
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       730
       730
       +
       

     

       731
       731
       +
       	// Verify with uppercase method

     

       732
       732
       +
       	_, err := verifier.VerifyDPoPProof(proof, "POST", uri)

     

       733
       733
       +
       	if err != nil {

     

       734
       734
       +
       		t.Fatalf("VerifyDPoPProof failed for case-insensitive method: %v", err)

     

       735
       735
       +
       	}

     

       736
       736
       +
       }

     

       737
       737
       +
       

     

       738
       738
       +
       // === Token Binding Verification Tests ===

     

       739
       739
       +
       

     

       740
       740
       +
       func TestVerifyTokenBinding_Matching(t *testing.T) {

     

       741
       741
       +
       	verifier := NewDPoPVerifier()

     

       742
       742
       +
       	key := generateTestES256Key(t)

     

       743
       743
       +
       

     

       744
       744
       +
       	method := "POST"

     

       745
       745
       +
       	uri := "https://api.example.com/resource"

     

       746
       746
       +
       	iat := time.Now()

     

       747
       747
       +
       	jti := uuid.New().String()

     

       748
       748
       +
       

     

       749
       749
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       750
       750
       +
       

     

       751
       751
       +
       	result, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       752
       752
       +
       	if err != nil {

     

       753
       753
       +
       		t.Fatalf("VerifyDPoPProof failed: %v", err)

     

       754
       754
       +
       	}

     

       755
       755
       +
       

     

       756
       756
       +
       	// Verify token binding with matching thumbprint

     

       757
       757
       +
       	err = verifier.VerifyTokenBinding(result, key.thumbprint)

     

       758
       758
       +
       	if err != nil {

     

       759
       759
       +
       		t.Fatalf("VerifyTokenBinding failed for matching thumbprint: %v", err)

     

       760
       760
       +
       	}

     

       761
       761
       +
       }

     

       762
       762
       +
       

     

       763
       763
       +
       func TestVerifyTokenBinding_Mismatch(t *testing.T) {

     

       764
       764
       +
       	verifier := NewDPoPVerifier()

     

       765
       765
       +
       	key := generateTestES256Key(t)

     

       766
       766
       +
       	wrongKey := generateTestES256Key(t)

     

       767
       767
       +
       

     

       768
       768
       +
       	method := "POST"

     

       769
       769
       +
       	uri := "https://api.example.com/resource"

     

       770
       770
       +
       	iat := time.Now()

     

       771
       771
       +
       	jti := uuid.New().String()

     

       772
       772
       +
       

     

       773
       773
       +
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       774
       774
       +
       

     

       775
       775
       +
       	result, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       776
       776
       +
       	if err != nil {

     

       777
       777
       +
       		t.Fatalf("VerifyDPoPProof failed: %v", err)

     

       778
       778
       +
       	}

     

       779
       779
       +
       

     

       780
       780
       +
       	// Verify token binding with wrong thumbprint

     

       781
       781
       +
       	err = verifier.VerifyTokenBinding(result, wrongKey.thumbprint)

     

       782
       782
       +
       	if err == nil {

     

       783
       783
       +
       		t.Error("Expected error for thumbprint mismatch, got nil")

     

       784
       784
       +
       	}

     

       785
       785
       +
       	if err != nil && !contains(err.Error(), "thumbprint mismatch") {

     

       786
       786
       +
       		t.Errorf("Expected thumbprint mismatch error, got: %v", err)

     

       787
       787
       +
       	}

     

       788
       788
       +
       }

     

       789
       789
       +
       

     

       790
       790
       +
       // === ExtractCnfJkt Tests ===

     

       791
       791
       +
       

     

       792
       792
       +
       func TestExtractCnfJkt_Valid(t *testing.T) {

     

       793
       793
       +
       	expectedJkt := "test-thumbprint-123"

     

       794
       794
       +
       	claims := &Claims{

     

       795
       795
       +
       		Confirmation: map[string]interface{}{

     

       796
       796
       +
       			"jkt": expectedJkt,

     

       797
       797
       +
       		},

     

       798
       798
       +
       	}

     

       799
       799
       +
       

     

       800
       800
       +
       	jkt, err := ExtractCnfJkt(claims)

     

       801
       801
       +
       	if err != nil {

     

       802
       802
       +
       		t.Fatalf("ExtractCnfJkt failed for valid claims: %v", err)

     

       803
       803
       +
       	}

     

       804
       804
       +
       

     

       805
       805
       +
       	if jkt != expectedJkt {

     

       806
       806
       +
       		t.Errorf("Expected jkt %s, got %s", expectedJkt, jkt)

     

       807
       807
       +
       	}

     

       808
       808
       +
       }

     

       809
       809
       +
       

     

       810
       810
       +
       func TestExtractCnfJkt_MissingCnf(t *testing.T) {

     

       811
       811
       +
       	claims := &Claims{

     

       812
       812
       +
       		// No Confirmation

     

       813
       813
       +
       	}

     

       814
       814
       +
       

     

       815
       815
       +
       	_, err := ExtractCnfJkt(claims)

     

       816
       816
       +
       	if err == nil {

     

       817
       817
       +
       		t.Error("Expected error for missing cnf, got nil")

     

       818
       818
       +
       	}

     

       819
       819
       +
       	if err != nil && !contains(err.Error(), "missing cnf claim") {

     

       820
       820
       +
       		t.Errorf("Expected missing cnf error, got: %v", err)

     

       821
       821
       +
       	}

     

       822
       822
       +
       }

     

       823
       823
       +
       

     

       824
       824
       +
       func TestExtractCnfJkt_NilCnf(t *testing.T) {

     

       825
       825
       +
       	claims := &Claims{

     

       826
       826
       +
       		Confirmation: nil,

     

       827
       827
       +
       	}

     

       828
       828
       +
       

     

       829
       829
       +
       	_, err := ExtractCnfJkt(claims)

     

       830
       830
       +
       	if err == nil {

     

       831
       831
       +
       		t.Error("Expected error for nil cnf, got nil")

     

       832
       832
       +
       	}

     

       833
       833
       +
       	if err != nil && !contains(err.Error(), "missing cnf claim") {

     

       834
       834
       +
       		t.Errorf("Expected missing cnf error, got: %v", err)

     

       835
       835
       +
       	}

     

       836
       836
       +
       }

     

       837
       837
       +
       

     

       838
       838
       +
       func TestExtractCnfJkt_MissingJkt(t *testing.T) {

     

       839
       839
       +
       	claims := &Claims{

     

       840
       840
       +
       		Confirmation: map[string]interface{}{

     

       841
       841
       +
       			"other": "value",

     

       842
       842
       +
       		},

     

       843
       843
       +
       	}

     

       844
       844
       +
       

     

       845
       845
       +
       	_, err := ExtractCnfJkt(claims)

     

       846
       846
       +
       	if err == nil {

     

       847
       847
       +
       		t.Error("Expected error for missing jkt, got nil")

     

       848
       848
       +
       	}

     

       849
       849
       +
       	if err != nil && !contains(err.Error(), "missing jkt") {

     

       850
       850
       +
       		t.Errorf("Expected missing jkt error, got: %v", err)

     

       851
       851
       +
       	}

     

       852
       852
       +
       }

     

       853
       853
       +
       

     

       854
       854
       +
       func TestExtractCnfJkt_EmptyJkt(t *testing.T) {

     

       855
       855
       +
       	claims := &Claims{

     

       856
       856
       +
       		Confirmation: map[string]interface{}{

     

       857
       857
       +
       			"jkt": "",

     

       858
       858
       +
       		},

     

       859
       859
       +
       	}

     

       860
       860
       +
       

     

       861
       861
       +
       	_, err := ExtractCnfJkt(claims)

     

       862
       862
       +
       	if err == nil {

     

       863
       863
       +
       		t.Error("Expected error for empty jkt, got nil")

     

       864
       864
       +
       	}

     

       865
       865
       +
       	if err != nil && !contains(err.Error(), "missing jkt") {

     

       866
       866
       +
       		t.Errorf("Expected missing jkt error, got: %v", err)

     

       867
       867
       +
       	}

     

       868
       868
       +
       }

     

       869
       869
       +
       

     

       870
       870
       +
       func TestExtractCnfJkt_WrongType(t *testing.T) {

     

       871
       871
       +
       	claims := &Claims{

     

       872
       872
       +
       		Confirmation: map[string]interface{}{

     

       873
       873
       +
       			"jkt": 123, // Not a string

     

       874
       874
       +
       		},

     

       875
       875
       +
       	}

     

       876
       876
       +
       

     

       877
       877
       +
       	_, err := ExtractCnfJkt(claims)

     

       878
       878
       +
       	if err == nil {

     

       879
       879
       +
       		t.Error("Expected error for wrong type jkt, got nil")

     

       880
       880
       +
       	}

     

       881
       881
       +
       	if err != nil && !contains(err.Error(), "missing jkt") {

     

       882
       882
       +
       		t.Errorf("Expected missing jkt error, got: %v", err)

     

       883
       883
       +
       	}

     

       884
       884
       +
       }

     

       885
       885
       +
       

     

       886
       886
       +
       // === Helper Functions for Tests ===

     

       887
       887
       +
       

     

       888
       888
       +
       // splitJWT splits a JWT into its three parts

     

       889
       889
       +
       func splitJWT(token string) []string {

     

       890
       890
       +
       	return []string{

     

       891
       891
       +
       		token[:strings.IndexByte(token, '.')],

     

       892
       892
       +
       		token[strings.IndexByte(token, '.')+1 : strings.LastIndexByte(token, '.')],

     

       893
       893
       +
       		token[strings.LastIndexByte(token, '.')+1:],

     

       894
       894
       +
       	}

     

       895
       895
       +
       }

     

       896
       896
       +
       

     

       897
       897
       +
       // parseJWTHeader parses a base64url-encoded JWT header

     

       898
       898
       +
       func parseJWTHeader(t *testing.T, encoded string) map[string]interface{} {

     

       899
       899
       +
       	t.Helper()

     

       900
       900
       +
       	decoded, err := base64.RawURLEncoding.DecodeString(encoded)

     

       901
       901
       +
       	if err != nil {

     

       902
       902
       +
       		t.Fatalf("Failed to decode header: %v", err)

     

       903
       903
       +
       	}

     

       904
       904
       +
       

     

       905
       905
       +
       	var header map[string]interface{}

     

       906
       906
       +
       	if err := json.Unmarshal(decoded, &header); err != nil {

     

       907
       907
       +
       		t.Fatalf("Failed to unmarshal header: %v", err)

     

       908
       908
       +
       	}

     

       909
       909
       +
       

     

       910
       910
       +
       	return header

     

       911
       911
       +
       }

     

       912
       912
       +
       

     

       913
       913
       +
       // encodeJSON encodes a value to base64url-encoded JSON

     

       914
       914
       +
       func encodeJSON(t *testing.T, v interface{}) string {

     

       915
       915
       +
       	t.Helper()

     

       916
       916
       +
       	data, err := json.Marshal(v)

     

       917
       917
       +
       	if err != nil {

     

       918
       918
       +
       		t.Fatalf("Failed to marshal JSON: %v", err)

     

       919
       919
       +
       	}

     

       920
       920
       +
       	return base64.RawURLEncoding.EncodeToString(data)

     

       921
       921
       +
       }