comparing 185f7ae0977cb4e0bc97eb78ec04fa7871fad6e8 and feat/vote-xrpc-endpoints on bretton.dev/coves

go.mod

···

       27
       27
        
       	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect

     

       28
       28
        
       	github.com/earthboundkid/versioninfo/v2 v2.24.1 // indirect

     

       29
       29
        
       	github.com/felixge/httpsnoop v1.0.4 // indirect

     

       30
       30
       +
       	github.com/go-chi/cors v1.2.2 // indirect

     

       30
       31
        
       	github.com/go-logr/logr v1.4.1 // indirect

     

       31
       32
        
       	github.com/go-logr/stdr v1.2.2 // indirect

     

       32
       33
        
       	github.com/goccy/go-json v0.10.2 // indirect

     

       33
       34
        
       	github.com/gogo/protobuf v1.3.2 // indirect

     

       35
       35
       +
       	github.com/google/go-querystring v1.1.0 // indirect

     

       34
       36
        
       	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect

     

       35
       37
        
       	github.com/hashicorp/go-retryablehttp v0.7.5 // indirect

     

       36
       38
        
       	github.com/hashicorp/golang-lru v1.0.2 // indirect

go.sum

···

       21
       21
        
       github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=

     

       22
       22
        
       github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=

     

       23
       23
        
       github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=

     

       24
       24
       +
       github.com/go-chi/cors v1.2.2 h1:Jmey33TE+b+rB7fT8MUy1u0I4L+NARQlK6LhzKPSyQE=

     

       25
       25
       +
       github.com/go-chi/cors v1.2.2/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=

     

       24
       26
        
       github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

     

       25
       27
        
       github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=

     

       26
       28
        
       github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=

     
···

       33
       35
        
       github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=

     

       34
       36
        
       github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=

     

       35
       37
        
       github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=

     

       38
       38
       +
       github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

     

       36
       39
        
       github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=

     

       37
       40
        
       github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=

     

       41
       41
       +
       github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=

     

       42
       42
       +
       github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=

     

       38
       43
        
       github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=

     

       39
       44
        
       github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

     

       40
       45
        
       github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

.env.dev

···

       115
       115
        
       # Also supports base64: prefix for consistency

     

       116
       116
        
       OAUTH_COOKIE_SECRET=f1132c01b1a625a865c6c455a75ee793572cedb059cebe0c4c1ae4c446598f7d

     

       117
       117
        
       

     

       118
       118
       +
       # Seal secret for OAuth session tokens (AES-256-GCM encryption)

     

       119
       119
       +
       # Generate with: openssl rand -base64 32

     

       120
       120
       +
       # This must be 32 bytes when base64-decoded for AES-256

     

       121
       121
       +
       # OAUTH_SEAL_SECRET=ryW6xNVxYhP6hCDA90NGCmK58Q2ONnkYXbHL0oZN2no=

     

       122
       122
       +
       

     

       118
       123
        
       # AppView public URL (used for OAuth callback and client metadata)

     

       119
       124
        
       # Dev: http://127.0.0.1:8081 (use 127.0.0.1 instead of localhost per RFC 8252)

     

       120
       125
        
       # Prod: https://coves.social

-73

cmd/genjwks/main.go

···

       1
       1
       -
       package main

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"crypto/ecdsa"

     

       5
       5
       -
       	"crypto/elliptic"

     

       6
       6
       -
       	"crypto/rand"

     

       7
       7
       -
       	"encoding/json"

     

       8
       8
       -
       	"fmt"

     

       9
       9
       -
       	"log"

     

       10
       10
       -
       	"os"

     

       11
       11
       -
       

     

       12
       12
       -
       	"github.com/lestrrat-go/jwx/v2/jwk"

     

       13
       13
       -
       )

     

       14
       14
       -
       

     

       15
       15
       -
       // genjwks generates an ES256 keypair for OAuth client authentication

     

       16
       16
       -
       // The private key is stored in the config/env, public key is served at /oauth/jwks.json

     

       17
       17
       -
       //

     

       18
       18
       -
       // Usage:

     

       19
       19
       -
       //

     

       20
       20
       -
       //	go run cmd/genjwks/main.go

     

       21
       21
       -
       //

     

       22
       22
       -
       // This will output a JSON private key that should be stored in OAUTH_PRIVATE_JWK

     

       23
       23
       -
       func main() {

     

       24
       24
       -
       	fmt.Println("Generating ES256 keypair for OAuth client authentication...")

     

       25
       25
       -
       

     

       26
       26
       -
       	// Generate ES256 (NIST P-256) private key

     

       27
       27
       -
       	privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)

     

       28
       28
       -
       	if err != nil {

     

       29
       29
       -
       		log.Fatalf("Failed to generate private key: %v", err)

     

       30
       30
       -
       	}

     

       31
       31
       -
       

     

       32
       32
       -
       	// Convert to JWK

     

       33
       33
       -
       	jwkKey, err := jwk.FromRaw(privateKey)

     

       34
       34
       -
       	if err != nil {

     

       35
       35
       -
       		log.Fatalf("Failed to create JWK from private key: %v", err)

     

       36
       36
       -
       	}

     

       37
       37
       -
       

     

       38
       38
       -
       	// Set key parameters

     

       39
       39
       -
       	if err = jwkKey.Set(jwk.KeyIDKey, "oauth-client-key"); err != nil {

     

       40
       40
       -
       		log.Fatalf("Failed to set kid: %v", err)

     

       41
       41
       -
       	}

     

       42
       42
       -
       	if err = jwkKey.Set(jwk.AlgorithmKey, "ES256"); err != nil {

     

       43
       43
       -
       		log.Fatalf("Failed to set alg: %v", err)

     

       44
       44
       -
       	}

     

       45
       45
       -
       	if err = jwkKey.Set(jwk.KeyUsageKey, "sig"); err != nil {

     

       46
       46
       -
       		log.Fatalf("Failed to set use: %v", err)

     

       47
       47
       -
       	}

     

       48
       48
       -
       

     

       49
       49
       -
       	// Marshal to JSON

     

       50
       50
       -
       	jsonData, err := json.MarshalIndent(jwkKey, "", "  ")

     

       51
       51
       -
       	if err != nil {

     

       52
       52
       -
       		log.Fatalf("Failed to marshal JWK: %v", err)

     

       53
       53
       -
       	}

     

       54
       54
       -
       

     

       55
       55
       -
       	// Output instructions

     

       56
       56
       -
       	fmt.Println("\n✅ ES256 keypair generated successfully!")

     

       57
       57
       -
       	fmt.Println("\n📝 Add this to your .env.dev file:")

     

       58
       58
       -
       	fmt.Println("\nOAUTH_PRIVATE_JWK='" + string(jsonData) + "'")

     

       59
       59
       -
       	fmt.Println("\n⚠️  IMPORTANT:")

     

       60
       60
       -
       	fmt.Println("   - Keep this private key SECRET")

     

       61
       61
       -
       	fmt.Println("   - Never commit it to version control")

     

       62
       62
       -
       	fmt.Println("   - Generate a new key for production")

     

       63
       63
       -
       	fmt.Println("   - The public key will be automatically derived and served at /oauth/jwks.json")

     

       64
       64
       -
       

     

       65
       65
       -
       	// Optionally write to a file (not committed)

     

       66
       66
       -
       	if len(os.Args) > 1 && os.Args[1] == "--save" {

     

       67
       67
       -
       		filename := "oauth-private-key.json"

     

       68
       68
       -
       		if err := os.WriteFile(filename, jsonData, 0o600); err != nil {

     

       69
       69
       -
       			log.Fatalf("Failed to write key file: %v", err)

     

       70
       70
       -
       		}

     

       71
       71
       -
       		fmt.Printf("\n💾 Private key saved to %s (remember to add to .gitignore!)\n", filename)

     

       72
       72
       -
       	}

     

       73
       73
       -
       }

-330

internal/atproto/auth/README.md

···

       1
       1
       -
       # atProto OAuth Authentication

     

       2
       2
       -
       

     

       3
       3
       -
       This package implements third-party OAuth authentication for Coves, validating DPoP-bound access tokens from mobile apps and other atProto clients.

     

       4
       4
       -
       

     

       5
       5
       -
       ## Architecture

     

       6
       6
       -
       

     

       7
       7
       -
       This is **third-party authentication** (validating incoming requests), not first-party authentication (logging users into Coves web frontend).

     

       8
       8
       -
       

     

       9
       9
       -
       ### Components

     

       10
       10
       -
       

     

       11
       11
       -
       1. **JWT Parser** (`jwt.go`) - Parses and validates JWT tokens

     

       12
       12
       -
       2. **JWKS Fetcher** (`jwks_fetcher.go`) - Fetches and caches public keys from PDS authorization servers

     

       13
       13
       -
       3. **Auth Middleware** (`internal/api/middleware/auth.go`) - HTTP middleware that protects endpoints

     

       14
       14
       -
       

     

       15
       15
       -
       ### Flow

     

       16
       16
       -
       

     

       17
       17
       -
       ```

     

       18
       18
       -
       Client Request

     

       19
       19
       -
           ↓

     

       20
       20
       -
       Authorization: DPoP <access_token>

     

       21
       21
       -
       DPoP: <proof-jwt>

     

       22
       22
       -
           ↓

     

       23
       23
       -
       Auth Middleware

     

       24
       24
       -
           ↓

     

       25
       25
       -
       Extract JWT → Parse Claims → Verify Signature (via JWKS) → Verify DPoP Proof

     

       26
       26
       -
           ↓

     

       27
       27
       -
       Inject DID into Context → Call Handler

     

       28
       28
       -
       ```

     

       29
       29
       -
       

     

       30
       30
       -
       ## Usage

     

       31
       31
       -
       

     

       32
       32
       -
       ### Phase 1: Parse-Only Mode (Testing)

     

       33
       33
       -
       

     

       34
       34
       -
       Set `AUTH_SKIP_VERIFY=true` to only parse JWTs without signature verification:

     

       35
       35
       -
       

     

       36
       36
       -
       ```bash

     

       37
       37
       -
       export AUTH_SKIP_VERIFY=true

     

       38
       38
       -
       ```

     

       39
       39
       -
       

     

       40
       40
       -
       This is useful for:

     

       41
       41
       -
       - Initial integration testing

     

       42
       42
       -
       - Testing with mock tokens

     

       43
       43
       -
       - Debugging JWT structure

     

       44
       44
       -
       

     

       45
       45
       -
       ### Phase 2: Full Verification (Production)

     

       46
       46
       -
       

     

       47
       47
       -
       Set `AUTH_SKIP_VERIFY=false` (or unset) to enable full JWT signature verification:

     

       48
       48
       -
       

     

       49
       49
       -
       ```bash

     

       50
       50
       -
       export AUTH_SKIP_VERIFY=false

     

       51
       51
       -
       # or just unset it

     

       52
       52
       -
       ```

     

       53
       53
       -
       

     

       54
       54
       -
       This is **required for production** and validates:

     

       55
       55
       -
       - JWT signature using PDS public key

     

       56
       56
       -
       - Token expiration

     

       57
       57
       -
       - Required claims (sub, iss)

     

       58
       58
       -
       - DID format

     

       59
       59
       -
       

     

       60
       60
       -
       ## Protected Endpoints

     

       61
       61
       -
       

     

       62
       62
       -
       The following endpoints require authentication:

     

       63
       63
       -
       

     

       64
       64
       -
       - `POST /xrpc/social.coves.community.create`

     

       65
       65
       -
       - `POST /xrpc/social.coves.community.update`

     

       66
       66
       -
       - `POST /xrpc/social.coves.community.subscribe`

     

       67
       67
       -
       - `POST /xrpc/social.coves.community.unsubscribe`

     

       68
       68
       -
       

     

       69
       69
       -
       ### Making Authenticated Requests

     

       70
       70
       -
       

     

       71
       71
       -
       Include the JWT in the `Authorization` header:

     

       72
       72
       -
       

     

       73
       73
       -
       ```bash

     

       74
       74
       -
       curl -X POST https://coves.social/xrpc/social.coves.community.create \

     

       75
       75
       -
         -H "Authorization: DPoP eyJhbGc..." \

     

       76
       76
       -
         -H "DPoP: eyJhbGc..." \

     

       77
       77
       -
         -H "Content-Type: application/json" \

     

       78
       78
       -
         -d '{"name":"Gaming","hostedByDid":"did:plc:..."}'

     

       79
       79
       -
       ```

     

       80
       80
       -
       

     

       81
       81
       -
       ### Getting User DID in Handlers

     

       82
       82
       -
       

     

       83
       83
       -
       The middleware injects the authenticated user's DID into the request context:

     

       84
       84
       -
       

     

       85
       85
       -
       ```go

     

       86
       86
       -
       import "Coves/internal/api/middleware"

     

       87
       87
       -
       

     

       88
       88
       -
       func (h *Handler) HandleCreate(w http.ResponseWriter, r *http.Request) {

     

       89
       89
       -
           // Extract authenticated user DID

     

       90
       90
       -
           userDID := middleware.GetUserDID(r)

     

       91
       91
       -
           if userDID == "" {

     

       92
       92
       -
               // Not authenticated (should never happen with RequireAuth middleware)

     

       93
       93
       -
               http.Error(w, "Unauthorized", http.StatusUnauthorized)

     

       94
       94
       -
               return

     

       95
       95
       -
           }

     

       96
       96
       -
       

     

       97
       97
       -
           // Use userDID for authorization checks

     

       98
       98
       -
           // ...

     

       99
       99
       -
       }

     

       100
       100
       -
       ```

     

       101
       101
       -
       

     

       102
       102
       -
       ## Key Caching

     

       103
       103
       -
       

     

       104
       104
       -
       Public keys are fetched from PDS authorization servers and cached for 1 hour. The cache is automatically cleaned up hourly to remove expired entries.

     

       105
       105
       -
       

     

       106
       106
       -
       ### JWKS Discovery Flow

     

       107
       107
       -
       

     

       108
       108
       -
       1. Extract `iss` claim from JWT (e.g., `https://pds.example.com`)

     

       109
       109
       -
       2. Fetch `https://pds.example.com/.well-known/oauth-authorization-server`

     

       110
       110
       -
       3. Extract `jwks_uri` from metadata

     

       111
       111
       -
       4. Fetch JWKS from `jwks_uri`

     

       112
       112
       -
       5. Find matching key by `kid` from JWT header

     

       113
       113
       -
       6. Cache the JWKS for 1 hour

     

       114
       114
       -
       

     

       115
       115
       -
       ## DPoP Token Binding

     

       116
       116
       -
       

     

       117
       117
       -
       DPoP (Demonstrating Proof-of-Possession) binds access tokens to client-controlled cryptographic keys, preventing token theft and replay attacks.

     

       118
       118
       -
       

     

       119
       119
       -
       ### What is DPoP?

     

       120
       120
       -
       

     

       121
       121
       -
       DPoP is an OAuth extension (RFC 9449) that adds proof-of-possession semantics to bearer tokens. When a PDS issues a DPoP-bound access token:

     

       122
       122
       -
       

     

       123
       123
       -
       1. Access token contains `cnf.jkt` claim (JWK thumbprint of client's public key)

     

       124
       124
       -
       2. Client creates a DPoP proof JWT signed with their private key

     

       125
       125
       -
       3. Server verifies the proof signature and checks it matches the token's `cnf.jkt`

     

       126
       126
       -
       

     

       127
       127
       -
       ### CRITICAL: DPoP Security Model

     

       128
       128
       -
       

     

       129
       129
       -
       > ⚠️ **DPoP is an ADDITIONAL security layer, NOT a replacement for token signature verification.**

     

       130
       130
       -
       

     

       131
       131
       -
       The correct verification order is:

     

       132
       132
       -
       1. **ALWAYS verify the access token signature first** (via JWKS, HS256 shared secret, or DID resolution)

     

       133
       133
       -
       2. **If the verified token has `cnf.jkt`, REQUIRE valid DPoP proof**

     

       134
       134
       -
       3. **NEVER use DPoP as a fallback when signature verification fails**

     

       135
       135
       -
       

     

       136
       136
       -
       **Why This Matters**: An attacker could create a fake token with `sub: "did:plc:victim"` and their own `cnf.jkt`, then present a valid DPoP proof signed with their key. If we accept DPoP as a fallback, the attacker can impersonate any user.

     

       137
       137
       -
       

     

       138
       138
       -
       ### How DPoP Works

     

       139
       139
       -
       

     

       140
       140
       -
       ```

     

       141
       141
       -
       ┌─────────────┐                          ┌─────────────┐

     

       142
       142
       -
       │   Client    │                          │   Server    │

     

       143
       143
       -
       │             │                          │  (Coves)    │

     

       144
       144
       -
       └─────────────┘                          └─────────────┘

     

       145
       145
       -
              │                                        │

     

       146
       146
       -
              │ 1. Authorization: DPoP <token>         │

     

       147
       147
       -
              │    DPoP: <proof-jwt>                  │

     

       148
       148
       -
              │───────────────────────────────────────>│

     

       149
       149
       -
              │                                        │

     

       150
       150
       -
              │                                        │ 2. VERIFY token signature

     

       151
       151
       -
              │                                        │    (REQUIRED - no fallback!)

     

       152
       152
       -
              │                                        │

     

       153
       153
       -
              │                                        │ 3. If token has cnf.jkt:

     

       154
       154
       -
              │                                        │    - Verify DPoP proof

     

       155
       155
       -
              │                                        │    - Check thumbprint match

     

       156
       156
       -
              │                                        │

     

       157
       157
       -
              │                              200 OK    │

     

       158
       158
       -
              │<───────────────────────────────────────│

     

       159
       159
       -
       ```

     

       160
       160
       -
       

     

       161
       161
       -
       ### When DPoP is Required

     

       162
       162
       -
       

     

       163
       163
       -
       DPoP verification is **REQUIRED** when:

     

       164
       164
       -
       - Access token signature has been verified AND

     

       165
       165
       -
       - Access token contains `cnf.jkt` claim (DPoP-bound)

     

       166
       166
       -
       

     

       167
       167
       -
       If the token has `cnf.jkt` but no DPoP header is present, the request is **REJECTED**.

     

       168
       168
       -
       

     

       169
       169
       -
       ### Replay Protection

     

       170
       170
       -
       

     

       171
       171
       -
       DPoP proofs include a unique `jti` (JWT ID) claim. The server tracks seen `jti` values to prevent replay attacks:

     

       172
       172
       -
       

     

       173
       173
       -
       ```go

     

       174
       174
       -
       // Create a verifier with replay protection (default)

     

       175
       175
       -
       verifier := auth.NewDPoPVerifier()

     

       176
       176
       -
       defer verifier.Stop() // Stop cleanup goroutine on shutdown

     

       177
       177
       -
       

     

       178
       178
       -
       // The verifier automatically rejects reused jti values within the proof validity window (5 minutes)

     

       179
       179
       -
       ```

     

       180
       180
       -
       

     

       181
       181
       -
       ### DPoP Implementation

     

       182
       182
       -
       

     

       183
       183
       -
       The `dpop.go` module provides:

     

       184
       184
       -
       

     

       185
       185
       -
       ```go

     

       186
       186
       -
       // Create a verifier with replay protection

     

       187
       187
       -
       verifier := auth.NewDPoPVerifier()

     

       188
       188
       -
       defer verifier.Stop()

     

       189
       189
       -
       

     

       190
       190
       -
       // Verify the DPoP proof

     

       191
       191
       -
       proof, err := verifier.VerifyDPoPProof(dpopHeader, "POST", "https://coves.social/xrpc/...")

     

       192
       192
       -
       if err != nil {

     

       193
       193
       -
           // Invalid proof (includes replay detection)

     

       194
       194
       -
       }

     

       195
       195
       -
       

     

       196
       196
       -
       // Verify it binds to the VERIFIED access token

     

       197
       197
       -
       expectedThumbprint, err := auth.ExtractCnfJkt(claims)

     

       198
       198
       -
       if err != nil {

     

       199
       199
       -
           // Token not DPoP-bound

     

       200
       200
       -
       }

     

       201
       201
       -
       

     

       202
       202
       -
       if err := verifier.VerifyTokenBinding(proof, expectedThumbprint); err != nil {

     

       203
       203
       -
           // Proof doesn't match token

     

       204
       204
       -
       }

     

       205
       205
       -
       ```

     

       206
       206
       -
       

     

       207
       207
       -
       ### DPoP Proof Format

     

       208
       208
       -
       

     

       209
       209
       -
       The DPoP header contains a JWT with:

     

       210
       210
       -
       

     

       211
       211
       -
       **Header**:

     

       212
       212
       -
       - `typ`: `"dpop+jwt"` (required)

     

       213
       213
       -
       - `alg`: `"ES256"` (or other supported algorithm)

     

       214
       214
       -
       - `jwk`: Client's public key (JWK format)

     

       215
       215
       -
       

     

       216
       216
       -
       **Claims**:

     

       217
       217
       -
       - `jti`: Unique proof identifier (tracked for replay protection)

     

       218
       218
       -
       - `htm`: HTTP method (e.g., `"POST"`)

     

       219
       219
       -
       - `htu`: HTTP URI (without query/fragment)

     

       220
       220
       -
       - `iat`: Timestamp (must be recent, within 5 minutes)

     

       221
       221
       -
       

     

       222
       222
       -
       **Example**:

     

       223
       223
       -
       ```json

     

       224
       224
       -
       {

     

       225
       225
       -
         "typ": "dpop+jwt",

     

       226
       226
       -
         "alg": "ES256",

     

       227
       227
       -
         "jwk": {

     

       228
       228
       -
           "kty": "EC",

     

       229
       229
       -
           "crv": "P-256",

     

       230
       230
       -
           "x": "...",

     

       231
       231
       -
           "y": "..."

     

       232
       232
       -
         }

     

       233
       233
       -
       }

     

       234
       234
       -
       {

     

       235
       235
       -
         "jti": "unique-id-123",

     

       236
       236
       -
         "htm": "POST",

     

       237
       237
       -
         "htu": "https://coves.social/xrpc/social.coves.community.create",

     

       238
       238
       -
         "iat": 1700000000

     

       239
       239
       -
       }

     

       240
       240
       -
       ```

     

       241
       241
       -
       

     

       242
       242
       -
       ## Security Considerations

     

       243
       243
       -
       

     

       244
       244
       -
       ### ✅ Implemented

     

       245
       245
       -
       

     

       246
       246
       -
       - JWT signature verification with PDS public keys

     

       247
       247
       -
       - Token expiration validation

     

       248
       248
       -
       - DID format validation

     

       249
       249
       -
       - Required claims validation (sub, iss)

     

       250
       250
       -
       - Key caching with TTL

     

       251
       251
       -
       - Secure error messages (no internal details leaked)

     

       252
       252
       -
       - **DPoP proof verification** (proof-of-possession for token binding)

     

       253
       253
       -
       - **DPoP thumbprint validation** (prevents token theft attacks)

     

       254
       254
       -
       - **DPoP freshness checks** (5-minute proof validity window)

     

       255
       255
       -
       - **DPoP replay protection** (jti tracking with in-memory cache)

     

       256
       256
       -
       - **Secure DPoP model** (DPoP required AFTER signature verification, never as fallback)

     

       257
       257
       -
       

     

       258
       258
       -
       ### ⚠️ Not Yet Implemented

     

       259
       259
       -
       

     

       260
       260
       -
       - Server-issued DPoP nonces (additional replay protection)

     

       261
       261
       -
       - Scope validation (checking `scope` claim)

     

       262
       262
       -
       - Audience validation (checking `aud` claim)

     

       263
       263
       -
       - Rate limiting per DID

     

       264
       264
       -
       - Token revocation checking

     

       265
       265
       -
       

     

       266
       266
       -
       ## Testing

     

       267
       267
       -
       

     

       268
       268
       -
       Run the test suite:

     

       269
       269
       -
       

     

       270
       270
       -
       ```bash

     

       271
       271
       -
       go test ./internal/atproto/auth/... -v

     

       272
       272
       -
       ```

     

       273
       273
       -
       

     

       274
       274
       -
       ### Manual Testing

     

       275
       275
       -
       

     

       276
       276
       -
       1. **Phase 1 (Parse Only)**:

     

       277
       277
       -
          ```bash

     

       278
       278
       -
          # Create a test JWT (use jwt.io or a tool)

     

       279
       279
       -
          export AUTH_SKIP_VERIFY=true

     

       280
       280
       -
          curl -X POST http://localhost:8081/xrpc/social.coves.community.create \

     

       281
       281
       -
            -H "Authorization: DPoP <test-jwt>" \

     

       282
       282
       -
            -H "DPoP: <test-dpop-proof>" \

     

       283
       283
       -
            -d '{"name":"Test","hostedByDid":"did:plc:test"}'

     

       284
       284
       -
          ```

     

       285
       285
       -
       

     

       286
       286
       -
       2. **Phase 2 (Full Verification)**:

     

       287
       287
       -
          ```bash

     

       288
       288
       -
          # Use a real JWT from a PDS

     

       289
       289
       -
          export AUTH_SKIP_VERIFY=false

     

       290
       290
       -
          curl -X POST http://localhost:8081/xrpc/social.coves.community.create \

     

       291
       291
       -
            -H "Authorization: DPoP <real-jwt>" \

     

       292
       292
       -
            -H "DPoP: <real-dpop-proof>" \

     

       293
       293
       -
            -d '{"name":"Test","hostedByDid":"did:plc:test"}'

     

       294
       294
       -
          ```

     

       295
       295
       -
       

     

       296
       296
       -
       ## Error Responses

     

       297
       297
       -
       

     

       298
       298
       -
       ### 401 Unauthorized

     

       299
       299
       -
       

     

       300
       300
       -
       Missing or invalid token:

     

       301
       301
       -
       

     

       302
       302
       -
       ```json

     

       303
       303
       -
       {

     

       304
       304
       -
         "error": "AuthenticationRequired",

     

       305
       305
       -
         "message": "Missing Authorization header"

     

       306
       306
       -
       }

     

       307
       307
       -
       ```

     

       308
       308
       -
       

     

       309
       309
       -
       ```json

     

       310
       310
       -
       {

     

       311
       311
       -
         "error": "AuthenticationRequired",

     

       312
       312
       -
         "message": "Invalid or expired token"

     

       313
       313
       -
       }

     

       314
       314
       -
       ```

     

       315
       315
       -
       

     

       316
       316
       -
       ### Common Issues

     

       317
       317
       -
       

     

       318
       318
       -
       1. **Missing Authorization header** → Add `Authorization: DPoP <token>` and `DPoP: <proof>`

     

       319
       319
       -
       2. **Token expired** → Get a new token from PDS

     

       320
       320
       -
       3. **Invalid signature** → Ensure token is from a valid PDS

     

       321
       321
       -
       4. **JWKS fetch fails** → Check PDS availability and network connectivity

     

       322
       322
       -
       

     

       323
       323
       -
       ## Future Enhancements

     

       324
       324
       -
       

     

       325
       325
       -
       - [ ] DPoP nonce validation (server-managed nonce for additional replay protection)

     

       326
       326
       -
       - [ ] Scope-based authorization

     

       327
       327
       -
       - [ ] Audience claim validation

     

       328
       328
       -
       - [ ] Token revocation support

     

       329
       329
       -
       - [ ] Rate limiting per DID

     

       330
       330
       -
       - [ ] Metrics and monitoring

-52

internal/atproto/auth/combined_key_fetcher.go

···

       1
       1
       -
       package auth

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"fmt"

     

       6
       6
       -
       	"strings"

     

       7
       7
       -
       

     

       8
       8
       -
       	indigoIdentity "github.com/bluesky-social/indigo/atproto/identity"

     

       9
       9
       -
       )

     

       10
       10
       -
       

     

       11
       11
       -
       // CombinedKeyFetcher handles JWT public key fetching for both:

     

       12
       12
       -
       // - DID issuers (did:plc:, did:web:) → resolves via DID document

     

       13
       13
       -
       // - URL issuers (https://) → fetches via JWKS endpoint (legacy/fallback)

     

       14
       14
       -
       //

     

       15
       15
       -
       // For atproto service authentication, the issuer is typically the user's DID,

     

       16
       16
       -
       // and the signing key is published in their DID document.

     

       17
       17
       -
       type CombinedKeyFetcher struct {

     

       18
       18
       -
       	didFetcher  *DIDKeyFetcher

     

       19
       19
       -
       	jwksFetcher JWKSFetcher

     

       20
       20
       -
       }

     

       21
       21
       -
       

     

       22
       22
       -
       // NewCombinedKeyFetcher creates a key fetcher that supports both DID and URL issuers.

     

       23
       23
       -
       // Parameters:

     

       24
       24
       -
       //   - directory: Indigo's identity directory for DID resolution

     

       25
       25
       -
       //   - jwksFetcher: fallback JWKS fetcher for URL issuers (can be nil if not needed)

     

       26
       26
       -
       func NewCombinedKeyFetcher(directory indigoIdentity.Directory, jwksFetcher JWKSFetcher) *CombinedKeyFetcher {

     

       27
       27
       -
       	return &CombinedKeyFetcher{

     

       28
       28
       -
       		didFetcher:  NewDIDKeyFetcher(directory),

     

       29
       29
       -
       		jwksFetcher: jwksFetcher,

     

       30
       30
       -
       	}

     

       31
       31
       -
       }

     

       32
       32
       -
       

     

       33
       33
       -
       // FetchPublicKey fetches the public key for verifying a JWT.

     

       34
       34
       -
       // Routes to the appropriate fetcher based on issuer format:

     

       35
       35
       -
       // - DID (did:plc:, did:web:) → DIDKeyFetcher

     

       36
       36
       -
       // - URL (https://) → JWKSFetcher

     

       37
       37
       -
       func (f *CombinedKeyFetcher) FetchPublicKey(ctx context.Context, issuer, token string) (interface{}, error) {

     

       38
       38
       -
       	// Check if issuer is a DID

     

       39
       39
       -
       	if strings.HasPrefix(issuer, "did:") {

     

       40
       40
       -
       		return f.didFetcher.FetchPublicKey(ctx, issuer, token)

     

       41
       41
       -
       	}

     

       42
       42
       -
       

     

       43
       43
       -
       	// Check if issuer is a URL (https:// or http:// in dev)

     

       44
       44
       -
       	if strings.HasPrefix(issuer, "https://") || strings.HasPrefix(issuer, "http://") {

     

       45
       45
       -
       		if f.jwksFetcher == nil {

     

       46
       46
       -
       			return nil, fmt.Errorf("URL issuer %s requires JWKS fetcher, but none configured", issuer)

     

       47
       47
       -
       		}

     

       48
       48
       -
       		return f.jwksFetcher.FetchPublicKey(ctx, issuer, token)

     

       49
       49
       -
       	}

     

       50
       50
       -
       

     

       51
       51
       -
       	return nil, fmt.Errorf("unsupported issuer format: %s (expected DID or URL)", issuer)

     

       52
       52
       -
       }

-122

internal/atproto/auth/did_key_fetcher.go

···

       1
       1
       -
       package auth

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"crypto/ecdsa"

     

       6
       6
       -
       	"crypto/elliptic"

     

       7
       7
       -
       	"encoding/base64"

     

       8
       8
       -
       	"fmt"

     

       9
       9
       -
       	"math/big"

     

       10
       10
       -
       	"strings"

     

       11
       11
       -
       

     

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

     

       13
       13
       -
       	indigoIdentity "github.com/bluesky-social/indigo/atproto/identity"

     

       14
       14
       -
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       15
       15
       -
       )

     

       16
       16
       -
       

     

       17
       17
       -
       // DIDKeyFetcher fetches public keys from DID documents for JWT verification.

     

       18
       18
       -
       // This is the primary method for atproto service authentication, where:

     

       19
       19
       -
       // - The JWT issuer is the user's DID (e.g., did:plc:abc123)

     

       20
       20
       -
       // - The signing key is published in the user's DID document

     

       21
       21
       -
       // - Verification happens by resolving the DID and checking the signature

     

       22
       22
       -
       type DIDKeyFetcher struct {

     

       23
       23
       -
       	directory indigoIdentity.Directory

     

       24
       24
       -
       }

     

       25
       25
       -
       

     

       26
       26
       -
       // NewDIDKeyFetcher creates a new DID-based key fetcher.

     

       27
       27
       -
       func NewDIDKeyFetcher(directory indigoIdentity.Directory) *DIDKeyFetcher {

     

       28
       28
       -
       	return &DIDKeyFetcher{

     

       29
       29
       -
       		directory: directory,

     

       30
       30
       -
       	}

     

       31
       31
       -
       }

     

       32
       32
       -
       

     

       33
       33
       -
       // FetchPublicKey fetches the public key for verifying a JWT from the issuer's DID document.

     

       34
       34
       -
       // For DID issuers (did:plc: or did:web:), resolves the DID and extracts the signing key.

     

       35
       35
       -
       //

     

       36
       36
       -
       // Returns:

     

       37
       37
       -
       //   - indigoCrypto.PublicKey for secp256k1 (ES256K) keys - use indigo for verification

     

       38
       38
       -
       //   - *ecdsa.PublicKey for NIST curves (P-256, P-384, P-521) - compatible with golang-jwt

     

       39
       39
       -
       func (f *DIDKeyFetcher) FetchPublicKey(ctx context.Context, issuer, token string) (interface{}, error) {

     

       40
       40
       -
       	// Only handle DID issuers

     

       41
       41
       -
       	if !strings.HasPrefix(issuer, "did:") {

     

       42
       42
       -
       		return nil, fmt.Errorf("DIDKeyFetcher only handles DID issuers, got: %s", issuer)

     

       43
       43
       -
       	}

     

       44
       44
       -
       

     

       45
       45
       -
       	// Parse the DID

     

       46
       46
       -
       	did, err := syntax.ParseDID(issuer)

     

       47
       47
       -
       	if err != nil {

     

       48
       48
       -
       		return nil, fmt.Errorf("invalid DID format: %w", err)

     

       49
       49
       -
       	}

     

       50
       50
       -
       

     

       51
       51
       -
       	// Resolve the DID to get the identity (includes public keys)

     

       52
       52
       -
       	ident, err := f.directory.LookupDID(ctx, did)

     

       53
       53
       -
       	if err != nil {

     

       54
       54
       -
       		return nil, fmt.Errorf("failed to resolve DID %s: %w", issuer, err)

     

       55
       55
       -
       	}

     

       56
       56
       -
       

     

       57
       57
       -
       	// Get the atproto signing key from the DID document

     

       58
       58
       -
       	pubKey, err := ident.PublicKey()

     

       59
       59
       -
       	if err != nil {

     

       60
       60
       -
       		return nil, fmt.Errorf("failed to get public key from DID document: %w", err)

     

       61
       61
       -
       	}

     

       62
       62
       -
       

     

       63
       63
       -
       	// Convert to JWK format to check curve type

     

       64
       64
       -
       	jwk, err := pubKey.JWK()

     

       65
       65
       -
       	if err != nil {

     

       66
       66
       -
       		return nil, fmt.Errorf("failed to convert public key to JWK: %w", err)

     

       67
       67
       -
       	}

     

       68
       68
       -
       

     

       69
       69
       -
       	// For secp256k1 (ES256K), return indigo's PublicKey directly

     

       70
       70
       -
       	// since Go's crypto/ecdsa doesn't support this curve

     

       71
       71
       -
       	if jwk.Curve == "secp256k1" {

     

       72
       72
       -
       		return pubKey, nil

     

       73
       73
       -
       	}

     

       74
       74
       -
       

     

       75
       75
       -
       	// For NIST curves, convert to Go's ecdsa.PublicKey for golang-jwt compatibility

     

       76
       76
       -
       	return atcryptoJWKToECDSA(jwk)

     

       77
       77
       -
       }

     

       78
       78
       -
       

     

       79
       79
       -
       // atcryptoJWKToECDSA converts an indigoCrypto.JWK to a Go ecdsa.PublicKey.

     

       80
       80
       -
       // Note: secp256k1 is handled separately in FetchPublicKey by returning indigo's PublicKey directly.

     

       81
       81
       -
       func atcryptoJWKToECDSA(jwk *indigoCrypto.JWK) (*ecdsa.PublicKey, error) {

     

       82
       82
       -
       	if jwk.KeyType != "EC" {

     

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

     

       84
       84
       -
       	}

     

       85
       85
       -
       

     

       86
       86
       -
       	// Decode X and Y coordinates (base64url, no padding)

     

       87
       87
       -
       	xBytes, err := base64.RawURLEncoding.DecodeString(jwk.X)

     

       88
       88
       -
       	if err != nil {

     

       89
       89
       -
       		return nil, fmt.Errorf("invalid JWK X coordinate encoding: %w", err)

     

       90
       90
       -
       	}

     

       91
       91
       -
       	yBytes, err := base64.RawURLEncoding.DecodeString(jwk.Y)

     

       92
       92
       -
       	if err != nil {

     

       93
       93
       -
       		return nil, fmt.Errorf("invalid JWK Y coordinate encoding: %w", err)

     

       94
       94
       -
       	}

     

       95
       95
       -
       

     

       96
       96
       -
       	var ecCurve elliptic.Curve

     

       97
       97
       -
       	switch jwk.Curve {

     

       98
       98
       -
       	case "P-256":

     

       99
       99
       -
       		ecCurve = elliptic.P256()

     

       100
       100
       -
       	case "P-384":

     

       101
       101
       -
       		ecCurve = elliptic.P384()

     

       102
       102
       -
       	case "P-521":

     

       103
       103
       -
       		ecCurve = elliptic.P521()

     

       104
       104
       -
       	default:

     

       105
       105
       -
       		// secp256k1 should be handled before calling this function

     

       106
       106
       -
       		return nil, fmt.Errorf("unsupported JWK curve for Go ecdsa: %s (secp256k1 uses indigo)", jwk.Curve)

     

       107
       107
       -
       	}

     

       108
       108
       -
       

     

       109
       109
       -
       	// Create the public key

     

       110
       110
       -
       	pubKey := &ecdsa.PublicKey{

     

       111
       111
       -
       		Curve: ecCurve,

     

       112
       112
       -
       		X:     new(big.Int).SetBytes(xBytes),

     

       113
       113
       -
       		Y:     new(big.Int).SetBytes(yBytes),

     

       114
       114
       -
       	}

     

       115
       115
       -
       

     

       116
       116
       -
       	// Validate point is on curve

     

       117
       117
       -
       	if !ecCurve.IsOnCurve(pubKey.X, pubKey.Y) {

     

       118
       118
       -
       		return nil, fmt.Errorf("invalid public key: point not on curve")

     

       119
       119
       -
       	}

     

       120
       120
       -
       

     

       121
       121
       -
       	return pubKey, nil

     

       122
       122
       -
       }

-616

internal/atproto/auth/dpop.go

···

       1
       1
       -
       package auth

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"crypto/sha256"

     

       5
       5
       -
       	"encoding/base64"

     

       6
       6
       -
       	"encoding/json"

     

       7
       7
       -
       	"fmt"

     

       8
       8
       -
       	"strings"

     

       9
       9
       -
       	"sync"

     

       10
       10
       -
       	"time"

     

       11
       11
       -
       

     

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

     

       13
       13
       -
       	"github.com/golang-jwt/jwt/v5"

     

       14
       14
       -
       )

     

       15
       15
       -
       

     

       16
       16
       -
       // NonceCache provides replay protection for DPoP proofs by tracking seen jti values.

     

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

     

       18
       18
       -
       // Per RFC 9449 Section 11.1, servers SHOULD prevent replay attacks.

     

       19
       19
       -
       type NonceCache struct {

     

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

     

       21
       21
       -
       	stopCh  chan struct{}

     

       22
       22
       -
       	maxAge  time.Duration // How long to keep entries

     

       23
       23
       -
       	cleanup time.Duration // How often to clean up expired entries

     

       24
       24
       -
       	mu      sync.RWMutex

     

       25
       25
       -
       }

     

       26
       26
       -
       

     

       27
       27
       -
       // NewNonceCache creates a new nonce cache for DPoP replay protection.

     

       28
       28
       -
       // maxAge should match or exceed DPoPVerifier.MaxProofAge.

     

       29
       29
       -
       func NewNonceCache(maxAge time.Duration) *NonceCache {

     

       30
       30
       -
       	nc := &NonceCache{

     

       31
       31
       -
       		seen:    make(map[string]time.Time),

     

       32
       32
       -
       		maxAge:  maxAge,

     

       33
       33
       -
       		cleanup: maxAge / 2, // Clean up at half the max age

     

       34
       34
       -
       		stopCh:  make(chan struct{}),

     

       35
       35
       -
       	}

     

       36
       36
       -
       

     

       37
       37
       -
       	// Start background cleanup goroutine

     

       38
       38
       -
       	go nc.cleanupLoop()

     

       39
       39
       -
       

     

       40
       40
       -
       	return nc

     

       41
       41
       -
       }

     

       42
       42
       -
       

     

       43
       43
       -
       // CheckAndStore checks if a jti has been seen before and stores it if not.

     

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

     

       45
       45
       -
       func (nc *NonceCache) CheckAndStore(jti string) bool {

     

       46
       46
       -
       	nc.mu.Lock()

     

       47
       47
       -
       	defer nc.mu.Unlock()

     

       48
       48
       -
       

     

       49
       49
       -
       	now := time.Now()

     

       50
       50
       -
       	expiry := now.Add(nc.maxAge)

     

       51
       51
       -
       

     

       52
       52
       -
       	// Check if already seen

     

       53
       53
       -
       	if existingExpiry, seen := nc.seen[jti]; seen {

     

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

     

       55
       55
       -
       		if existingExpiry.After(now) {

     

       56
       56
       -
       			return false

     

       57
       57
       -
       		}

     

       58
       58
       -
       		// Expired entry - allow reuse and update expiry

     

       59
       59
       -
       	}

     

       60
       60
       -
       

     

       61
       61
       -
       	// Store the new jti

     

       62
       62
       -
       	nc.seen[jti] = expiry

     

       63
       63
       -
       	return true

     

       64
       64
       -
       }

     

       65
       65
       -
       

     

       66
       66
       -
       // cleanupLoop periodically removes expired entries from the cache

     

       67
       67
       -
       func (nc *NonceCache) cleanupLoop() {

     

       68
       68
       -
       	ticker := time.NewTicker(nc.cleanup)

     

       69
       69
       -
       	defer ticker.Stop()

     

       70
       70
       -
       

     

       71
       71
       -
       	for {

     

       72
       72
       -
       		select {

     

       73
       73
       -
       		case <-ticker.C:

     

       74
       74
       -
       			nc.cleanupExpired()

     

       75
       75
       -
       		case <-nc.stopCh:

     

       76
       76
       -
       			return

     

       77
       77
       -
       		}

     

       78
       78
       -
       	}

     

       79
       79
       -
       }

     

       80
       80
       -
       

     

       81
       81
       -
       // cleanupExpired removes expired entries from the cache

     

       82
       82
       -
       func (nc *NonceCache) cleanupExpired() {

     

       83
       83
       -
       	nc.mu.Lock()

     

       84
       84
       -
       	defer nc.mu.Unlock()

     

       85
       85
       -
       

     

       86
       86
       -
       	now := time.Now()

     

       87
       87
       -
       	for jti, expiry := range nc.seen {

     

       88
       88
       -
       		if expiry.Before(now) {

     

       89
       89
       -
       			delete(nc.seen, jti)

     

       90
       90
       -
       		}

     

       91
       91
       -
       	}

     

       92
       92
       -
       }

     

       93
       93
       -
       

     

       94
       94
       -
       // Stop stops the cleanup goroutine. Call this when done with the cache.

     

       95
       95
       -
       func (nc *NonceCache) Stop() {

     

       96
       96
       -
       	close(nc.stopCh)

     

       97
       97
       -
       }

     

       98
       98
       -
       

     

       99
       99
       -
       // Size returns the number of entries in the cache (for testing/monitoring)

     

       100
       100
       -
       func (nc *NonceCache) Size() int {

     

       101
       101
       -
       	nc.mu.RLock()

     

       102
       102
       -
       	defer nc.mu.RUnlock()

     

       103
       103
       -
       	return len(nc.seen)

     

       104
       104
       -
       }

     

       105
       105
       -
       

     

       106
       106
       -
       // DPoPClaims represents the claims in a DPoP proof JWT (RFC 9449)

     

       107
       107
       -
       type DPoPClaims struct {

     

       108
       108
       -
       	jwt.RegisteredClaims

     

       109
       109
       -
       

     

       110
       110
       -
       	// HTTP method of the request (e.g., "GET", "POST")

     

       111
       111
       -
       	HTTPMethod string `json:"htm"`

     

       112
       112
       -
       

     

       113
       113
       -
       	// HTTP URI of the request (without query and fragment parts)

     

       114
       114
       -
       	HTTPURI string `json:"htu"`

     

       115
       115
       -
       

     

       116
       116
       -
       	// Access token hash (optional, for token binding)

     

       117
       117
       -
       	AccessTokenHash string `json:"ath,omitempty"`

     

       118
       118
       -
       }

     

       119
       119
       -
       

     

       120
       120
       -
       // DPoPProof represents a parsed and verified DPoP proof

     

       121
       121
       -
       type DPoPProof struct {

     

       122
       122
       -
       	RawPublicJWK map[string]interface{}

     

       123
       123
       -
       	Claims       *DPoPClaims

     

       124
       124
       -
       	PublicKey    interface{} // *ecdsa.PublicKey or similar

     

       125
       125
       -
       	Thumbprint   string      // JWK thumbprint (base64url)

     

       126
       126
       -
       }

     

       127
       127
       -
       

     

       128
       128
       -
       // DPoPVerifier verifies DPoP proofs for OAuth token binding

     

       129
       129
       -
       type DPoPVerifier struct {

     

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

     

       131
       131
       -
       	ValidateNonce func(nonce string) bool

     

       132
       132
       -
       

     

       133
       133
       -
       	// NonceCache for replay protection (optional but recommended)

     

       134
       134
       -
       	// If nil, jti replay protection is disabled

     

       135
       135
       -
       	NonceCache *NonceCache

     

       136
       136
       -
       

     

       137
       137
       -
       	// Maximum allowed clock skew for timestamp validation

     

       138
       138
       -
       	MaxClockSkew time.Duration

     

       139
       139
       -
       

     

       140
       140
       -
       	// Maximum age of DPoP proof (prevents replay with old proofs)

     

       141
       141
       -
       	MaxProofAge time.Duration

     

       142
       142
       -
       }

     

       143
       143
       -
       

     

       144
       144
       -
       // NewDPoPVerifier creates a DPoP verifier with sensible defaults including replay protection

     

       145
       145
       -
       func NewDPoPVerifier() *DPoPVerifier {

     

       146
       146
       -
       	maxProofAge := 5 * time.Minute

     

       147
       147
       -
       	return &DPoPVerifier{

     

       148
       148
       -
       		MaxClockSkew: 30 * time.Second,

     

       149
       149
       -
       		MaxProofAge:  maxProofAge,

     

       150
       150
       -
       		NonceCache:   NewNonceCache(maxProofAge),

     

       151
       151
       -
       	}

     

       152
       152
       -
       }

     

       153
       153
       -
       

     

       154
       154
       -
       // NewDPoPVerifierWithoutReplayProtection creates a DPoP verifier without replay protection.

     

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

     

       156
       156
       -
       func NewDPoPVerifierWithoutReplayProtection() *DPoPVerifier {

     

       157
       157
       -
       	return &DPoPVerifier{

     

       158
       158
       -
       		MaxClockSkew: 30 * time.Second,

     

       159
       159
       -
       		MaxProofAge:  5 * time.Minute,

     

       160
       160
       -
       		NonceCache:   nil, // No replay protection

     

       161
       161
       -
       	}

     

       162
       162
       -
       }

     

       163
       163
       -
       

     

       164
       164
       -
       // Stop stops background goroutines. Call this when shutting down.

     

       165
       165
       -
       func (v *DPoPVerifier) Stop() {

     

       166
       166
       -
       	if v.NonceCache != nil {

     

       167
       167
       -
       		v.NonceCache.Stop()

     

       168
       168
       -
       	}

     

       169
       169
       -
       }

     

       170
       170
       -
       

     

       171
       171
       -
       // VerifyDPoPProof verifies a DPoP proof JWT and returns the parsed proof.

     

       172
       172
       -
       // This supports all atProto-compatible ECDSA algorithms including ES256K (secp256k1).

     

       173
       173
       -
       func (v *DPoPVerifier) VerifyDPoPProof(dpopProof, httpMethod, httpURI string) (*DPoPProof, error) {

     

       174
       174
       -
       	// Manually parse the JWT to support ES256K (which golang-jwt doesn't recognize)

     

       175
       175
       -
       	header, claims, err := parseJWTHeaderAndClaims(dpopProof)

     

       176
       176
       -
       	if err != nil {

     

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

     

       178
       178
       -
       	}

     

       179
       179
       -
       

     

       180
       180
       -
       	// Extract and validate the typ header

     

       181
       181
       -
       	typ, ok := header["typ"].(string)

     

       182
       182
       -
       	if !ok || typ != "dpop+jwt" {

     

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

     

       184
       184
       -
       	}

     

       185
       185
       -
       

     

       186
       186
       -
       	alg, ok := header["alg"].(string)

     

       187
       187
       -
       	if !ok {

     

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

     

       189
       189
       -
       	}

     

       190
       190
       -
       

     

       191
       191
       -
       	// Extract the JWK from the header first (needed for algorithm-curve validation)

     

       192
       192
       -
       	jwkRaw, ok := header["jwk"]

     

       193
       193
       -
       	if !ok {

     

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

     

       195
       195
       -
       	}

     

       196
       196
       -
       

     

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

     

       198
       198
       -
       	if !ok {

     

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

     

       200
       200
       -
       	}

     

       201
       201
       -
       

     

       202
       202
       -
       	// Validate the algorithm is supported and matches the JWK curve

     

       203
       203
       -
       	// This is critical for security - prevents algorithm confusion attacks

     

       204
       204
       -
       	if err := validateAlgorithmCurveBinding(alg, jwkMap); err != nil {

     

       205
       205
       -
       		return nil, fmt.Errorf("invalid DPoP proof: %w", err)

     

       206
       206
       -
       	}

     

       207
       207
       -
       

     

       208
       208
       -
       	// Parse the public key using indigo's crypto package

     

       209
       209
       -
       	// This supports all atProto curves including secp256k1 (ES256K)

     

       210
       210
       -
       	publicKey, err := parseJWKToIndigoPublicKey(jwkMap)

     

       211
       211
       -
       	if err != nil {

     

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

     

       213
       213
       -
       	}

     

       214
       214
       -
       

     

       215
       215
       -
       	// Calculate the JWK thumbprint

     

       216
       216
       -
       	thumbprint, err := CalculateJWKThumbprint(jwkMap)

     

       217
       217
       -
       	if err != nil {

     

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

     

       219
       219
       -
       	}

     

       220
       220
       -
       

     

       221
       221
       -
       	// Verify the signature using indigo's crypto package

     

       222
       222
       -
       	// This works for all ECDSA algorithms including ES256K

     

       223
       223
       -
       	if err := verifyJWTSignatureWithIndigo(dpopProof, publicKey); err != nil {

     

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

     

       225
       225
       -
       	}

     

       226
       226
       -
       

     

       227
       227
       -
       	// Validate the claims

     

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

     

       229
       229
       -
       		return nil, err

     

       230
       230
       -
       	}

     

       231
       231
       -
       

     

       232
       232
       -
       	return &DPoPProof{

     

       233
       233
       -
       		Claims:       claims,

     

       234
       234
       -
       		PublicKey:    publicKey,

     

       235
       235
       -
       		Thumbprint:   thumbprint,

     

       236
       236
       -
       		RawPublicJWK: jwkMap,

     

       237
       237
       -
       	}, nil

     

       238
       238
       -
       }

     

       239
       239
       -
       

     

       240
       240
       -
       // validateDPoPClaims validates the DPoP proof claims

     

       241
       241
       -
       func (v *DPoPVerifier) validateDPoPClaims(claims *DPoPClaims, expectedMethod, expectedURI string) error {

     

       242
       242
       -
       	// Validate jti (unique identifier) is present

     

       243
       243
       -
       	if claims.ID == "" {

     

       244
       244
       -
       		return fmt.Errorf("DPoP proof missing jti claim")

     

       245
       245
       -
       	}

     

       246
       246
       -
       

     

       247
       247
       -
       	// Validate htm (HTTP method)

     

       248
       248
       -
       	if !strings.EqualFold(claims.HTTPMethod, expectedMethod) {

     

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

     

       250
       250
       -
       	}

     

       251
       251
       -
       

     

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

     

       253
       253
       -
       	expectedURIBase := stripQueryFragment(expectedURI)

     

       254
       254
       -
       	claimURIBase := stripQueryFragment(claims.HTTPURI)

     

       255
       255
       -
       	if expectedURIBase != claimURIBase {

     

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

     

       257
       257
       -
       	}

     

       258
       258
       -
       

     

       259
       259
       -
       	// Validate iat (issued at) is present and recent

     

       260
       260
       -
       	if claims.IssuedAt == nil {

     

       261
       261
       -
       		return fmt.Errorf("DPoP proof missing iat claim")

     

       262
       262
       -
       	}

     

       263
       263
       -
       

     

       264
       264
       -
       	now := time.Now()

     

       265
       265
       -
       	iat := claims.IssuedAt.Time

     

       266
       266
       -
       

     

       267
       267
       -
       	// Check clock skew (not too far in the future)

     

       268
       268
       -
       	if iat.After(now.Add(v.MaxClockSkew)) {

     

       269
       269
       -
       		return fmt.Errorf("DPoP proof iat is in the future")

     

       270
       270
       -
       	}

     

       271
       271
       -
       

     

       272
       272
       -
       	// Check proof age (not too old)

     

       273
       273
       -
       	if now.Sub(iat) > v.MaxProofAge {

     

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

     

       275
       275
       -
       	}

     

       276
       276
       -
       

     

       277
       277
       -
       	// SECURITY: Validate exp claim if present (RFC standard JWT validation)

     

       278
       278
       -
       	// While DPoP proofs typically use iat + MaxProofAge, if exp is included it must be honored

     

       279
       279
       -
       	if claims.ExpiresAt != nil {

     

       280
       280
       -
       		expWithSkew := claims.ExpiresAt.Time.Add(v.MaxClockSkew)

     

       281
       281
       -
       		if now.After(expWithSkew) {

     

       282
       282
       -
       			return fmt.Errorf("DPoP proof expired at %v", claims.ExpiresAt.Time)

     

       283
       283
       -
       		}

     

       284
       284
       -
       	}

     

       285
       285
       -
       

     

       286
       286
       -
       	// SECURITY: Validate nbf claim if present (RFC standard JWT validation)

     

       287
       287
       -
       	if claims.NotBefore != nil {

     

       288
       288
       -
       		nbfWithSkew := claims.NotBefore.Time.Add(-v.MaxClockSkew)

     

       289
       289
       -
       		if now.Before(nbfWithSkew) {

     

       290
       290
       -
       			return fmt.Errorf("DPoP proof not valid before %v", claims.NotBefore.Time)

     

       291
       291
       -
       		}

     

       292
       292
       -
       	}

     

       293
       293
       -
       

     

       294
       294
       -
       	// SECURITY: Check for replay attack using jti

     

       295
       295
       -
       	// Per RFC 9449 Section 11.1, servers SHOULD prevent replay attacks

     

       296
       296
       -
       	if v.NonceCache != nil {

     

       297
       297
       -
       		if !v.NonceCache.CheckAndStore(claims.ID) {

     

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

     

       299
       299
       -
       		}

     

       300
       300
       -
       	}

     

       301
       301
       -
       

     

       302
       302
       -
       	return nil

     

       303
       303
       -
       }

     

       304
       304
       -
       

     

       305
       305
       -
       // VerifyTokenBinding verifies that the DPoP proof binds to the access token

     

       306
       306
       -
       // by comparing the proof's thumbprint to the token's cnf.jkt claim

     

       307
       307
       -
       func (v *DPoPVerifier) VerifyTokenBinding(proof *DPoPProof, expectedThumbprint string) error {

     

       308
       308
       -
       	if proof.Thumbprint != expectedThumbprint {

     

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

     

       310
       310
       -
       			expectedThumbprint, proof.Thumbprint)

     

       311
       311
       -
       	}

     

       312
       312
       -
       	return nil

     

       313
       313
       -
       }

     

       314
       314
       -
       

     

       315
       315
       -
       // VerifyAccessTokenHash verifies the DPoP proof's ath (access token hash) claim

     

       316
       316
       -
       // matches the SHA-256 hash of the presented access token.

     

       317
       317
       -
       // Per RFC 9449 section 4.2, if ath is present, the RS MUST verify it.

     

       318
       318
       -
       func (v *DPoPVerifier) VerifyAccessTokenHash(proof *DPoPProof, accessToken string) error {

     

       319
       319
       -
       	// If ath claim is not present, that's acceptable per RFC 9449

     

       320
       320
       -
       	// (ath is only required when the RS mandates it)

     

       321
       321
       -
       	if proof.Claims.AccessTokenHash == "" {

     

       322
       322
       -
       		return nil

     

       323
       323
       -
       	}

     

       324
       324
       -
       

     

       325
       325
       -
       	// Calculate the expected ath: base64url(SHA-256(access_token))

     

       326
       326
       -
       	hash := sha256.Sum256([]byte(accessToken))

     

       327
       327
       -
       	expectedAth := base64.RawURLEncoding.EncodeToString(hash[:])

     

       328
       328
       -
       

     

       329
       329
       -
       	if proof.Claims.AccessTokenHash != expectedAth {

     

       330
       330
       -
       		return fmt.Errorf("DPoP proof ath mismatch: proof bound to different access token")

     

       331
       331
       -
       	}

     

       332
       332
       -
       

     

       333
       333
       -
       	return nil

     

       334
       334
       -
       }

     

       335
       335
       -
       

     

       336
       336
       -
       // CalculateJWKThumbprint calculates the JWK thumbprint per RFC 7638

     

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

     

       338
       338
       -
       func CalculateJWKThumbprint(jwk map[string]interface{}) (string, error) {

     

       339
       339
       -
       	kty, ok := jwk["kty"].(string)

     

       340
       340
       -
       	if !ok {

     

       341
       341
       -
       		return "", fmt.Errorf("JWK missing kty")

     

       342
       342
       -
       	}

     

       343
       343
       -
       

     

       344
       344
       -
       	// Build the canonical JWK representation based on key type

     

       345
       345
       -
       	// Per RFC 7638, only specific members are included, in lexicographic order

     

       346
       346
       -
       	var canonical map[string]string

     

       347
       347
       -
       

     

       348
       348
       -
       	switch kty {

     

       349
       349
       -
       	case "EC":

     

       350
       350
       -
       		crv, ok := jwk["crv"].(string)

     

       351
       351
       -
       		if !ok {

     

       352
       352
       -
       			return "", fmt.Errorf("EC JWK missing crv")

     

       353
       353
       -
       		}

     

       354
       354
       -
       		x, ok := jwk["x"].(string)

     

       355
       355
       -
       		if !ok {

     

       356
       356
       -
       			return "", fmt.Errorf("EC JWK missing x")

     

       357
       357
       -
       		}

     

       358
       358
       -
       		y, ok := jwk["y"].(string)

     

       359
       359
       -
       		if !ok {

     

       360
       360
       -
       			return "", fmt.Errorf("EC JWK missing y")

     

       361
       361
       -
       		}

     

       362
       362
       -
       		// Lexicographic order: crv, kty, x, y

     

       363
       363
       -
       		canonical = map[string]string{

     

       364
       364
       -
       			"crv": crv,

     

       365
       365
       -
       			"kty": kty,

     

       366
       366
       -
       			"x":   x,

     

       367
       367
       -
       			"y":   y,

     

       368
       368
       -
       		}

     

       369
       369
       -
       	case "RSA":

     

       370
       370
       -
       		e, ok := jwk["e"].(string)

     

       371
       371
       -
       		if !ok {

     

       372
       372
       -
       			return "", fmt.Errorf("RSA JWK missing e")

     

       373
       373
       -
       		}

     

       374
       374
       -
       		n, ok := jwk["n"].(string)

     

       375
       375
       -
       		if !ok {

     

       376
       376
       -
       			return "", fmt.Errorf("RSA JWK missing n")

     

       377
       377
       -
       		}

     

       378
       378
       -
       		// Lexicographic order: e, kty, n

     

       379
       379
       -
       		canonical = map[string]string{

     

       380
       380
       -
       			"e":   e,

     

       381
       381
       -
       			"kty": kty,

     

       382
       382
       -
       			"n":   n,

     

       383
       383
       -
       		}

     

       384
       384
       -
       	case "OKP":

     

       385
       385
       -
       		crv, ok := jwk["crv"].(string)

     

       386
       386
       -
       		if !ok {

     

       387
       387
       -
       			return "", fmt.Errorf("OKP JWK missing crv")

     

       388
       388
       -
       		}

     

       389
       389
       -
       		x, ok := jwk["x"].(string)

     

       390
       390
       -
       		if !ok {

     

       391
       391
       -
       			return "", fmt.Errorf("OKP JWK missing x")

     

       392
       392
       -
       		}

     

       393
       393
       -
       		// Lexicographic order: crv, kty, x

     

       394
       394
       -
       		canonical = map[string]string{

     

       395
       395
       -
       			"crv": crv,

     

       396
       396
       -
       			"kty": kty,

     

       397
       397
       -
       			"x":   x,

     

       398
       398
       -
       		}

     

       399
       399
       -
       	default:

     

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

     

       401
       401
       -
       	}

     

       402
       402
       -
       

     

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

     

       404
       404
       -
       	canonicalJSON, err := json.Marshal(canonical)

     

       405
       405
       -
       	if err != nil {

     

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

     

       407
       407
       -
       	}

     

       408
       408
       -
       

     

       409
       409
       -
       	// SHA-256 hash

     

       410
       410
       -
       	hash := sha256.Sum256(canonicalJSON)

     

       411
       411
       -
       

     

       412
       412
       -
       	// Base64url encode (no padding)

     

       413
       413
       -
       	thumbprint := base64.RawURLEncoding.EncodeToString(hash[:])

     

       414
       414
       -
       

     

       415
       415
       -
       	return thumbprint, nil

     

       416
       416
       -
       }

     

       417
       417
       -
       

     

       418
       418
       -
       // validateAlgorithmCurveBinding validates that the JWT algorithm matches the JWK curve.

     

       419
       419
       -
       // This is critical for security - an attacker could claim alg: "ES256K" but provide

     

       420
       420
       -
       // a P-256 key, potentially bypassing algorithm binding requirements.

     

       421
       421
       -
       func validateAlgorithmCurveBinding(alg string, jwkMap map[string]interface{}) error {

     

       422
       422
       -
       	kty, ok := jwkMap["kty"].(string)

     

       423
       423
       -
       	if !ok {

     

       424
       424
       -
       		return fmt.Errorf("JWK missing kty")

     

       425
       425
       -
       	}

     

       426
       426
       -
       

     

       427
       427
       -
       	// ECDSA algorithms require EC key type

     

       428
       428
       -
       	switch alg {

     

       429
       429
       -
       	case "ES256K", "ES256", "ES384", "ES512":

     

       430
       430
       -
       		if kty != "EC" {

     

       431
       431
       -
       			return fmt.Errorf("algorithm %s requires EC key type, got %s", alg, kty)

     

       432
       432
       -
       		}

     

       433
       433
       -
       	case "RS256", "RS384", "RS512", "PS256", "PS384", "PS512":

     

       434
       434
       -
       		return fmt.Errorf("RSA algorithms not yet supported for DPoP: %s", alg)

     

       435
       435
       -
       	default:

     

       436
       436
       -
       		return fmt.Errorf("unsupported DPoP algorithm: %s", alg)

     

       437
       437
       -
       	}

     

       438
       438
       -
       

     

       439
       439
       -
       	// Validate curve matches algorithm

     

       440
       440
       -
       	crv, ok := jwkMap["crv"].(string)

     

       441
       441
       -
       	if !ok {

     

       442
       442
       -
       		return fmt.Errorf("EC JWK missing crv")

     

       443
       443
       -
       	}

     

       444
       444
       -
       

     

       445
       445
       -
       	var expectedCurve string

     

       446
       446
       -
       	switch alg {

     

       447
       447
       -
       	case "ES256K":

     

       448
       448
       -
       		expectedCurve = "secp256k1"

     

       449
       449
       -
       	case "ES256":

     

       450
       450
       -
       		expectedCurve = "P-256"

     

       451
       451
       -
       	case "ES384":

     

       452
       452
       -
       		expectedCurve = "P-384"

     

       453
       453
       -
       	case "ES512":

     

       454
       454
       -
       		expectedCurve = "P-521"

     

       455
       455
       -
       	}

     

       456
       456
       -
       

     

       457
       457
       -
       	if crv != expectedCurve {

     

       458
       458
       -
       		return fmt.Errorf("algorithm %s requires curve %s, got %s", alg, expectedCurve, crv)

     

       459
       459
       -
       	}

     

       460
       460
       -
       

     

       461
       461
       -
       	return nil

     

       462
       462
       -
       }

     

       463
       463
       -
       

     

       464
       464
       -
       // parseJWKToIndigoPublicKey parses a JWK map to an indigo PublicKey.

     

       465
       465
       -
       // This returns indigo's PublicKey interface which supports all atProto curves

     

       466
       466
       -
       // including secp256k1 (ES256K), P-256 (ES256), P-384 (ES384), and P-521 (ES512).

     

       467
       467
       -
       func parseJWKToIndigoPublicKey(jwkMap map[string]interface{}) (indigoCrypto.PublicKey, error) {

     

       468
       468
       -
       	// Convert map to JSON bytes for indigo's parser

     

       469
       469
       -
       	jwkBytes, err := json.Marshal(jwkMap)

     

       470
       470
       -
       	if err != nil {

     

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

     

       472
       472
       -
       	}

     

       473
       473
       -
       

     

       474
       474
       -
       	// Parse with indigo's crypto package - this supports all atProto curves

     

       475
       475
       -
       	// including secp256k1 (ES256K) which Go's crypto/elliptic doesn't support

     

       476
       476
       -
       	pubKey, err := indigoCrypto.ParsePublicJWKBytes(jwkBytes)

     

       477
       477
       -
       	if err != nil {

     

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

     

       479
       479
       -
       	}

     

       480
       480
       -
       

     

       481
       481
       -
       	return pubKey, nil

     

       482
       482
       -
       }

     

       483
       483
       -
       

     

       484
       484
       -
       // parseJWTHeaderAndClaims manually parses a JWT's header and claims without using golang-jwt.

     

       485
       485
       -
       // This is necessary to support ES256K (secp256k1) which golang-jwt doesn't recognize.

     

       486
       486
       -
       func parseJWTHeaderAndClaims(tokenString string) (map[string]interface{}, *DPoPClaims, error) {

     

       487
       487
       -
       	parts := strings.Split(tokenString, ".")

     

       488
       488
       -
       	if len(parts) != 3 {

     

       489
       489
       -
       		return nil, nil, fmt.Errorf("invalid JWT format: expected 3 parts, got %d", len(parts))

     

       490
       490
       -
       	}

     

       491
       491
       -
       

     

       492
       492
       -
       	// Decode header

     

       493
       493
       -
       	headerBytes, err := base64.RawURLEncoding.DecodeString(parts[0])

     

       494
       494
       -
       	if err != nil {

     

       495
       495
       -
       		return nil, nil, fmt.Errorf("failed to decode JWT header: %w", err)

     

       496
       496
       -
       	}

     

       497
       497
       -
       

     

       498
       498
       -
       	var header map[string]interface{}

     

       499
       499
       -
       	if err := json.Unmarshal(headerBytes, &header); err != nil {

     

       500
       500
       -
       		return nil, nil, fmt.Errorf("failed to parse JWT header: %w", err)

     

       501
       501
       -
       	}

     

       502
       502
       -
       

     

       503
       503
       -
       	// Decode claims

     

       504
       504
       -
       	claimsBytes, err := base64.RawURLEncoding.DecodeString(parts[1])

     

       505
       505
       -
       	if err != nil {

     

       506
       506
       -
       		return nil, nil, fmt.Errorf("failed to decode JWT claims: %w", err)

     

       507
       507
       -
       	}

     

       508
       508
       -
       

     

       509
       509
       -
       	// Parse into raw map first to extract standard claims

     

       510
       510
       -
       	var rawClaims map[string]interface{}

     

       511
       511
       -
       	if err := json.Unmarshal(claimsBytes, &rawClaims); err != nil {

     

       512
       512
       -
       		return nil, nil, fmt.Errorf("failed to parse JWT claims: %w", err)

     

       513
       513
       -
       	}

     

       514
       514
       -
       

     

       515
       515
       -
       	// Build DPoPClaims struct

     

       516
       516
       -
       	claims := &DPoPClaims{}

     

       517
       517
       -
       

     

       518
       518
       -
       	// Extract jti

     

       519
       519
       -
       	if jti, ok := rawClaims["jti"].(string); ok {

     

       520
       520
       -
       		claims.ID = jti

     

       521
       521
       -
       	}

     

       522
       522
       -
       

     

       523
       523
       -
       	// Extract iat (issued at)

     

       524
       524
       -
       	if iat, ok := rawClaims["iat"].(float64); ok {

     

       525
       525
       -
       		t := time.Unix(int64(iat), 0)

     

       526
       526
       -
       		claims.IssuedAt = jwt.NewNumericDate(t)

     

       527
       527
       -
       	}

     

       528
       528
       -
       

     

       529
       529
       -
       	// Extract exp (expiration) if present

     

       530
       530
       -
       	if exp, ok := rawClaims["exp"].(float64); ok {

     

       531
       531
       -
       		t := time.Unix(int64(exp), 0)

     

       532
       532
       -
       		claims.ExpiresAt = jwt.NewNumericDate(t)

     

       533
       533
       -
       	}

     

       534
       534
       -
       

     

       535
       535
       -
       	// Extract nbf (not before) if present

     

       536
       536
       -
       	if nbf, ok := rawClaims["nbf"].(float64); ok {

     

       537
       537
       -
       		t := time.Unix(int64(nbf), 0)

     

       538
       538
       -
       		claims.NotBefore = jwt.NewNumericDate(t)

     

       539
       539
       -
       	}

     

       540
       540
       -
       

     

       541
       541
       -
       	// Extract htm (HTTP method)

     

       542
       542
       -
       	if htm, ok := rawClaims["htm"].(string); ok {

     

       543
       543
       -
       		claims.HTTPMethod = htm

     

       544
       544
       -
       	}

     

       545
       545
       -
       

     

       546
       546
       -
       	// Extract htu (HTTP URI)

     

       547
       547
       -
       	if htu, ok := rawClaims["htu"].(string); ok {

     

       548
       548
       -
       		claims.HTTPURI = htu

     

       549
       549
       -
       	}

     

       550
       550
       -
       

     

       551
       551
       -
       	// Extract ath (access token hash) if present

     

       552
       552
       -
       	if ath, ok := rawClaims["ath"].(string); ok {

     

       553
       553
       -
       		claims.AccessTokenHash = ath

     

       554
       554
       -
       	}

     

       555
       555
       -
       

     

       556
       556
       -
       	return header, claims, nil

     

       557
       557
       -
       }

     

       558
       558
       -
       

     

       559
       559
       -
       // verifyJWTSignatureWithIndigo verifies a JWT signature using indigo's crypto package.

     

       560
       560
       -
       // This is used instead of golang-jwt for algorithms not supported by golang-jwt (like ES256K).

     

       561
       561
       -
       // It parses the JWT, extracts the signing input and signature, and uses indigo's

     

       562
       562
       -
       // PublicKey.HashAndVerifyLenient() for verification.

     

       563
       563
       -
       //

     

       564
       564
       -
       // JWT format: header.payload.signature (all base64url-encoded)

     

       565
       565
       -
       // Signature is verified over the raw bytes of "header.payload"

     

       566
       566
       -
       // (indigo's HashAndVerifyLenient handles SHA-256 hashing internally)

     

       567
       567
       -
       func verifyJWTSignatureWithIndigo(tokenString string, pubKey indigoCrypto.PublicKey) error {

     

       568
       568
       -
       	// Split the JWT into parts

     

       569
       569
       -
       	parts := strings.Split(tokenString, ".")

     

       570
       570
       -
       	if len(parts) != 3 {

     

       571
       571
       -
       		return fmt.Errorf("invalid JWT format: expected 3 parts, got %d", len(parts))

     

       572
       572
       -
       	}

     

       573
       573
       -
       

     

       574
       574
       -
       	// The signing input is "header.payload" (without decoding)

     

       575
       575
       -
       	signingInput := parts[0] + "." + parts[1]

     

       576
       576
       -
       

     

       577
       577
       -
       	// Decode the signature from base64url

     

       578
       578
       -
       	signature, err := base64.RawURLEncoding.DecodeString(parts[2])

     

       579
       579
       -
       	if err != nil {

     

       580
       580
       -
       		return fmt.Errorf("failed to decode JWT signature: %w", err)

     

       581
       581
       -
       	}

     

       582
       582
       -
       

     

       583
       583
       -
       	// Use indigo's verification - HashAndVerifyLenient handles hashing internally

     

       584
       584
       -
       	// and accepts both low-S and high-S signatures for maximum compatibility

     

       585
       585
       -
       	err = pubKey.HashAndVerifyLenient([]byte(signingInput), signature)

     

       586
       586
       -
       	if err != nil {

     

       587
       587
       -
       		return fmt.Errorf("signature verification failed: %w", err)

     

       588
       588
       -
       	}

     

       589
       589
       -
       

     

       590
       590
       -
       	return nil

     

       591
       591
       -
       }

     

       592
       592
       -
       

     

       593
       593
       -
       // stripQueryFragment removes query and fragment from a URI

     

       594
       594
       -
       func stripQueryFragment(uri string) string {

     

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

     

       596
       596
       -
       		uri = uri[:idx]

     

       597
       597
       -
       	}

     

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

     

       599
       599
       -
       		uri = uri[:idx]

     

       600
       600
       -
       	}

     

       601
       601
       -
       	return uri

     

       602
       602
       -
       }

     

       603
       603
       -
       

     

       604
       604
       -
       // ExtractCnfJkt extracts the cnf.jkt (confirmation key thumbprint) from JWT claims

     

       605
       605
       -
       func ExtractCnfJkt(claims *Claims) (string, error) {

     

       606
       606
       -
       	if claims.Confirmation == nil {

     

       607
       607
       -
       		return "", fmt.Errorf("token missing cnf claim (no DPoP binding)")

     

       608
       608
       -
       	}

     

       609
       609
       -
       

     

       610
       610
       -
       	jkt, ok := claims.Confirmation["jkt"].(string)

     

       611
       611
       -
       	if !ok || jkt == "" {

     

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

     

       613
       613
       -
       	}

     

       614
       614
       -
       

     

       615
       615
       -
       	return jkt, nil

     

       616
       616
       -
       }

-1308

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
       -
       	indigoCrypto "github.com/bluesky-social/indigo/atproto/atcrypto"

     

       15
       15
       -
       	"github.com/golang-jwt/jwt/v5"

     

       16
       16
       -
       	"github.com/google/uuid"

     

       17
       17
       -
       )

     

       18
       18
       -
       

     

       19
       19
       -
       // === Test Helpers ===

     

       20
       20
       -
       

     

       21
       21
       -
       // testECKey holds a test ES256 key pair

     

       22
       22
       -
       type testECKey struct {

     

       23
       23
       -
       	privateKey *ecdsa.PrivateKey

     

       24
       24
       -
       	publicKey  *ecdsa.PublicKey

     

       25
       25
       -
       	jwk        map[string]interface{}

     

       26
       26
       -
       	thumbprint string

     

       27
       27
       -
       }

     

       28
       28
       -
       

     

       29
       29
       -
       // generateTestES256Key generates a test ES256 key pair and JWK

     

       30
       30
       -
       func generateTestES256Key(t *testing.T) *testECKey {

     

       31
       31
       -
       	t.Helper()

     

       32
       32
       -
       

     

       33
       33
       -
       	privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)

     

       34
       34
       -
       	if err != nil {

     

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

     

       36
       36
       -
       	}

     

       37
       37
       -
       

     

       38
       38
       -
       	// Encode public key coordinates as base64url

     

       39
       39
       -
       	xBytes := privateKey.PublicKey.X.Bytes()

     

       40
       40
       -
       	yBytes := privateKey.PublicKey.Y.Bytes()

     

       41
       41
       -
       

     

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

     

       43
       43
       -
       	xBytes = padTo32Bytes(xBytes)

     

       44
       44
       -
       	yBytes = padTo32Bytes(yBytes)

     

       45
       45
       -
       

     

       46
       46
       -
       	x := base64.RawURLEncoding.EncodeToString(xBytes)

     

       47
       47
       -
       	y := base64.RawURLEncoding.EncodeToString(yBytes)

     

       48
       48
       -
       

     

       49
       49
       -
       	jwk := map[string]interface{}{

     

       50
       50
       -
       		"kty": "EC",

     

       51
       51
       -
       		"crv": "P-256",

     

       52
       52
       -
       		"x":   x,

     

       53
       53
       -
       		"y":   y,

     

       54
       54
       -
       	}

     

       55
       55
       -
       

     

       56
       56
       -
       	// Calculate thumbprint

     

       57
       57
       -
       	thumbprint, err := CalculateJWKThumbprint(jwk)

     

       58
       58
       -
       	if err != nil {

     

       59
       59
       -
       		t.Fatalf("Failed to calculate thumbprint: %v", err)

     

       60
       60
       -
       	}

     

       61
       61
       -
       

     

       62
       62
       -
       	return &testECKey{

     

       63
       63
       -
       		privateKey: privateKey,

     

       64
       64
       -
       		publicKey:  &privateKey.PublicKey,

     

       65
       65
       -
       		jwk:        jwk,

     

       66
       66
       -
       		thumbprint: thumbprint,

     

       67
       67
       -
       	}

     

       68
       68
       -
       }

     

       69
       69
       -
       

     

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

     

       71
       71
       -
       func padTo32Bytes(b []byte) []byte {

     

       72
       72
       -
       	if len(b) >= 32 {

     

       73
       73
       -
       		return b

     

       74
       74
       -
       	}

     

       75
       75
       -
       	padded := make([]byte, 32)

     

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

     

       77
       77
       -
       	return padded

     

       78
       78
       -
       }

     

       79
       79
       -
       

     

       80
       80
       -
       // createDPoPProof creates a DPoP proof JWT for testing

     

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

     

       82
       82
       -
       	t.Helper()

     

       83
       83
       -
       

     

       84
       84
       -
       	claims := &DPoPClaims{

     

       85
       85
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       86
       86
       -
       			ID:       jti,

     

       87
       87
       -
       			IssuedAt: jwt.NewNumericDate(iat),

     

       88
       88
       -
       		},

     

       89
       89
       -
       		HTTPMethod: method,

     

       90
       90
       -
       		HTTPURI:    uri,

     

       91
       91
       -
       	}

     

       92
       92
       -
       

     

       93
       93
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       94
       94
       -
       	token.Header["typ"] = "dpop+jwt"

     

       95
       95
       -
       	token.Header["jwk"] = key.jwk

     

       96
       96
       -
       

     

       97
       97
       -
       	tokenString, err := token.SignedString(key.privateKey)

     

       98
       98
       -
       	if err != nil {

     

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

     

       100
       100
       -
       	}

     

       101
       101
       -
       

     

       102
       102
       -
       	return tokenString

     

       103
       103
       -
       }

     

       104
       104
       -
       

     

       105
       105
       -
       // === JWK Thumbprint Tests (RFC 7638) ===

     

       106
       106
       -
       

     

       107
       107
       -
       func TestCalculateJWKThumbprint_EC_P256(t *testing.T) {

     

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

     

       109
       109
       -
       	jwk := map[string]interface{}{

     

       110
       110
       -
       		"kty": "EC",

     

       111
       111
       -
       		"crv": "P-256",

     

       112
       112
       -
       		"x":   "WKn-ZIGevcwGIyyrzFoZNBdaq9_TsqzGl96oc0CWuis",

     

       113
       113
       -
       		"y":   "y77t-RvAHRKTsSGdIYUfweuOvwrvDD-Q3Hv5J0fSKbE",

     

       114
       114
       -
       	}

     

       115
       115
       -
       

     

       116
       116
       -
       	thumbprint, err := CalculateJWKThumbprint(jwk)

     

       117
       117
       -
       	if err != nil {

     

       118
       118
       -
       		t.Fatalf("CalculateJWKThumbprint failed: %v", err)

     

       119
       119
       -
       	}

     

       120
       120
       -
       

     

       121
       121
       -
       	if thumbprint == "" {

     

       122
       122
       -
       		t.Error("Expected non-empty thumbprint")

     

       123
       123
       -
       	}

     

       124
       124
       -
       

     

       125
       125
       -
       	// Verify it's valid base64url

     

       126
       126
       -
       	_, err = base64.RawURLEncoding.DecodeString(thumbprint)

     

       127
       127
       -
       	if err != nil {

     

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

     

       129
       129
       -
       	}

     

       130
       130
       -
       

     

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

     

       132
       132
       -
       	if len(thumbprint) != 43 {

     

       133
       133
       -
       		t.Errorf("Expected thumbprint length 43, got %d", len(thumbprint))

     

       134
       134
       -
       	}

     

       135
       135
       -
       }

     

       136
       136
       -
       

     

       137
       137
       -
       func TestCalculateJWKThumbprint_Deterministic(t *testing.T) {

     

       138
       138
       -
       	// Same key should produce same thumbprint

     

       139
       139
       -
       	jwk := map[string]interface{}{

     

       140
       140
       -
       		"kty": "EC",

     

       141
       141
       -
       		"crv": "P-256",

     

       142
       142
       -
       		"x":   "test-x-coordinate",

     

       143
       143
       -
       		"y":   "test-y-coordinate",

     

       144
       144
       -
       	}

     

       145
       145
       -
       

     

       146
       146
       -
       	thumbprint1, err := CalculateJWKThumbprint(jwk)

     

       147
       147
       -
       	if err != nil {

     

       148
       148
       -
       		t.Fatalf("First CalculateJWKThumbprint failed: %v", err)

     

       149
       149
       -
       	}

     

       150
       150
       -
       

     

       151
       151
       -
       	thumbprint2, err := CalculateJWKThumbprint(jwk)

     

       152
       152
       -
       	if err != nil {

     

       153
       153
       -
       		t.Fatalf("Second CalculateJWKThumbprint failed: %v", err)

     

       154
       154
       -
       	}

     

       155
       155
       -
       

     

       156
       156
       -
       	if thumbprint1 != thumbprint2 {

     

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

     

       158
       158
       -
       	}

     

       159
       159
       -
       }

     

       160
       160
       -
       

     

       161
       161
       -
       func TestCalculateJWKThumbprint_DifferentKeys(t *testing.T) {

     

       162
       162
       -
       	// Different keys should produce different thumbprints

     

       163
       163
       -
       	jwk1 := map[string]interface{}{

     

       164
       164
       -
       		"kty": "EC",

     

       165
       165
       -
       		"crv": "P-256",

     

       166
       166
       -
       		"x":   "coordinate-x-1",

     

       167
       167
       -
       		"y":   "coordinate-y-1",

     

       168
       168
       -
       	}

     

       169
       169
       -
       

     

       170
       170
       -
       	jwk2 := map[string]interface{}{

     

       171
       171
       -
       		"kty": "EC",

     

       172
       172
       -
       		"crv": "P-256",

     

       173
       173
       -
       		"x":   "coordinate-x-2",

     

       174
       174
       -
       		"y":   "coordinate-y-2",

     

       175
       175
       -
       	}

     

       176
       176
       -
       

     

       177
       177
       -
       	thumbprint1, err := CalculateJWKThumbprint(jwk1)

     

       178
       178
       -
       	if err != nil {

     

       179
       179
       -
       		t.Fatalf("First CalculateJWKThumbprint failed: %v", err)

     

       180
       180
       -
       	}

     

       181
       181
       -
       

     

       182
       182
       -
       	thumbprint2, err := CalculateJWKThumbprint(jwk2)

     

       183
       183
       -
       	if err != nil {

     

       184
       184
       -
       		t.Fatalf("Second CalculateJWKThumbprint failed: %v", err)

     

       185
       185
       -
       	}

     

       186
       186
       -
       

     

       187
       187
       -
       	if thumbprint1 == thumbprint2 {

     

       188
       188
       -
       		t.Error("Different keys produced same thumbprint (collision)")

     

       189
       189
       -
       	}

     

       190
       190
       -
       }

     

       191
       191
       -
       

     

       192
       192
       -
       func TestCalculateJWKThumbprint_MissingKty(t *testing.T) {

     

       193
       193
       -
       	jwk := map[string]interface{}{

     

       194
       194
       -
       		"crv": "P-256",

     

       195
       195
       -
       		"x":   "test-x",

     

       196
       196
       -
       		"y":   "test-y",

     

       197
       197
       -
       	}

     

       198
       198
       -
       

     

       199
       199
       -
       	_, err := CalculateJWKThumbprint(jwk)

     

       200
       200
       -
       	if err == nil {

     

       201
       201
       -
       		t.Error("Expected error for missing kty, got nil")

     

       202
       202
       -
       	}

     

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

     

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

     

       205
       205
       -
       	}

     

       206
       206
       -
       }

     

       207
       207
       -
       

     

       208
       208
       -
       func TestCalculateJWKThumbprint_EC_MissingCrv(t *testing.T) {

     

       209
       209
       -
       	jwk := map[string]interface{}{

     

       210
       210
       -
       		"kty": "EC",

     

       211
       211
       -
       		"x":   "test-x",

     

       212
       212
       -
       		"y":   "test-y",

     

       213
       213
       -
       	}

     

       214
       214
       -
       

     

       215
       215
       -
       	_, err := CalculateJWKThumbprint(jwk)

     

       216
       216
       -
       	if err == nil {

     

       217
       217
       -
       		t.Error("Expected error for missing crv, got nil")

     

       218
       218
       -
       	}

     

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

     

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

     

       221
       221
       -
       	}

     

       222
       222
       -
       }

     

       223
       223
       -
       

     

       224
       224
       -
       func TestCalculateJWKThumbprint_EC_MissingX(t *testing.T) {

     

       225
       225
       -
       	jwk := map[string]interface{}{

     

       226
       226
       -
       		"kty": "EC",

     

       227
       227
       -
       		"crv": "P-256",

     

       228
       228
       -
       		"y":   "test-y",

     

       229
       229
       -
       	}

     

       230
       230
       -
       

     

       231
       231
       -
       	_, err := CalculateJWKThumbprint(jwk)

     

       232
       232
       -
       	if err == nil {

     

       233
       233
       -
       		t.Error("Expected error for missing x, got nil")

     

       234
       234
       -
       	}

     

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

     

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

     

       237
       237
       -
       	}

     

       238
       238
       -
       }

     

       239
       239
       -
       

     

       240
       240
       -
       func TestCalculateJWKThumbprint_EC_MissingY(t *testing.T) {

     

       241
       241
       -
       	jwk := map[string]interface{}{

     

       242
       242
       -
       		"kty": "EC",

     

       243
       243
       -
       		"crv": "P-256",

     

       244
       244
       -
       		"x":   "test-x",

     

       245
       245
       -
       	}

     

       246
       246
       -
       

     

       247
       247
       -
       	_, err := CalculateJWKThumbprint(jwk)

     

       248
       248
       -
       	if err == nil {

     

       249
       249
       -
       		t.Error("Expected error for missing y, got nil")

     

       250
       250
       -
       	}

     

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

     

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

     

       253
       253
       -
       	}

     

       254
       254
       -
       }

     

       255
       255
       -
       

     

       256
       256
       -
       func TestCalculateJWKThumbprint_RSA(t *testing.T) {

     

       257
       257
       -
       	// Test RSA key thumbprint calculation

     

       258
       258
       -
       	jwk := map[string]interface{}{

     

       259
       259
       -
       		"kty": "RSA",

     

       260
       260
       -
       		"e":   "AQAB",

     

       261
       261
       -
       		"n":   "test-modulus",

     

       262
       262
       -
       	}

     

       263
       263
       -
       

     

       264
       264
       -
       	thumbprint, err := CalculateJWKThumbprint(jwk)

     

       265
       265
       -
       	if err != nil {

     

       266
       266
       -
       		t.Fatalf("CalculateJWKThumbprint failed for RSA: %v", err)

     

       267
       267
       -
       	}

     

       268
       268
       -
       

     

       269
       269
       -
       	if thumbprint == "" {

     

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

     

       271
       271
       -
       	}

     

       272
       272
       -
       }

     

       273
       273
       -
       

     

       274
       274
       -
       func TestCalculateJWKThumbprint_OKP(t *testing.T) {

     

       275
       275
       -
       	// Test OKP (Octet Key Pair) thumbprint calculation

     

       276
       276
       -
       	jwk := map[string]interface{}{

     

       277
       277
       -
       		"kty": "OKP",

     

       278
       278
       -
       		"crv": "Ed25519",

     

       279
       279
       -
       		"x":   "test-x-coordinate",

     

       280
       280
       -
       	}

     

       281
       281
       -
       

     

       282
       282
       -
       	thumbprint, err := CalculateJWKThumbprint(jwk)

     

       283
       283
       -
       	if err != nil {

     

       284
       284
       -
       		t.Fatalf("CalculateJWKThumbprint failed for OKP: %v", err)

     

       285
       285
       -
       	}

     

       286
       286
       -
       

     

       287
       287
       -
       	if thumbprint == "" {

     

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

     

       289
       289
       -
       	}

     

       290
       290
       -
       }

     

       291
       291
       -
       

     

       292
       292
       -
       func TestCalculateJWKThumbprint_UnsupportedKeyType(t *testing.T) {

     

       293
       293
       -
       	jwk := map[string]interface{}{

     

       294
       294
       -
       		"kty": "UNKNOWN",

     

       295
       295
       -
       	}

     

       296
       296
       -
       

     

       297
       297
       -
       	_, err := CalculateJWKThumbprint(jwk)

     

       298
       298
       -
       	if err == nil {

     

       299
       299
       -
       		t.Error("Expected error for unsupported key type, got nil")

     

       300
       300
       -
       	}

     

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

     

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

     

       303
       303
       -
       	}

     

       304
       304
       -
       }

     

       305
       305
       -
       

     

       306
       306
       -
       func TestCalculateJWKThumbprint_CanonicalJSON(t *testing.T) {

     

       307
       307
       -
       	// RFC 7638 requires lexicographic ordering of keys in canonical JSON

     

       308
       308
       -
       	// This test verifies that the canonical JSON is correctly ordered

     

       309
       309
       -
       

     

       310
       310
       -
       	jwk := map[string]interface{}{

     

       311
       311
       -
       		"kty": "EC",

     

       312
       312
       -
       		"crv": "P-256",

     

       313
       313
       -
       		"x":   "x-coord",

     

       314
       314
       -
       		"y":   "y-coord",

     

       315
       315
       -
       	}

     

       316
       316
       -
       

     

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

     

       318
       318
       -
       	// (lexicographically ordered: crv, kty, x, y)

     

       319
       319
       -
       

     

       320
       320
       -
       	canonical := map[string]string{

     

       321
       321
       -
       		"crv": "P-256",

     

       322
       322
       -
       		"kty": "EC",

     

       323
       323
       -
       		"x":   "x-coord",

     

       324
       324
       -
       		"y":   "y-coord",

     

       325
       325
       -
       	}

     

       326
       326
       -
       

     

       327
       327
       -
       	canonicalJSON, err := json.Marshal(canonical)

     

       328
       328
       -
       	if err != nil {

     

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

     

       330
       330
       -
       	}

     

       331
       331
       -
       

     

       332
       332
       -
       	expectedHash := sha256.Sum256(canonicalJSON)

     

       333
       333
       -
       	expectedThumbprint := base64.RawURLEncoding.EncodeToString(expectedHash[:])

     

       334
       334
       -
       

     

       335
       335
       -
       	actualThumbprint, err := CalculateJWKThumbprint(jwk)

     

       336
       336
       -
       	if err != nil {

     

       337
       337
       -
       		t.Fatalf("CalculateJWKThumbprint failed: %v", err)

     

       338
       338
       -
       	}

     

       339
       339
       -
       

     

       340
       340
       -
       	if actualThumbprint != expectedThumbprint {

     

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

     

       342
       342
       -
       			expectedThumbprint, actualThumbprint)

     

       343
       343
       -
       	}

     

       344
       344
       -
       }

     

       345
       345
       -
       

     

       346
       346
       -
       // === DPoP Proof Verification Tests ===

     

       347
       347
       -
       

     

       348
       348
       -
       func TestVerifyDPoPProof_Valid(t *testing.T) {

     

       349
       349
       -
       	verifier := NewDPoPVerifier()

     

       350
       350
       -
       	key := generateTestES256Key(t)

     

       351
       351
       -
       

     

       352
       352
       -
       	method := "POST"

     

       353
       353
       -
       	uri := "https://api.example.com/resource"

     

       354
       354
       -
       	iat := time.Now()

     

       355
       355
       -
       	jti := uuid.New().String()

     

       356
       356
       -
       

     

       357
       357
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       358
       358
       -
       

     

       359
       359
       -
       	result, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       360
       360
       -
       	if err != nil {

     

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

     

       362
       362
       -
       	}

     

       363
       363
       -
       

     

       364
       364
       -
       	if result == nil {

     

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

     

       366
       366
       -
       	}

     

       367
       367
       -
       

     

       368
       368
       -
       	if result.Claims.HTTPMethod != method {

     

       369
       369
       -
       		t.Errorf("Expected method %s, got %s", method, result.Claims.HTTPMethod)

     

       370
       370
       -
       	}

     

       371
       371
       -
       

     

       372
       372
       -
       	if result.Claims.HTTPURI != uri {

     

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

     

       374
       374
       -
       	}

     

       375
       375
       -
       

     

       376
       376
       -
       	if result.Claims.ID != jti {

     

       377
       377
       -
       		t.Errorf("Expected jti %s, got %s", jti, result.Claims.ID)

     

       378
       378
       -
       	}

     

       379
       379
       -
       

     

       380
       380
       -
       	if result.Thumbprint != key.thumbprint {

     

       381
       381
       -
       		t.Errorf("Expected thumbprint %s, got %s", key.thumbprint, result.Thumbprint)

     

       382
       382
       -
       	}

     

       383
       383
       -
       }

     

       384
       384
       -
       

     

       385
       385
       -
       func TestVerifyDPoPProof_InvalidSignature(t *testing.T) {

     

       386
       386
       -
       	verifier := NewDPoPVerifier()

     

       387
       387
       -
       	key := generateTestES256Key(t)

     

       388
       388
       -
       	wrongKey := generateTestES256Key(t)

     

       389
       389
       -
       

     

       390
       390
       -
       	method := "POST"

     

       391
       391
       -
       	uri := "https://api.example.com/resource"

     

       392
       392
       -
       	iat := time.Now()

     

       393
       393
       -
       	jti := uuid.New().String()

     

       394
       394
       -
       

     

       395
       395
       -
       	// Create proof with one key

     

       396
       396
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       397
       397
       -
       

     

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

     

       399
       399
       -
       	parts := splitJWT(proof)

     

       400
       400
       -
       	header := parseJWTHeader(t, parts[0])

     

       401
       401
       -
       	header["jwk"] = wrongKey.jwk

     

       402
       402
       -
       	modifiedHeader := encodeJSON(t, header)

     

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

     

       404
       404
       -
       

     

       405
       405
       -
       	_, err := verifier.VerifyDPoPProof(tamperedProof, method, uri)

     

       406
       406
       -
       	if err == nil {

     

       407
       407
       -
       		t.Error("Expected error for invalid signature, got nil")

     

       408
       408
       -
       	}

     

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

     

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

     

       411
       411
       -
       	}

     

       412
       412
       -
       }

     

       413
       413
       -
       

     

       414
       414
       -
       func TestVerifyDPoPProof_WrongHTTPMethod(t *testing.T) {

     

       415
       415
       -
       	verifier := NewDPoPVerifier()

     

       416
       416
       -
       	key := generateTestES256Key(t)

     

       417
       417
       -
       

     

       418
       418
       -
       	method := "POST"

     

       419
       419
       -
       	wrongMethod := "GET"

     

       420
       420
       -
       	uri := "https://api.example.com/resource"

     

       421
       421
       -
       	iat := time.Now()

     

       422
       422
       -
       	jti := uuid.New().String()

     

       423
       423
       -
       

     

       424
       424
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       425
       425
       -
       

     

       426
       426
       -
       	_, err := verifier.VerifyDPoPProof(proof, wrongMethod, uri)

     

       427
       427
       -
       	if err == nil {

     

       428
       428
       -
       		t.Error("Expected error for HTTP method mismatch, got nil")

     

       429
       429
       -
       	}

     

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

     

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

     

       432
       432
       -
       	}

     

       433
       433
       -
       }

     

       434
       434
       -
       

     

       435
       435
       -
       func TestVerifyDPoPProof_WrongURI(t *testing.T) {

     

       436
       436
       -
       	verifier := NewDPoPVerifier()

     

       437
       437
       -
       	key := generateTestES256Key(t)

     

       438
       438
       -
       

     

       439
       439
       -
       	method := "POST"

     

       440
       440
       -
       	uri := "https://api.example.com/resource"

     

       441
       441
       -
       	wrongURI := "https://api.example.com/different"

     

       442
       442
       -
       	iat := time.Now()

     

       443
       443
       -
       	jti := uuid.New().String()

     

       444
       444
       -
       

     

       445
       445
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       446
       446
       -
       

     

       447
       447
       -
       	_, err := verifier.VerifyDPoPProof(proof, method, wrongURI)

     

       448
       448
       -
       	if err == nil {

     

       449
       449
       -
       		t.Error("Expected error for URI mismatch, got nil")

     

       450
       450
       -
       	}

     

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

     

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

     

       453
       453
       -
       	}

     

       454
       454
       -
       }

     

       455
       455
       -
       

     

       456
       456
       -
       func TestVerifyDPoPProof_URIWithQuery(t *testing.T) {

     

       457
       457
       -
       	// URI comparison should strip query and fragment

     

       458
       458
       -
       	verifier := NewDPoPVerifier()

     

       459
       459
       -
       	key := generateTestES256Key(t)

     

       460
       460
       -
       

     

       461
       461
       -
       	method := "POST"

     

       462
       462
       -
       	baseURI := "https://api.example.com/resource"

     

       463
       463
       -
       	uriWithQuery := baseURI + "?param=value"

     

       464
       464
       -
       	iat := time.Now()

     

       465
       465
       -
       	jti := uuid.New().String()

     

       466
       466
       -
       

     

       467
       467
       -
       	proof := createDPoPProof(t, key, method, baseURI, iat, jti)

     

       468
       468
       -
       

     

       469
       469
       -
       	// Should succeed because query is stripped

     

       470
       470
       -
       	_, err := verifier.VerifyDPoPProof(proof, method, uriWithQuery)

     

       471
       471
       -
       	if err != nil {

     

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

     

       473
       473
       -
       	}

     

       474
       474
       -
       }

     

       475
       475
       -
       

     

       476
       476
       -
       func TestVerifyDPoPProof_URIWithFragment(t *testing.T) {

     

       477
       477
       -
       	// URI comparison should strip query and fragment

     

       478
       478
       -
       	verifier := NewDPoPVerifier()

     

       479
       479
       -
       	key := generateTestES256Key(t)

     

       480
       480
       -
       

     

       481
       481
       -
       	method := "POST"

     

       482
       482
       -
       	baseURI := "https://api.example.com/resource"

     

       483
       483
       -
       	uriWithFragment := baseURI + "#section"

     

       484
       484
       -
       	iat := time.Now()

     

       485
       485
       -
       	jti := uuid.New().String()

     

       486
       486
       -
       

     

       487
       487
       -
       	proof := createDPoPProof(t, key, method, baseURI, iat, jti)

     

       488
       488
       -
       

     

       489
       489
       -
       	// Should succeed because fragment is stripped

     

       490
       490
       -
       	_, err := verifier.VerifyDPoPProof(proof, method, uriWithFragment)

     

       491
       491
       -
       	if err != nil {

     

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

     

       493
       493
       -
       	}

     

       494
       494
       -
       }

     

       495
       495
       -
       

     

       496
       496
       -
       func TestVerifyDPoPProof_ExpiredProof(t *testing.T) {

     

       497
       497
       -
       	verifier := NewDPoPVerifier()

     

       498
       498
       -
       	key := generateTestES256Key(t)

     

       499
       499
       -
       

     

       500
       500
       -
       	method := "POST"

     

       501
       501
       -
       	uri := "https://api.example.com/resource"

     

       502
       502
       -
       	// Proof issued 10 minutes ago (exceeds default MaxProofAge of 5 minutes)

     

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

     

       504
       504
       -
       	jti := uuid.New().String()

     

       505
       505
       -
       

     

       506
       506
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       507
       507
       -
       

     

       508
       508
       -
       	_, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       509
       509
       -
       	if err == nil {

     

       510
       510
       -
       		t.Error("Expected error for expired proof, got nil")

     

       511
       511
       -
       	}

     

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

     

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

     

       514
       514
       -
       	}

     

       515
       515
       -
       }

     

       516
       516
       -
       

     

       517
       517
       -
       func TestVerifyDPoPProof_FutureProof(t *testing.T) {

     

       518
       518
       -
       	verifier := NewDPoPVerifier()

     

       519
       519
       -
       	key := generateTestES256Key(t)

     

       520
       520
       -
       

     

       521
       521
       -
       	method := "POST"

     

       522
       522
       -
       	uri := "https://api.example.com/resource"

     

       523
       523
       -
       	// Proof issued 1 minute in the future (exceeds MaxClockSkew)

     

       524
       524
       -
       	iat := time.Now().Add(1 * time.Minute)

     

       525
       525
       -
       	jti := uuid.New().String()

     

       526
       526
       -
       

     

       527
       527
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       528
       528
       -
       

     

       529
       529
       -
       	_, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       530
       530
       -
       	if err == nil {

     

       531
       531
       -
       		t.Error("Expected error for future proof, got nil")

     

       532
       532
       -
       	}

     

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

     

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

     

       535
       535
       -
       	}

     

       536
       536
       -
       }

     

       537
       537
       -
       

     

       538
       538
       -
       func TestVerifyDPoPProof_WithinClockSkew(t *testing.T) {

     

       539
       539
       -
       	verifier := NewDPoPVerifier()

     

       540
       540
       -
       	key := generateTestES256Key(t)

     

       541
       541
       -
       

     

       542
       542
       -
       	method := "POST"

     

       543
       543
       -
       	uri := "https://api.example.com/resource"

     

       544
       544
       -
       	// Proof issued 15 seconds in the future (within MaxClockSkew of 30s)

     

       545
       545
       -
       	iat := time.Now().Add(15 * time.Second)

     

       546
       546
       -
       	jti := uuid.New().String()

     

       547
       547
       -
       

     

       548
       548
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       549
       549
       -
       

     

       550
       550
       -
       	_, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       551
       551
       -
       	if err != nil {

     

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

     

       553
       553
       -
       	}

     

       554
       554
       -
       }

     

       555
       555
       -
       

     

       556
       556
       -
       func TestVerifyDPoPProof_MissingJti(t *testing.T) {

     

       557
       557
       -
       	verifier := NewDPoPVerifier()

     

       558
       558
       -
       	key := generateTestES256Key(t)

     

       559
       559
       -
       

     

       560
       560
       -
       	method := "POST"

     

       561
       561
       -
       	uri := "https://api.example.com/resource"

     

       562
       562
       -
       	iat := time.Now()

     

       563
       563
       -
       

     

       564
       564
       -
       	claims := &DPoPClaims{

     

       565
       565
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       566
       566
       -
       			// No ID (jti)

     

       567
       567
       -
       			IssuedAt: jwt.NewNumericDate(iat),

     

       568
       568
       -
       		},

     

       569
       569
       -
       		HTTPMethod: method,

     

       570
       570
       -
       		HTTPURI:    uri,

     

       571
       571
       -
       	}

     

       572
       572
       -
       

     

       573
       573
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       574
       574
       -
       	token.Header["typ"] = "dpop+jwt"

     

       575
       575
       -
       	token.Header["jwk"] = key.jwk

     

       576
       576
       -
       

     

       577
       577
       -
       	proof, err := token.SignedString(key.privateKey)

     

       578
       578
       -
       	if err != nil {

     

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

     

       580
       580
       -
       	}

     

       581
       581
       -
       

     

       582
       582
       -
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       583
       583
       -
       	if err == nil {

     

       584
       584
       -
       		t.Error("Expected error for missing jti, got nil")

     

       585
       585
       -
       	}

     

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

     

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

     

       588
       588
       -
       	}

     

       589
       589
       -
       }

     

       590
       590
       -
       

     

       591
       591
       -
       func TestVerifyDPoPProof_MissingTypHeader(t *testing.T) {

     

       592
       592
       -
       	verifier := NewDPoPVerifier()

     

       593
       593
       -
       	key := generateTestES256Key(t)

     

       594
       594
       -
       

     

       595
       595
       -
       	method := "POST"

     

       596
       596
       -
       	uri := "https://api.example.com/resource"

     

       597
       597
       -
       	iat := time.Now()

     

       598
       598
       -
       	jti := uuid.New().String()

     

       599
       599
       -
       

     

       600
       600
       -
       	claims := &DPoPClaims{

     

       601
       601
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       602
       602
       -
       			ID:       jti,

     

       603
       603
       -
       			IssuedAt: jwt.NewNumericDate(iat),

     

       604
       604
       -
       		},

     

       605
       605
       -
       		HTTPMethod: method,

     

       606
       606
       -
       		HTTPURI:    uri,

     

       607
       607
       -
       	}

     

       608
       608
       -
       

     

       609
       609
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       610
       610
       -
       	// Don't set typ header

     

       611
       611
       -
       	token.Header["jwk"] = key.jwk

     

       612
       612
       -
       

     

       613
       613
       -
       	proof, err := token.SignedString(key.privateKey)

     

       614
       614
       -
       	if err != nil {

     

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

     

       616
       616
       -
       	}

     

       617
       617
       -
       

     

       618
       618
       -
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       619
       619
       -
       	if err == nil {

     

       620
       620
       -
       		t.Error("Expected error for missing typ header, got nil")

     

       621
       621
       -
       	}

     

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

     

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

     

       624
       624
       -
       	}

     

       625
       625
       -
       }

     

       626
       626
       -
       

     

       627
       627
       -
       func TestVerifyDPoPProof_WrongTypHeader(t *testing.T) {

     

       628
       628
       -
       	verifier := NewDPoPVerifier()

     

       629
       629
       -
       	key := generateTestES256Key(t)

     

       630
       630
       -
       

     

       631
       631
       -
       	method := "POST"

     

       632
       632
       -
       	uri := "https://api.example.com/resource"

     

       633
       633
       -
       	iat := time.Now()

     

       634
       634
       -
       	jti := uuid.New().String()

     

       635
       635
       -
       

     

       636
       636
       -
       	claims := &DPoPClaims{

     

       637
       637
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       638
       638
       -
       			ID:       jti,

     

       639
       639
       -
       			IssuedAt: jwt.NewNumericDate(iat),

     

       640
       640
       -
       		},

     

       641
       641
       -
       		HTTPMethod: method,

     

       642
       642
       -
       		HTTPURI:    uri,

     

       643
       643
       -
       	}

     

       644
       644
       -
       

     

       645
       645
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       646
       646
       -
       	token.Header["typ"] = "JWT" // Wrong typ

     

       647
       647
       -
       	token.Header["jwk"] = key.jwk

     

       648
       648
       -
       

     

       649
       649
       -
       	proof, err := token.SignedString(key.privateKey)

     

       650
       650
       -
       	if err != nil {

     

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

     

       652
       652
       -
       	}

     

       653
       653
       -
       

     

       654
       654
       -
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       655
       655
       -
       	if err == nil {

     

       656
       656
       -
       		t.Error("Expected error for wrong typ header, got nil")

     

       657
       657
       -
       	}

     

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

     

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

     

       660
       660
       -
       	}

     

       661
       661
       -
       }

     

       662
       662
       -
       

     

       663
       663
       -
       func TestVerifyDPoPProof_MissingJWK(t *testing.T) {

     

       664
       664
       -
       	verifier := NewDPoPVerifier()

     

       665
       665
       -
       	key := generateTestES256Key(t)

     

       666
       666
       -
       

     

       667
       667
       -
       	method := "POST"

     

       668
       668
       -
       	uri := "https://api.example.com/resource"

     

       669
       669
       -
       	iat := time.Now()

     

       670
       670
       -
       	jti := uuid.New().String()

     

       671
       671
       -
       

     

       672
       672
       -
       	claims := &DPoPClaims{

     

       673
       673
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       674
       674
       -
       			ID:       jti,

     

       675
       675
       -
       			IssuedAt: jwt.NewNumericDate(iat),

     

       676
       676
       -
       		},

     

       677
       677
       -
       		HTTPMethod: method,

     

       678
       678
       -
       		HTTPURI:    uri,

     

       679
       679
       -
       	}

     

       680
       680
       -
       

     

       681
       681
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       682
       682
       -
       	token.Header["typ"] = "dpop+jwt"

     

       683
       683
       -
       	// Don't include JWK

     

       684
       684
       -
       

     

       685
       685
       -
       	proof, err := token.SignedString(key.privateKey)

     

       686
       686
       -
       	if err != nil {

     

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

     

       688
       688
       -
       	}

     

       689
       689
       -
       

     

       690
       690
       -
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       691
       691
       -
       	if err == nil {

     

       692
       692
       -
       		t.Error("Expected error for missing jwk header, got nil")

     

       693
       693
       -
       	}

     

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

     

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

     

       696
       696
       -
       	}

     

       697
       697
       -
       }

     

       698
       698
       -
       

     

       699
       699
       -
       func TestVerifyDPoPProof_CustomTimeSettings(t *testing.T) {

     

       700
       700
       -
       	verifier := &DPoPVerifier{

     

       701
       701
       -
       		MaxClockSkew: 1 * time.Minute,

     

       702
       702
       -
       		MaxProofAge:  10 * time.Minute,

     

       703
       703
       -
       	}

     

       704
       704
       -
       	key := generateTestES256Key(t)

     

       705
       705
       -
       

     

       706
       706
       -
       	method := "POST"

     

       707
       707
       -
       	uri := "https://api.example.com/resource"

     

       708
       708
       -
       	// Proof issued 50 seconds in the future (within custom MaxClockSkew)

     

       709
       709
       -
       	iat := time.Now().Add(50 * time.Second)

     

       710
       710
       -
       	jti := uuid.New().String()

     

       711
       711
       -
       

     

       712
       712
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       713
       713
       -
       

     

       714
       714
       -
       	_, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       715
       715
       -
       	if err != nil {

     

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

     

       717
       717
       -
       	}

     

       718
       718
       -
       }

     

       719
       719
       -
       

     

       720
       720
       -
       func TestVerifyDPoPProof_HTTPMethodCaseInsensitive(t *testing.T) {

     

       721
       721
       -
       	// HTTP method comparison should be case-insensitive per spec

     

       722
       722
       -
       	verifier := NewDPoPVerifier()

     

       723
       723
       -
       	key := generateTestES256Key(t)

     

       724
       724
       -
       

     

       725
       725
       -
       	method := "post"

     

       726
       726
       -
       	uri := "https://api.example.com/resource"

     

       727
       727
       -
       	iat := time.Now()

     

       728
       728
       -
       	jti := uuid.New().String()

     

       729
       729
       -
       

     

       730
       730
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       731
       731
       -
       

     

       732
       732
       -
       	// Verify with uppercase method

     

       733
       733
       -
       	_, err := verifier.VerifyDPoPProof(proof, "POST", uri)

     

       734
       734
       -
       	if err != nil {

     

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

     

       736
       736
       -
       	}

     

       737
       737
       -
       }

     

       738
       738
       -
       

     

       739
       739
       -
       // === Token Binding Verification Tests ===

     

       740
       740
       -
       

     

       741
       741
       -
       func TestVerifyTokenBinding_Matching(t *testing.T) {

     

       742
       742
       -
       	verifier := NewDPoPVerifier()

     

       743
       743
       -
       	key := generateTestES256Key(t)

     

       744
       744
       -
       

     

       745
       745
       -
       	method := "POST"

     

       746
       746
       -
       	uri := "https://api.example.com/resource"

     

       747
       747
       -
       	iat := time.Now()

     

       748
       748
       -
       	jti := uuid.New().String()

     

       749
       749
       -
       

     

       750
       750
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       751
       751
       -
       

     

       752
       752
       -
       	result, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       753
       753
       -
       	if err != nil {

     

       754
       754
       -
       		t.Fatalf("VerifyDPoPProof failed: %v", err)

     

       755
       755
       -
       	}

     

       756
       756
       -
       

     

       757
       757
       -
       	// Verify token binding with matching thumbprint

     

       758
       758
       -
       	err = verifier.VerifyTokenBinding(result, key.thumbprint)

     

       759
       759
       -
       	if err != nil {

     

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

     

       761
       761
       -
       	}

     

       762
       762
       -
       }

     

       763
       763
       -
       

     

       764
       764
       -
       func TestVerifyTokenBinding_Mismatch(t *testing.T) {

     

       765
       765
       -
       	verifier := NewDPoPVerifier()

     

       766
       766
       -
       	key := generateTestES256Key(t)

     

       767
       767
       -
       	wrongKey := generateTestES256Key(t)

     

       768
       768
       -
       

     

       769
       769
       -
       	method := "POST"

     

       770
       770
       -
       	uri := "https://api.example.com/resource"

     

       771
       771
       -
       	iat := time.Now()

     

       772
       772
       -
       	jti := uuid.New().String()

     

       773
       773
       -
       

     

       774
       774
       -
       	proof := createDPoPProof(t, key, method, uri, iat, jti)

     

       775
       775
       -
       

     

       776
       776
       -
       	result, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       777
       777
       -
       	if err != nil {

     

       778
       778
       -
       		t.Fatalf("VerifyDPoPProof failed: %v", err)

     

       779
       779
       -
       	}

     

       780
       780
       -
       

     

       781
       781
       -
       	// Verify token binding with wrong thumbprint

     

       782
       782
       -
       	err = verifier.VerifyTokenBinding(result, wrongKey.thumbprint)

     

       783
       783
       -
       	if err == nil {

     

       784
       784
       -
       		t.Error("Expected error for thumbprint mismatch, got nil")

     

       785
       785
       -
       	}

     

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

     

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

     

       788
       788
       -
       	}

     

       789
       789
       -
       }

     

       790
       790
       -
       

     

       791
       791
       -
       // === ExtractCnfJkt Tests ===

     

       792
       792
       -
       

     

       793
       793
       -
       func TestExtractCnfJkt_Valid(t *testing.T) {

     

       794
       794
       -
       	expectedJkt := "test-thumbprint-123"

     

       795
       795
       -
       	claims := &Claims{

     

       796
       796
       -
       		Confirmation: map[string]interface{}{

     

       797
       797
       -
       			"jkt": expectedJkt,

     

       798
       798
       -
       		},

     

       799
       799
       -
       	}

     

       800
       800
       -
       

     

       801
       801
       -
       	jkt, err := ExtractCnfJkt(claims)

     

       802
       802
       -
       	if err != nil {

     

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

     

       804
       804
       -
       	}

     

       805
       805
       -
       

     

       806
       806
       -
       	if jkt != expectedJkt {

     

       807
       807
       -
       		t.Errorf("Expected jkt %s, got %s", expectedJkt, jkt)

     

       808
       808
       -
       	}

     

       809
       809
       -
       }

     

       810
       810
       -
       

     

       811
       811
       -
       func TestExtractCnfJkt_MissingCnf(t *testing.T) {

     

       812
       812
       -
       	claims := &Claims{

     

       813
       813
       -
       		// No Confirmation

     

       814
       814
       -
       	}

     

       815
       815
       -
       

     

       816
       816
       -
       	_, err := ExtractCnfJkt(claims)

     

       817
       817
       -
       	if err == nil {

     

       818
       818
       -
       		t.Error("Expected error for missing cnf, got nil")

     

       819
       819
       -
       	}

     

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

     

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

     

       822
       822
       -
       	}

     

       823
       823
       -
       }

     

       824
       824
       -
       

     

       825
       825
       -
       func TestExtractCnfJkt_NilCnf(t *testing.T) {

     

       826
       826
       -
       	claims := &Claims{

     

       827
       827
       -
       		Confirmation: nil,

     

       828
       828
       -
       	}

     

       829
       829
       -
       

     

       830
       830
       -
       	_, err := ExtractCnfJkt(claims)

     

       831
       831
       -
       	if err == nil {

     

       832
       832
       -
       		t.Error("Expected error for nil cnf, got nil")

     

       833
       833
       -
       	}

     

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

     

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

     

       836
       836
       -
       	}

     

       837
       837
       -
       }

     

       838
       838
       -
       

     

       839
       839
       -
       func TestExtractCnfJkt_MissingJkt(t *testing.T) {

     

       840
       840
       -
       	claims := &Claims{

     

       841
       841
       -
       		Confirmation: map[string]interface{}{

     

       842
       842
       -
       			"other": "value",

     

       843
       843
       -
       		},

     

       844
       844
       -
       	}

     

       845
       845
       -
       

     

       846
       846
       -
       	_, err := ExtractCnfJkt(claims)

     

       847
       847
       -
       	if err == nil {

     

       848
       848
       -
       		t.Error("Expected error for missing jkt, got nil")

     

       849
       849
       -
       	}

     

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

     

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

     

       852
       852
       -
       	}

     

       853
       853
       -
       }

     

       854
       854
       -
       

     

       855
       855
       -
       func TestExtractCnfJkt_EmptyJkt(t *testing.T) {

     

       856
       856
       -
       	claims := &Claims{

     

       857
       857
       -
       		Confirmation: map[string]interface{}{

     

       858
       858
       -
       			"jkt": "",

     

       859
       859
       -
       		},

     

       860
       860
       -
       	}

     

       861
       861
       -
       

     

       862
       862
       -
       	_, err := ExtractCnfJkt(claims)

     

       863
       863
       -
       	if err == nil {

     

       864
       864
       -
       		t.Error("Expected error for empty jkt, got nil")

     

       865
       865
       -
       	}

     

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

     

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

     

       868
       868
       -
       	}

     

       869
       869
       -
       }

     

       870
       870
       -
       

     

       871
       871
       -
       func TestExtractCnfJkt_WrongType(t *testing.T) {

     

       872
       872
       -
       	claims := &Claims{

     

       873
       873
       -
       		Confirmation: map[string]interface{}{

     

       874
       874
       -
       			"jkt": 123, // Not a string

     

       875
       875
       -
       		},

     

       876
       876
       -
       	}

     

       877
       877
       -
       

     

       878
       878
       -
       	_, err := ExtractCnfJkt(claims)

     

       879
       879
       -
       	if err == nil {

     

       880
       880
       -
       		t.Error("Expected error for wrong type jkt, got nil")

     

       881
       881
       -
       	}

     

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

     

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

     

       884
       884
       -
       	}

     

       885
       885
       -
       }

     

       886
       886
       -
       

     

       887
       887
       -
       // === Helper Functions for Tests ===

     

       888
       888
       -
       

     

       889
       889
       -
       // splitJWT splits a JWT into its three parts

     

       890
       890
       -
       func splitJWT(token string) []string {

     

       891
       891
       -
       	return []string{

     

       892
       892
       -
       		token[:strings.IndexByte(token, '.')],

     

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

     

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

     

       895
       895
       -
       	}

     

       896
       896
       -
       }

     

       897
       897
       -
       

     

       898
       898
       -
       // parseJWTHeader parses a base64url-encoded JWT header

     

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

     

       900
       900
       -
       	t.Helper()

     

       901
       901
       -
       	decoded, err := base64.RawURLEncoding.DecodeString(encoded)

     

       902
       902
       -
       	if err != nil {

     

       903
       903
       -
       		t.Fatalf("Failed to decode header: %v", err)

     

       904
       904
       -
       	}

     

       905
       905
       -
       

     

       906
       906
       -
       	var header map[string]interface{}

     

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

     

       908
       908
       -
       		t.Fatalf("Failed to unmarshal header: %v", err)

     

       909
       909
       -
       	}

     

       910
       910
       -
       

     

       911
       911
       -
       	return header

     

       912
       912
       -
       }

     

       913
       913
       -
       

     

       914
       914
       -
       // encodeJSON encodes a value to base64url-encoded JSON

     

       915
       915
       -
       func encodeJSON(t *testing.T, v interface{}) string {

     

       916
       916
       -
       	t.Helper()

     

       917
       917
       -
       	data, err := json.Marshal(v)

     

       918
       918
       -
       	if err != nil {

     

       919
       919
       -
       		t.Fatalf("Failed to marshal JSON: %v", err)

     

       920
       920
       -
       	}

     

       921
       921
       -
       	return base64.RawURLEncoding.EncodeToString(data)

     

       922
       922
       -
       }

     

       923
       923
       -
       

     

       924
       924
       -
       // === ES256K (secp256k1) Test Helpers ===

     

       925
       925
       -
       

     

       926
       926
       -
       // testES256KKey holds a test ES256K key pair using indigo

     

       927
       927
       -
       type testES256KKey struct {

     

       928
       928
       -
       	privateKey indigoCrypto.PrivateKey

     

       929
       929
       -
       	publicKey  indigoCrypto.PublicKey

     

       930
       930
       -
       	jwk        map[string]interface{}

     

       931
       931
       -
       	thumbprint string

     

       932
       932
       -
       }

     

       933
       933
       -
       

     

       934
       934
       -
       // generateTestES256KKey generates a test ES256K (secp256k1) key pair and JWK

     

       935
       935
       -
       func generateTestES256KKey(t *testing.T) *testES256KKey {

     

       936
       936
       -
       	t.Helper()

     

       937
       937
       -
       

     

       938
       938
       -
       	privateKey, err := indigoCrypto.GeneratePrivateKeyK256()

     

       939
       939
       -
       	if err != nil {

     

       940
       940
       -
       		t.Fatalf("Failed to generate ES256K test key: %v", err)

     

       941
       941
       -
       	}

     

       942
       942
       -
       

     

       943
       943
       -
       	publicKey, err := privateKey.PublicKey()

     

       944
       944
       -
       	if err != nil {

     

       945
       945
       -
       		t.Fatalf("Failed to get public key from ES256K private key: %v", err)

     

       946
       946
       -
       	}

     

       947
       947
       -
       

     

       948
       948
       -
       	// Get the JWK representation

     

       949
       949
       -
       	jwkStruct, err := publicKey.JWK()

     

       950
       950
       -
       	if err != nil {

     

       951
       951
       -
       		t.Fatalf("Failed to get JWK from ES256K public key: %v", err)

     

       952
       952
       -
       	}

     

       953
       953
       -
       	jwk := map[string]interface{}{

     

       954
       954
       -
       		"kty": jwkStruct.KeyType,

     

       955
       955
       -
       		"crv": jwkStruct.Curve,

     

       956
       956
       -
       		"x":   jwkStruct.X,

     

       957
       957
       -
       		"y":   jwkStruct.Y,

     

       958
       958
       -
       	}

     

       959
       959
       -
       

     

       960
       960
       -
       	// Calculate thumbprint

     

       961
       961
       -
       	thumbprint, err := CalculateJWKThumbprint(jwk)

     

       962
       962
       -
       	if err != nil {

     

       963
       963
       -
       		t.Fatalf("Failed to calculate ES256K thumbprint: %v", err)

     

       964
       964
       -
       	}

     

       965
       965
       -
       

     

       966
       966
       -
       	return &testES256KKey{

     

       967
       967
       -
       		privateKey: privateKey,

     

       968
       968
       -
       		publicKey:  publicKey,

     

       969
       969
       -
       		jwk:        jwk,

     

       970
       970
       -
       		thumbprint: thumbprint,

     

       971
       971
       -
       	}

     

       972
       972
       -
       }

     

       973
       973
       -
       

     

       974
       974
       -
       // createES256KDPoPProof creates a DPoP proof JWT using ES256K for testing

     

       975
       975
       -
       func createES256KDPoPProof(t *testing.T, key *testES256KKey, method, uri string, iat time.Time, jti string) string {

     

       976
       976
       -
       	t.Helper()

     

       977
       977
       -
       

     

       978
       978
       -
       	// Build claims

     

       979
       979
       -
       	claims := map[string]interface{}{

     

       980
       980
       -
       		"jti": jti,

     

       981
       981
       -
       		"iat": iat.Unix(),

     

       982
       982
       -
       		"htm": method,

     

       983
       983
       -
       		"htu": uri,

     

       984
       984
       -
       	}

     

       985
       985
       -
       

     

       986
       986
       -
       	// Build header

     

       987
       987
       -
       	header := map[string]interface{}{

     

       988
       988
       -
       		"typ": "dpop+jwt",

     

       989
       989
       -
       		"alg": "ES256K",

     

       990
       990
       -
       		"jwk": key.jwk,

     

       991
       991
       -
       	}

     

       992
       992
       -
       

     

       993
       993
       -
       	// Encode header and claims

     

       994
       994
       -
       	headerJSON, err := json.Marshal(header)

     

       995
       995
       -
       	if err != nil {

     

       996
       996
       -
       		t.Fatalf("Failed to marshal header: %v", err)

     

       997
       997
       -
       	}

     

       998
       998
       -
       	claimsJSON, err := json.Marshal(claims)

     

       999
       999
       -
       	if err != nil {

     

       1000
       1000
       -
       		t.Fatalf("Failed to marshal claims: %v", err)

     

       1001
       1001
       -
       	}

     

       1002
       1002
       -
       

     

       1003
       1003
       -
       	headerB64 := base64.RawURLEncoding.EncodeToString(headerJSON)

     

       1004
       1004
       -
       	claimsB64 := base64.RawURLEncoding.EncodeToString(claimsJSON)

     

       1005
       1005
       -
       

     

       1006
       1006
       -
       	// Sign with indigo

     

       1007
       1007
       -
       	signingInput := headerB64 + "." + claimsB64

     

       1008
       1008
       -
       	signature, err := key.privateKey.HashAndSign([]byte(signingInput))

     

       1009
       1009
       -
       	if err != nil {

     

       1010
       1010
       -
       		t.Fatalf("Failed to sign ES256K proof: %v", err)

     

       1011
       1011
       -
       	}

     

       1012
       1012
       -
       

     

       1013
       1013
       -
       	signatureB64 := base64.RawURLEncoding.EncodeToString(signature)

     

       1014
       1014
       -
       	return signingInput + "." + signatureB64

     

       1015
       1015
       -
       }

     

       1016
       1016
       -
       

     

       1017
       1017
       -
       // === ES256K Tests ===

     

       1018
       1018
       -
       

     

       1019
       1019
       -
       func TestVerifyDPoPProof_ES256K_Valid(t *testing.T) {

     

       1020
       1020
       -
       	verifier := NewDPoPVerifier()

     

       1021
       1021
       -
       	key := generateTestES256KKey(t)

     

       1022
       1022
       -
       

     

       1023
       1023
       -
       	method := "POST"

     

       1024
       1024
       -
       	uri := "https://api.example.com/resource"

     

       1025
       1025
       -
       	iat := time.Now()

     

       1026
       1026
       -
       	jti := uuid.New().String()

     

       1027
       1027
       -
       

     

       1028
       1028
       -
       	proof := createES256KDPoPProof(t, key, method, uri, iat, jti)

     

       1029
       1029
       -
       

     

       1030
       1030
       -
       	result, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       1031
       1031
       -
       	if err != nil {

     

       1032
       1032
       -
       		t.Fatalf("VerifyDPoPProof failed for valid ES256K proof: %v", err)

     

       1033
       1033
       -
       	}

     

       1034
       1034
       -
       

     

       1035
       1035
       -
       	if result == nil {

     

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

     

       1037
       1037
       -
       	}

     

       1038
       1038
       -
       

     

       1039
       1039
       -
       	if result.Claims.HTTPMethod != method {

     

       1040
       1040
       -
       		t.Errorf("Expected method %s, got %s", method, result.Claims.HTTPMethod)

     

       1041
       1041
       -
       	}

     

       1042
       1042
       -
       

     

       1043
       1043
       -
       	if result.Claims.HTTPURI != uri {

     

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

     

       1045
       1045
       -
       	}

     

       1046
       1046
       -
       

     

       1047
       1047
       -
       	if result.Thumbprint != key.thumbprint {

     

       1048
       1048
       -
       		t.Errorf("Expected thumbprint %s, got %s", key.thumbprint, result.Thumbprint)

     

       1049
       1049
       -
       	}

     

       1050
       1050
       -
       }

     

       1051
       1051
       -
       

     

       1052
       1052
       -
       func TestVerifyDPoPProof_ES256K_InvalidSignature(t *testing.T) {

     

       1053
       1053
       -
       	verifier := NewDPoPVerifier()

     

       1054
       1054
       -
       	key := generateTestES256KKey(t)

     

       1055
       1055
       -
       	wrongKey := generateTestES256KKey(t)

     

       1056
       1056
       -
       

     

       1057
       1057
       -
       	method := "POST"

     

       1058
       1058
       -
       	uri := "https://api.example.com/resource"

     

       1059
       1059
       -
       	iat := time.Now()

     

       1060
       1060
       -
       	jti := uuid.New().String()

     

       1061
       1061
       -
       

     

       1062
       1062
       -
       	// Create proof with one key

     

       1063
       1063
       -
       	proof := createES256KDPoPProof(t, key, method, uri, iat, jti)

     

       1064
       1064
       -
       

     

       1065
       1065
       -
       	// Tamper by replacing JWK with wrong key

     

       1066
       1066
       -
       	parts := splitJWT(proof)

     

       1067
       1067
       -
       	header := parseJWTHeader(t, parts[0])

     

       1068
       1068
       -
       	header["jwk"] = wrongKey.jwk

     

       1069
       1069
       -
       	modifiedHeader := encodeJSON(t, header)

     

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

     

       1071
       1071
       -
       

     

       1072
       1072
       -
       	_, err := verifier.VerifyDPoPProof(tamperedProof, method, uri)

     

       1073
       1073
       -
       	if err == nil {

     

       1074
       1074
       -
       		t.Error("Expected error for invalid ES256K signature, got nil")

     

       1075
       1075
       -
       	}

     

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

     

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

     

       1078
       1078
       -
       	}

     

       1079
       1079
       -
       }

     

       1080
       1080
       -
       

     

       1081
       1081
       -
       func TestCalculateJWKThumbprint_ES256K(t *testing.T) {

     

       1082
       1082
       -
       	// Test thumbprint calculation for secp256k1 keys

     

       1083
       1083
       -
       	key := generateTestES256KKey(t)

     

       1084
       1084
       -
       

     

       1085
       1085
       -
       	thumbprint, err := CalculateJWKThumbprint(key.jwk)

     

       1086
       1086
       -
       	if err != nil {

     

       1087
       1087
       -
       		t.Fatalf("CalculateJWKThumbprint failed for ES256K: %v", err)

     

       1088
       1088
       -
       	}

     

       1089
       1089
       -
       

     

       1090
       1090
       -
       	if thumbprint == "" {

     

       1091
       1091
       -
       		t.Error("Expected non-empty thumbprint for ES256K key")

     

       1092
       1092
       -
       	}

     

       1093
       1093
       -
       

     

       1094
       1094
       -
       	// Verify it's valid base64url

     

       1095
       1095
       -
       	_, err = base64.RawURLEncoding.DecodeString(thumbprint)

     

       1096
       1096
       -
       	if err != nil {

     

       1097
       1097
       -
       		t.Errorf("ES256K thumbprint is not valid base64url: %v", err)

     

       1098
       1098
       -
       	}

     

       1099
       1099
       -
       

     

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

     

       1101
       1101
       -
       	if len(thumbprint) != 43 {

     

       1102
       1102
       -
       		t.Errorf("Expected ES256K thumbprint length 43, got %d", len(thumbprint))

     

       1103
       1103
       -
       	}

     

       1104
       1104
       -
       }

     

       1105
       1105
       -
       

     

       1106
       1106
       -
       // === Algorithm-Curve Binding Tests ===

     

       1107
       1107
       -
       

     

       1108
       1108
       -
       func TestVerifyDPoPProof_AlgorithmCurveMismatch_ES256KWithP256Key(t *testing.T) {

     

       1109
       1109
       -
       	verifier := NewDPoPVerifier()

     

       1110
       1110
       -
       	key := generateTestES256Key(t) // P-256 key

     

       1111
       1111
       -
       

     

       1112
       1112
       -
       	method := "POST"

     

       1113
       1113
       -
       	uri := "https://api.example.com/resource"

     

       1114
       1114
       -
       	iat := time.Now()

     

       1115
       1115
       -
       	jti := uuid.New().String()

     

       1116
       1116
       -
       

     

       1117
       1117
       -
       	// Create a proof claiming ES256K but using P-256 key

     

       1118
       1118
       -
       	claims := &DPoPClaims{

     

       1119
       1119
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       1120
       1120
       -
       			ID:       jti,

     

       1121
       1121
       -
       			IssuedAt: jwt.NewNumericDate(iat),

     

       1122
       1122
       -
       		},

     

       1123
       1123
       -
       		HTTPMethod: method,

     

       1124
       1124
       -
       		HTTPURI:    uri,

     

       1125
       1125
       -
       	}

     

       1126
       1126
       -
       

     

       1127
       1127
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       1128
       1128
       -
       	token.Header["typ"] = "dpop+jwt"

     

       1129
       1129
       -
       	token.Header["alg"] = "ES256K" // Claim ES256K

     

       1130
       1130
       -
       	token.Header["jwk"] = key.jwk  // But use P-256 key

     

       1131
       1131
       -
       

     

       1132
       1132
       -
       	proof, err := token.SignedString(key.privateKey)

     

       1133
       1133
       -
       	if err != nil {

     

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

     

       1135
       1135
       -
       	}

     

       1136
       1136
       -
       

     

       1137
       1137
       -
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       1138
       1138
       -
       	if err == nil {

     

       1139
       1139
       -
       		t.Error("Expected error for ES256K algorithm with P-256 curve, got nil")

     

       1140
       1140
       -
       	}

     

       1141
       1141
       -
       	if err != nil && !contains(err.Error(), "requires curve secp256k1") {

     

       1142
       1142
       -
       		t.Errorf("Expected curve mismatch error, got: %v", err)

     

       1143
       1143
       -
       	}

     

       1144
       1144
       -
       }

     

       1145
       1145
       -
       

     

       1146
       1146
       -
       func TestVerifyDPoPProof_AlgorithmCurveMismatch_ES256WithSecp256k1Key(t *testing.T) {

     

       1147
       1147
       -
       	verifier := NewDPoPVerifier()

     

       1148
       1148
       -
       	key := generateTestES256KKey(t) // secp256k1 key

     

       1149
       1149
       -
       

     

       1150
       1150
       -
       	method := "POST"

     

       1151
       1151
       -
       	uri := "https://api.example.com/resource"

     

       1152
       1152
       -
       	iat := time.Now()

     

       1153
       1153
       -
       	jti := uuid.New().String()

     

       1154
       1154
       -
       

     

       1155
       1155
       -
       	// Build claims

     

       1156
       1156
       -
       	claims := map[string]interface{}{

     

       1157
       1157
       -
       		"jti": jti,

     

       1158
       1158
       -
       		"iat": iat.Unix(),

     

       1159
       1159
       -
       		"htm": method,

     

       1160
       1160
       -
       		"htu": uri,

     

       1161
       1161
       -
       	}

     

       1162
       1162
       -
       

     

       1163
       1163
       -
       	// Build header claiming ES256 but using secp256k1 key

     

       1164
       1164
       -
       	header := map[string]interface{}{

     

       1165
       1165
       -
       		"typ": "dpop+jwt",

     

       1166
       1166
       -
       		"alg": "ES256", // Claim ES256

     

       1167
       1167
       -
       		"jwk": key.jwk, // But use secp256k1 key

     

       1168
       1168
       -
       	}

     

       1169
       1169
       -
       

     

       1170
       1170
       -
       	headerJSON, _ := json.Marshal(header)

     

       1171
       1171
       -
       	claimsJSON, _ := json.Marshal(claims)

     

       1172
       1172
       -
       

     

       1173
       1173
       -
       	headerB64 := base64.RawURLEncoding.EncodeToString(headerJSON)

     

       1174
       1174
       -
       	claimsB64 := base64.RawURLEncoding.EncodeToString(claimsJSON)

     

       1175
       1175
       -
       

     

       1176
       1176
       -
       	signingInput := headerB64 + "." + claimsB64

     

       1177
       1177
       -
       	signature, err := key.privateKey.HashAndSign([]byte(signingInput))

     

       1178
       1178
       -
       	if err != nil {

     

       1179
       1179
       -
       		t.Fatalf("Failed to sign: %v", err)

     

       1180
       1180
       -
       	}

     

       1181
       1181
       -
       

     

       1182
       1182
       -
       	proof := signingInput + "." + base64.RawURLEncoding.EncodeToString(signature)

     

       1183
       1183
       -
       

     

       1184
       1184
       -
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       1185
       1185
       -
       	if err == nil {

     

       1186
       1186
       -
       		t.Error("Expected error for ES256 algorithm with secp256k1 curve, got nil")

     

       1187
       1187
       -
       	}

     

       1188
       1188
       -
       	if err != nil && !contains(err.Error(), "requires curve P-256") {

     

       1189
       1189
       -
       		t.Errorf("Expected curve mismatch error, got: %v", err)

     

       1190
       1190
       -
       	}

     

       1191
       1191
       -
       }

     

       1192
       1192
       -
       

     

       1193
       1193
       -
       // === exp/nbf Validation Tests ===

     

       1194
       1194
       -
       

     

       1195
       1195
       -
       func TestVerifyDPoPProof_ExpiredWithExpClaim(t *testing.T) {

     

       1196
       1196
       -
       	verifier := NewDPoPVerifier()

     

       1197
       1197
       -
       	key := generateTestES256Key(t)

     

       1198
       1198
       -
       

     

       1199
       1199
       -
       	method := "POST"

     

       1200
       1200
       -
       	uri := "https://api.example.com/resource"

     

       1201
       1201
       -
       	iat := time.Now().Add(-2 * time.Minute)

     

       1202
       1202
       -
       	exp := time.Now().Add(-1 * time.Minute) // Expired 1 minute ago

     

       1203
       1203
       -
       	jti := uuid.New().String()

     

       1204
       1204
       -
       

     

       1205
       1205
       -
       	claims := &DPoPClaims{

     

       1206
       1206
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       1207
       1207
       -
       			ID:        jti,

     

       1208
       1208
       -
       			IssuedAt:  jwt.NewNumericDate(iat),

     

       1209
       1209
       -
       			ExpiresAt: jwt.NewNumericDate(exp),

     

       1210
       1210
       -
       		},

     

       1211
       1211
       -
       		HTTPMethod: method,

     

       1212
       1212
       -
       		HTTPURI:    uri,

     

       1213
       1213
       -
       	}

     

       1214
       1214
       -
       

     

       1215
       1215
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       1216
       1216
       -
       	token.Header["typ"] = "dpop+jwt"

     

       1217
       1217
       -
       	token.Header["jwk"] = key.jwk

     

       1218
       1218
       -
       

     

       1219
       1219
       -
       	proof, err := token.SignedString(key.privateKey)

     

       1220
       1220
       -
       	if err != nil {

     

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

     

       1222
       1222
       -
       	}

     

       1223
       1223
       -
       

     

       1224
       1224
       -
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       1225
       1225
       -
       	if err == nil {

     

       1226
       1226
       -
       		t.Error("Expected error for expired proof with exp claim, got nil")

     

       1227
       1227
       -
       	}

     

       1228
       1228
       -
       	if err != nil && !contains(err.Error(), "expired") {

     

       1229
       1229
       -
       		t.Errorf("Expected expiration error, got: %v", err)

     

       1230
       1230
       -
       	}

     

       1231
       1231
       -
       }

     

       1232
       1232
       -
       

     

       1233
       1233
       -
       func TestVerifyDPoPProof_NotYetValidWithNbfClaim(t *testing.T) {

     

       1234
       1234
       -
       	verifier := NewDPoPVerifier()

     

       1235
       1235
       -
       	key := generateTestES256Key(t)

     

       1236
       1236
       -
       

     

       1237
       1237
       -
       	method := "POST"

     

       1238
       1238
       -
       	uri := "https://api.example.com/resource"

     

       1239
       1239
       -
       	iat := time.Now()

     

       1240
       1240
       -
       	nbf := time.Now().Add(5 * time.Minute) // Not valid for another 5 minutes

     

       1241
       1241
       -
       	jti := uuid.New().String()

     

       1242
       1242
       -
       

     

       1243
       1243
       -
       	claims := &DPoPClaims{

     

       1244
       1244
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       1245
       1245
       -
       			ID:        jti,

     

       1246
       1246
       -
       			IssuedAt:  jwt.NewNumericDate(iat),

     

       1247
       1247
       -
       			NotBefore: jwt.NewNumericDate(nbf),

     

       1248
       1248
       -
       		},

     

       1249
       1249
       -
       		HTTPMethod: method,

     

       1250
       1250
       -
       		HTTPURI:    uri,

     

       1251
       1251
       -
       	}

     

       1252
       1252
       -
       

     

       1253
       1253
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       1254
       1254
       -
       	token.Header["typ"] = "dpop+jwt"

     

       1255
       1255
       -
       	token.Header["jwk"] = key.jwk

     

       1256
       1256
       -
       

     

       1257
       1257
       -
       	proof, err := token.SignedString(key.privateKey)

     

       1258
       1258
       -
       	if err != nil {

     

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

     

       1260
       1260
       -
       	}

     

       1261
       1261
       -
       

     

       1262
       1262
       -
       	_, err = verifier.VerifyDPoPProof(proof, method, uri)

     

       1263
       1263
       -
       	if err == nil {

     

       1264
       1264
       -
       		t.Error("Expected error for not-yet-valid proof with nbf claim, got nil")

     

       1265
       1265
       -
       	}

     

       1266
       1266
       -
       	if err != nil && !contains(err.Error(), "not valid before") {

     

       1267
       1267
       -
       		t.Errorf("Expected not-before error, got: %v", err)

     

       1268
       1268
       -
       	}

     

       1269
       1269
       -
       }

     

       1270
       1270
       -
       

     

       1271
       1271
       -
       func TestVerifyDPoPProof_ValidWithExpClaimInFuture(t *testing.T) {

     

       1272
       1272
       -
       	verifier := NewDPoPVerifier()

     

       1273
       1273
       -
       	key := generateTestES256Key(t)

     

       1274
       1274
       -
       

     

       1275
       1275
       -
       	method := "POST"

     

       1276
       1276
       -
       	uri := "https://api.example.com/resource"

     

       1277
       1277
       -
       	iat := time.Now()

     

       1278
       1278
       -
       	exp := time.Now().Add(5 * time.Minute) // Valid for 5 more minutes

     

       1279
       1279
       -
       	jti := uuid.New().String()

     

       1280
       1280
       -
       

     

       1281
       1281
       -
       	claims := &DPoPClaims{

     

       1282
       1282
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       1283
       1283
       -
       			ID:        jti,

     

       1284
       1284
       -
       			IssuedAt:  jwt.NewNumericDate(iat),

     

       1285
       1285
       -
       			ExpiresAt: jwt.NewNumericDate(exp),

     

       1286
       1286
       -
       		},

     

       1287
       1287
       -
       		HTTPMethod: method,

     

       1288
       1288
       -
       		HTTPURI:    uri,

     

       1289
       1289
       -
       	}

     

       1290
       1290
       -
       

     

       1291
       1291
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodES256, claims)

     

       1292
       1292
       -
       	token.Header["typ"] = "dpop+jwt"

     

       1293
       1293
       -
       	token.Header["jwk"] = key.jwk

     

       1294
       1294
       -
       

     

       1295
       1295
       -
       	proof, err := token.SignedString(key.privateKey)

     

       1296
       1296
       -
       	if err != nil {

     

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

     

       1298
       1298
       -
       	}

     

       1299
       1299
       -
       

     

       1300
       1300
       -
       	result, err := verifier.VerifyDPoPProof(proof, method, uri)

     

       1301
       1301
       -
       	if err != nil {

     

       1302
       1302
       -
       		t.Fatalf("VerifyDPoPProof failed for valid proof with exp in future: %v", err)

     

       1303
       1303
       -
       	}

     

       1304
       1304
       -
       

     

       1305
       1305
       -
       	if result == nil {

     

       1306
       1306
       -
       		t.Error("Expected non-nil result for valid proof")

     

       1307
       1307
       -
       	}

     

       1308
       1308
       -
       }

-189

internal/atproto/auth/jwks_fetcher.go

···

       1
       1
       -
       package auth

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"encoding/json"

     

       6
       6
       -
       	"fmt"

     

       7
       7
       -
       	"net/http"

     

       8
       8
       -
       	"strings"

     

       9
       9
       -
       	"sync"

     

       10
       10
       -
       	"time"

     

       11
       11
       -
       )

     

       12
       12
       -
       

     

       13
       13
       -
       // CachedJWKSFetcher fetches and caches JWKS from authorization servers

     

       14
       14
       -
       type CachedJWKSFetcher struct {

     

       15
       15
       -
       	cache      map[string]*cachedJWKS

     

       16
       16
       -
       	httpClient *http.Client

     

       17
       17
       -
       	cacheMutex sync.RWMutex

     

       18
       18
       -
       	cacheTTL   time.Duration

     

       19
       19
       -
       }

     

       20
       20
       -
       

     

       21
       21
       -
       type cachedJWKS struct {

     

       22
       22
       -
       	jwks      *JWKS

     

       23
       23
       -
       	expiresAt time.Time

     

       24
       24
       -
       }

     

       25
       25
       -
       

     

       26
       26
       -
       // NewCachedJWKSFetcher creates a new JWKS fetcher with caching

     

       27
       27
       -
       func NewCachedJWKSFetcher(cacheTTL time.Duration) *CachedJWKSFetcher {

     

       28
       28
       -
       	return &CachedJWKSFetcher{

     

       29
       29
       -
       		cache: make(map[string]*cachedJWKS),

     

       30
       30
       -
       		httpClient: &http.Client{

     

       31
       31
       -
       			Timeout: 10 * time.Second,

     

       32
       32
       -
       		},

     

       33
       33
       -
       		cacheTTL: cacheTTL,

     

       34
       34
       -
       	}

     

       35
       35
       -
       }

     

       36
       36
       -
       

     

       37
       37
       -
       // FetchPublicKey fetches the public key for verifying a JWT from the issuer

     

       38
       38
       -
       // Implements JWKSFetcher interface

     

       39
       39
       -
       // Returns interface{} to support both RSA and ECDSA keys

     

       40
       40
       -
       func (f *CachedJWKSFetcher) FetchPublicKey(ctx context.Context, issuer, token string) (interface{}, error) {

     

       41
       41
       -
       	// Extract key ID from token

     

       42
       42
       -
       	kid, err := ExtractKeyID(token)

     

       43
       43
       -
       	if err != nil {

     

       44
       44
       -
       		return nil, fmt.Errorf("failed to extract key ID: %w", err)

     

       45
       45
       -
       	}

     

       46
       46
       -
       

     

       47
       47
       -
       	// Get JWKS from cache or fetch

     

       48
       48
       -
       	jwks, err := f.getJWKS(ctx, issuer)

     

       49
       49
       -
       	if err != nil {

     

       50
       50
       -
       		return nil, err

     

       51
       51
       -
       	}

     

       52
       52
       -
       

     

       53
       53
       -
       	// Find the key by ID

     

       54
       54
       -
       	jwk, err := jwks.FindKeyByID(kid)

     

       55
       55
       -
       	if err != nil {

     

       56
       56
       -
       		// Key not found in cache - try refreshing

     

       57
       57
       -
       		jwks, err = f.fetchJWKS(ctx, issuer)

     

       58
       58
       -
       		if err != nil {

     

       59
       59
       -
       			return nil, fmt.Errorf("failed to refresh JWKS: %w", err)

     

       60
       60
       -
       		}

     

       61
       61
       -
       		f.cacheJWKS(issuer, jwks)

     

       62
       62
       -
       

     

       63
       63
       -
       		// Try again with fresh JWKS

     

       64
       64
       -
       		jwk, err = jwks.FindKeyByID(kid)

     

       65
       65
       -
       		if err != nil {

     

       66
       66
       -
       			return nil, err

     

       67
       67
       -
       		}

     

       68
       68
       -
       	}

     

       69
       69
       -
       

     

       70
       70
       -
       	// Convert JWK to public key (RSA or ECDSA)

     

       71
       71
       -
       	return jwk.ToPublicKey()

     

       72
       72
       -
       }

     

       73
       73
       -
       

     

       74
       74
       -
       // getJWKS gets JWKS from cache or fetches if not cached/expired

     

       75
       75
       -
       func (f *CachedJWKSFetcher) getJWKS(ctx context.Context, issuer string) (*JWKS, error) {

     

       76
       76
       -
       	// Check cache first

     

       77
       77
       -
       	f.cacheMutex.RLock()

     

       78
       78
       -
       	cached, exists := f.cache[issuer]

     

       79
       79
       -
       	f.cacheMutex.RUnlock()

     

       80
       80
       -
       

     

       81
       81
       -
       	if exists && time.Now().Before(cached.expiresAt) {

     

       82
       82
       -
       		return cached.jwks, nil

     

       83
       83
       -
       	}

     

       84
       84
       -
       

     

       85
       85
       -
       	// Not in cache or expired - fetch from issuer

     

       86
       86
       -
       	jwks, err := f.fetchJWKS(ctx, issuer)

     

       87
       87
       -
       	if err != nil {

     

       88
       88
       -
       		return nil, err

     

       89
       89
       -
       	}

     

       90
       90
       -
       

     

       91
       91
       -
       	// Cache it

     

       92
       92
       -
       	f.cacheJWKS(issuer, jwks)

     

       93
       93
       -
       

     

       94
       94
       -
       	return jwks, nil

     

       95
       95
       -
       }

     

       96
       96
       -
       

     

       97
       97
       -
       // fetchJWKS fetches JWKS from the authorization server

     

       98
       98
       -
       func (f *CachedJWKSFetcher) fetchJWKS(ctx context.Context, issuer string) (*JWKS, error) {

     

       99
       99
       -
       	// Step 1: Fetch OAuth server metadata to get JWKS URI

     

       100
       100
       -
       	metadataURL := strings.TrimSuffix(issuer, "/") + "/.well-known/oauth-authorization-server"

     

       101
       101
       -
       

     

       102
       102
       -
       	req, err := http.NewRequestWithContext(ctx, "GET", metadataURL, nil)

     

       103
       103
       -
       	if err != nil {

     

       104
       104
       -
       		return nil, fmt.Errorf("failed to create metadata request: %w", err)

     

       105
       105
       -
       	}

     

       106
       106
       -
       

     

       107
       107
       -
       	resp, err := f.httpClient.Do(req)

     

       108
       108
       -
       	if err != nil {

     

       109
       109
       -
       		return nil, fmt.Errorf("failed to fetch metadata: %w", err)

     

       110
       110
       -
       	}

     

       111
       111
       -
       	defer func() {

     

       112
       112
       -
       		_ = resp.Body.Close()

     

       113
       113
       -
       	}()

     

       114
       114
       -
       

     

       115
       115
       -
       	if resp.StatusCode != http.StatusOK {

     

       116
       116
       -
       		return nil, fmt.Errorf("metadata endpoint returned status %d", resp.StatusCode)

     

       117
       117
       -
       	}

     

       118
       118
       -
       

     

       119
       119
       -
       	var metadata struct {

     

       120
       120
       -
       		JWKSURI string `json:"jwks_uri"`

     

       121
       121
       -
       	}

     

       122
       122
       -
       	if err := json.NewDecoder(resp.Body).Decode(&metadata); err != nil {

     

       123
       123
       -
       		return nil, fmt.Errorf("failed to decode metadata: %w", err)

     

       124
       124
       -
       	}

     

       125
       125
       -
       

     

       126
       126
       -
       	if metadata.JWKSURI == "" {

     

       127
       127
       -
       		return nil, fmt.Errorf("jwks_uri not found in metadata")

     

       128
       128
       -
       	}

     

       129
       129
       -
       

     

       130
       130
       -
       	// Step 2: Fetch JWKS from the JWKS URI

     

       131
       131
       -
       	jwksReq, err := http.NewRequestWithContext(ctx, "GET", metadata.JWKSURI, nil)

     

       132
       132
       -
       	if err != nil {

     

       133
       133
       -
       		return nil, fmt.Errorf("failed to create JWKS request: %w", err)

     

       134
       134
       -
       	}

     

       135
       135
       -
       

     

       136
       136
       -
       	jwksResp, err := f.httpClient.Do(jwksReq)

     

       137
       137
       -
       	if err != nil {

     

       138
       138
       -
       		return nil, fmt.Errorf("failed to fetch JWKS: %w", err)

     

       139
       139
       -
       	}

     

       140
       140
       -
       	defer func() {

     

       141
       141
       -
       		_ = jwksResp.Body.Close()

     

       142
       142
       -
       	}()

     

       143
       143
       -
       

     

       144
       144
       -
       	if jwksResp.StatusCode != http.StatusOK {

     

       145
       145
       -
       		return nil, fmt.Errorf("JWKS endpoint returned status %d", jwksResp.StatusCode)

     

       146
       146
       -
       	}

     

       147
       147
       -
       

     

       148
       148
       -
       	var jwks JWKS

     

       149
       149
       -
       	if err := json.NewDecoder(jwksResp.Body).Decode(&jwks); err != nil {

     

       150
       150
       -
       		return nil, fmt.Errorf("failed to decode JWKS: %w", err)

     

       151
       151
       -
       	}

     

       152
       152
       -
       

     

       153
       153
       -
       	if len(jwks.Keys) == 0 {

     

       154
       154
       -
       		return nil, fmt.Errorf("no keys found in JWKS")

     

       155
       155
       -
       	}

     

       156
       156
       -
       

     

       157
       157
       -
       	return &jwks, nil

     

       158
       158
       -
       }

     

       159
       159
       -
       

     

       160
       160
       -
       // cacheJWKS stores JWKS in the cache

     

       161
       161
       -
       func (f *CachedJWKSFetcher) cacheJWKS(issuer string, jwks *JWKS) {

     

       162
       162
       -
       	f.cacheMutex.Lock()

     

       163
       163
       -
       	defer f.cacheMutex.Unlock()

     

       164
       164
       -
       

     

       165
       165
       -
       	f.cache[issuer] = &cachedJWKS{

     

       166
       166
       -
       		jwks:      jwks,

     

       167
       167
       -
       		expiresAt: time.Now().Add(f.cacheTTL),

     

       168
       168
       -
       	}

     

       169
       169
       -
       }

     

       170
       170
       -
       

     

       171
       171
       -
       // ClearCache clears the entire JWKS cache

     

       172
       172
       -
       func (f *CachedJWKSFetcher) ClearCache() {

     

       173
       173
       -
       	f.cacheMutex.Lock()

     

       174
       174
       -
       	defer f.cacheMutex.Unlock()

     

       175
       175
       -
       	f.cache = make(map[string]*cachedJWKS)

     

       176
       176
       -
       }

     

       177
       177
       -
       

     

       178
       178
       -
       // CleanupExpiredCache removes expired entries from the cache

     

       179
       179
       -
       func (f *CachedJWKSFetcher) CleanupExpiredCache() {

     

       180
       180
       -
       	f.cacheMutex.Lock()

     

       181
       181
       -
       	defer f.cacheMutex.Unlock()

     

       182
       182
       -
       

     

       183
       183
       -
       	now := time.Now()

     

       184
       184
       -
       	for issuer, cached := range f.cache {

     

       185
       185
       -
       		if now.After(cached.expiresAt) {

     

       186
       186
       -
       			delete(f.cache, issuer)

     

       187
       187
       -
       		}

     

       188
       188
       -
       	}

     

       189
       189
       -
       }

-709

internal/atproto/auth/jwt.go

···

       1
       1
       -
       package auth

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"crypto/ecdsa"

     

       6
       6
       -
       	"crypto/elliptic"

     

       7
       7
       -
       	"crypto/rsa"

     

       8
       8
       -
       	"encoding/base64"

     

       9
       9
       -
       	"encoding/json"

     

       10
       10
       -
       	"fmt"

     

       11
       11
       -
       	"math/big"

     

       12
       12
       -
       	"net/url"

     

       13
       13
       -
       	"os"

     

       14
       14
       -
       	"strings"

     

       15
       15
       -
       	"sync"

     

       16
       16
       -
       	"time"

     

       17
       17
       -
       

     

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

     

       19
       19
       -
       	"github.com/golang-jwt/jwt/v5"

     

       20
       20
       -
       )

     

       21
       21
       -
       

     

       22
       22
       -
       // jwtConfig holds cached JWT configuration to avoid reading env vars on every request

     

       23
       23
       -
       type jwtConfig struct {

     

       24
       24
       -
       	hs256Issuers map[string]struct{} // Set of whitelisted HS256 issuers

     

       25
       25
       -
       	pdsJWTSecret []byte              // Cached PDS_JWT_SECRET

     

       26
       26
       -
       	isDevEnv     bool                // Cached IS_DEV_ENV

     

       27
       27
       -
       }

     

       28
       28
       -
       

     

       29
       29
       -
       var (

     

       30
       30
       -
       	cachedConfig *jwtConfig

     

       31
       31
       -
       	configOnce   sync.Once

     

       32
       32
       -
       )

     

       33
       33
       -
       

     

       34
       34
       -
       // InitJWTConfig initializes the JWT configuration from environment variables.

     

       35
       35
       -
       // This should be called once at startup. If not called explicitly, it will be

     

       36
       36
       -
       // initialized lazily on first use.

     

       37
       37
       -
       func InitJWTConfig() {

     

       38
       38
       -
       	configOnce.Do(func() {

     

       39
       39
       -
       		cachedConfig = &jwtConfig{

     

       40
       40
       -
       			hs256Issuers: make(map[string]struct{}),

     

       41
       41
       -
       			isDevEnv:     os.Getenv("IS_DEV_ENV") == "true",

     

       42
       42
       -
       		}

     

       43
       43
       -
       

     

       44
       44
       -
       		// Parse HS256_ISSUERS into a set for O(1) lookup

     

       45
       45
       -
       		if issuers := os.Getenv("HS256_ISSUERS"); issuers != "" {

     

       46
       46
       -
       			for _, issuer := range strings.Split(issuers, ",") {

     

       47
       47
       -
       				issuer = strings.TrimSpace(issuer)

     

       48
       48
       -
       				if issuer != "" {

     

       49
       49
       -
       					cachedConfig.hs256Issuers[issuer] = struct{}{}

     

       50
       50
       -
       				}

     

       51
       51
       -
       			}

     

       52
       52
       -
       		}

     

       53
       53
       -
       

     

       54
       54
       -
       		// Cache PDS_JWT_SECRET

     

       55
       55
       -
       		if secret := os.Getenv("PDS_JWT_SECRET"); secret != "" {

     

       56
       56
       -
       			cachedConfig.pdsJWTSecret = []byte(secret)

     

       57
       57
       -
       		}

     

       58
       58
       -
       	})

     

       59
       59
       -
       }

     

       60
       60
       -
       

     

       61
       61
       -
       // getConfig returns the cached config, initializing if needed

     

       62
       62
       -
       func getConfig() *jwtConfig {

     

       63
       63
       -
       	InitJWTConfig()

     

       64
       64
       -
       	return cachedConfig

     

       65
       65
       -
       }

     

       66
       66
       -
       

     

       67
       67
       -
       // ResetJWTConfigForTesting resets the cached config to allow re-initialization.

     

       68
       68
       -
       // This should ONLY be used in tests.

     

       69
       69
       -
       func ResetJWTConfigForTesting() {

     

       70
       70
       -
       	cachedConfig = nil

     

       71
       71
       -
       	configOnce = sync.Once{}

     

       72
       72
       -
       }

     

       73
       73
       -
       

     

       74
       74
       -
       // Algorithm constants for JWT signing methods

     

       75
       75
       -
       const (

     

       76
       76
       -
       	AlgorithmHS256 = "HS256"

     

       77
       77
       -
       	AlgorithmRS256 = "RS256"

     

       78
       78
       -
       	AlgorithmES256 = "ES256"

     

       79
       79
       -
       )

     

       80
       80
       -
       

     

       81
       81
       -
       // JWTHeader represents the parsed JWT header

     

       82
       82
       -
       type JWTHeader struct {

     

       83
       83
       -
       	Alg string `json:"alg"`

     

       84
       84
       -
       	Kid string `json:"kid"`

     

       85
       85
       -
       	Typ string `json:"typ,omitempty"`

     

       86
       86
       -
       }

     

       87
       87
       -
       

     

       88
       88
       -
       // Claims represents the standard JWT claims we care about

     

       89
       89
       -
       type Claims struct {

     

       90
       90
       -
       	jwt.RegisteredClaims

     

       91
       91
       -
       	// Confirmation claim for DPoP token binding (RFC 9449)

     

       92
       92
       -
       	// Contains "jkt" (JWK thumbprint) when token is bound to a DPoP key

     

       93
       93
       -
       	Confirmation map[string]interface{} `json:"cnf,omitempty"`

     

       94
       94
       -
       	Scope        string                 `json:"scope,omitempty"`

     

       95
       95
       -
       }

     

       96
       96
       -
       

     

       97
       97
       -
       // stripBearerPrefix removes the "Bearer " prefix from a token string

     

       98
       98
       -
       func stripBearerPrefix(tokenString string) string {

     

       99
       99
       -
       	tokenString = strings.TrimPrefix(tokenString, "Bearer ")

     

       100
       100
       -
       	return strings.TrimSpace(tokenString)

     

       101
       101
       -
       }

     

       102
       102
       -
       

     

       103
       103
       -
       // ParseJWTHeader extracts and parses the JWT header from a token string

     

       104
       104
       -
       // This is a reusable function for getting algorithm and key ID information

     

       105
       105
       -
       func ParseJWTHeader(tokenString string) (*JWTHeader, error) {

     

       106
       106
       -
       	tokenString = stripBearerPrefix(tokenString)

     

       107
       107
       -
       

     

       108
       108
       -
       	parts := strings.Split(tokenString, ".")

     

       109
       109
       -
       	if len(parts) != 3 {

     

       110
       110
       -
       		return nil, fmt.Errorf("invalid JWT format: expected 3 parts, got %d", len(parts))

     

       111
       111
       -
       	}

     

       112
       112
       -
       

     

       113
       113
       -
       	headerBytes, err := base64.RawURLEncoding.DecodeString(parts[0])

     

       114
       114
       -
       	if err != nil {

     

       115
       115
       -
       		return nil, fmt.Errorf("failed to decode JWT header: %w", err)

     

       116
       116
       -
       	}

     

       117
       117
       -
       

     

       118
       118
       -
       	var header JWTHeader

     

       119
       119
       -
       	if err := json.Unmarshal(headerBytes, &header); err != nil {

     

       120
       120
       -
       		return nil, fmt.Errorf("failed to parse JWT header: %w", err)

     

       121
       121
       -
       	}

     

       122
       122
       -
       

     

       123
       123
       -
       	return &header, nil

     

       124
       124
       -
       }

     

       125
       125
       -
       

     

       126
       126
       -
       // shouldUseHS256 determines if a token should use HS256 verification

     

       127
       127
       -
       // This prevents algorithm confusion attacks by using multiple signals:

     

       128
       128
       -
       // 1. If the token has a `kid` (key ID), it MUST use asymmetric verification

     

       129
       129
       -
       // 2. If no `kid`, only allow HS256 from whitelisted issuers (your own PDS)

     

       130
       130
       -
       //

     

       131
       131
       -
       // This approach supports open federation because:

     

       132
       132
       -
       // - External PDSes publish keys via JWKS and include `kid` in their tokens

     

       133
       133
       -
       // - Only your own PDS (which shares PDS_JWT_SECRET) uses HS256 without `kid`

     

       134
       134
       -
       func shouldUseHS256(header *JWTHeader, issuer string) bool {

     

       135
       135
       -
       	// If token has a key ID, it MUST use asymmetric verification

     

       136
       136
       -
       	// This is the primary defense against algorithm confusion attacks

     

       137
       137
       -
       	if header.Kid != "" {

     

       138
       138
       -
       		return false

     

       139
       139
       -
       	}

     

       140
       140
       -
       

     

       141
       141
       -
       	// No kid - check if issuer is whitelisted for HS256

     

       142
       142
       -
       	// This should only include your own PDS URL(s)

     

       143
       143
       -
       	return isHS256IssuerWhitelisted(issuer)

     

       144
       144
       -
       }

     

       145
       145
       -
       

     

       146
       146
       -
       // isHS256IssuerWhitelisted checks if the issuer is in the HS256 whitelist

     

       147
       147
       -
       // Only your own PDS should be in this list - external PDSes should use JWKS

     

       148
       148
       -
       func isHS256IssuerWhitelisted(issuer string) bool {

     

       149
       149
       -
       	cfg := getConfig()

     

       150
       150
       -
       	_, whitelisted := cfg.hs256Issuers[issuer]

     

       151
       151
       -
       	return whitelisted

     

       152
       152
       -
       }

     

       153
       153
       -
       

     

       154
       154
       -
       // ParseJWT parses a JWT token without verification (Phase 1)

     

       155
       155
       -
       // Returns the claims if the token is valid JSON and has required fields

     

       156
       156
       -
       func ParseJWT(tokenString string) (*Claims, error) {

     

       157
       157
       -
       	// Remove "Bearer " prefix if present

     

       158
       158
       -
       	tokenString = stripBearerPrefix(tokenString)

     

       159
       159
       -
       

     

       160
       160
       -
       	// Parse without verification first to extract claims

     

       161
       161
       -
       	parser := jwt.NewParser(jwt.WithoutClaimsValidation())

     

       162
       162
       -
       	token, _, err := parser.ParseUnverified(tokenString, &Claims{})

     

       163
       163
       -
       	if err != nil {

     

       164
       164
       -
       		return nil, fmt.Errorf("failed to parse JWT: %w", err)

     

       165
       165
       -
       	}

     

       166
       166
       -
       

     

       167
       167
       -
       	claims, ok := token.Claims.(*Claims)

     

       168
       168
       -
       	if !ok {

     

       169
       169
       -
       		return nil, fmt.Errorf("invalid claims type")

     

       170
       170
       -
       	}

     

       171
       171
       -
       

     

       172
       172
       -
       	// Validate required fields

     

       173
       173
       -
       	if claims.Subject == "" {

     

       174
       174
       -
       		return nil, fmt.Errorf("missing 'sub' claim (user DID)")

     

       175
       175
       -
       	}

     

       176
       176
       -
       

     

       177
       177
       -
       	// atProto PDSes may use 'aud' instead of 'iss' for the authorization server

     

       178
       178
       -
       	// If 'iss' is missing, use 'aud' as the authorization server identifier

     

       179
       179
       -
       	if claims.Issuer == "" {

     

       180
       180
       -
       		if len(claims.Audience) > 0 {

     

       181
       181
       -
       			claims.Issuer = claims.Audience[0]

     

       182
       182
       -
       		} else {

     

       183
       183
       -
       			return nil, fmt.Errorf("missing both 'iss' and 'aud' claims (authorization server)")

     

       184
       184
       -
       		}

     

       185
       185
       -
       	}

     

       186
       186
       -
       

     

       187
       187
       -
       	// Validate claims (even in Phase 1, we need basic validation like expiry)

     

       188
       188
       -
       	if err := validateClaims(claims); err != nil {

     

       189
       189
       -
       		return nil, err

     

       190
       190
       -
       	}

     

       191
       191
       -
       

     

       192
       192
       -
       	return claims, nil

     

       193
       193
       -
       }

     

       194
       194
       -
       

     

       195
       195
       -
       // VerifyJWT verifies a JWT token's signature and claims (Phase 2)

     

       196
       196
       -
       // Fetches the public key from the issuer's JWKS endpoint and validates the signature

     

       197
       197
       -
       // For HS256 tokens from whitelisted issuers, uses the shared PDS_JWT_SECRET

     

       198
       198
       -
       //

     

       199
       199
       -
       // SECURITY: Algorithm is determined by the issuer whitelist, NOT the token header,

     

       200
       200
       -
       // to prevent algorithm confusion attacks where an attacker could re-sign a token

     

       201
       201
       -
       // with HS256 using a public key as the secret.

     

       202
       202
       -
       func VerifyJWT(ctx context.Context, tokenString string, keyFetcher JWKSFetcher) (*Claims, error) {

     

       203
       203
       -
       	// Strip Bearer prefix once at the start

     

       204
       204
       -
       	tokenString = stripBearerPrefix(tokenString)

     

       205
       205
       -
       

     

       206
       206
       -
       	// First parse to get the issuer (needed to determine expected algorithm)

     

       207
       207
       -
       	claims, err := ParseJWT(tokenString)

     

       208
       208
       -
       	if err != nil {

     

       209
       209
       -
       		return nil, err

     

       210
       210
       -
       	}

     

       211
       211
       -
       

     

       212
       212
       -
       	// Parse header to get the claimed algorithm (for validation)

     

       213
       213
       -
       	header, err := ParseJWTHeader(tokenString)

     

       214
       214
       -
       	if err != nil {

     

       215
       215
       -
       		return nil, err

     

       216
       216
       -
       	}

     

       217
       217
       -
       

     

       218
       218
       -
       	// SECURITY: Determine verification method based on token characteristics

     

       219
       219
       -
       	// 1. Tokens with `kid` MUST use asymmetric verification (supports federation)

     

       220
       220
       -
       	// 2. Tokens without `kid` can use HS256 only from whitelisted issuers (your own PDS)

     

       221
       221
       -
       	useHS256 := shouldUseHS256(header, claims.Issuer)

     

       222
       222
       -
       

     

       223
       223
       -
       	if useHS256 {

     

       224
       224
       -
       		// Verify token actually claims to use HS256

     

       225
       225
       -
       		if header.Alg != AlgorithmHS256 {

     

       226
       226
       -
       			return nil, fmt.Errorf("expected HS256 for issuer %s but token uses %s", claims.Issuer, header.Alg)

     

       227
       227
       -
       		}

     

       228
       228
       -
       		return verifyHS256Token(tokenString)

     

       229
       229
       -
       	}

     

       230
       230
       -
       

     

       231
       231
       -
       	// Token must use asymmetric verification

     

       232
       232
       -
       	// Reject HS256 tokens that don't meet the criteria above

     

       233
       233
       -
       	if header.Alg == AlgorithmHS256 {

     

       234
       234
       -
       		if header.Kid != "" {

     

       235
       235
       -
       			return nil, fmt.Errorf("HS256 tokens with kid must use asymmetric verification")

     

       236
       236
       -
       		}

     

       237
       237
       -
       		return nil, fmt.Errorf("HS256 not allowed for issuer %s (not in HS256_ISSUERS whitelist)", claims.Issuer)

     

       238
       238
       -
       	}

     

       239
       239
       -
       

     

       240
       240
       -
       	// For RSA/ECDSA, fetch public key from JWKS and verify

     

       241
       241
       -
       	return verifyAsymmetricToken(ctx, tokenString, claims.Issuer, keyFetcher)

     

       242
       242
       -
       }

     

       243
       243
       -
       

     

       244
       244
       -
       // verifyHS256Token verifies a JWT using HMAC-SHA256 with the shared secret

     

       245
       245
       -
       func verifyHS256Token(tokenString string) (*Claims, error) {

     

       246
       246
       -
       	cfg := getConfig()

     

       247
       247
       -
       	if len(cfg.pdsJWTSecret) == 0 {

     

       248
       248
       -
       		return nil, fmt.Errorf("HS256 verification failed: PDS_JWT_SECRET not configured")

     

       249
       249
       -
       	}

     

       250
       250
       -
       

     

       251
       251
       -
       	token, err := jwt.ParseWithClaims(tokenString, &Claims{}, func(token *jwt.Token) (interface{}, error) {

     

       252
       252
       -
       		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {

     

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

     

       254
       254
       -
       		}

     

       255
       255
       -
       		return cfg.pdsJWTSecret, nil

     

       256
       256
       -
       	})

     

       257
       257
       -
       	if err != nil {

     

       258
       258
       -
       		return nil, fmt.Errorf("HS256 verification failed: %w", err)

     

       259
       259
       -
       	}

     

       260
       260
       -
       

     

       261
       261
       -
       	if !token.Valid {

     

       262
       262
       -
       		return nil, fmt.Errorf("HS256 verification failed: token signature invalid")

     

       263
       263
       -
       	}

     

       264
       264
       -
       

     

       265
       265
       -
       	verifiedClaims, ok := token.Claims.(*Claims)

     

       266
       266
       -
       	if !ok {

     

       267
       267
       -
       		return nil, fmt.Errorf("HS256 verification failed: invalid claims type")

     

       268
       268
       -
       	}

     

       269
       269
       -
       

     

       270
       270
       -
       	if err := validateClaims(verifiedClaims); err != nil {

     

       271
       271
       -
       		return nil, err

     

       272
       272
       -
       	}

     

       273
       273
       -
       

     

       274
       274
       -
       	return verifiedClaims, nil

     

       275
       275
       -
       }

     

       276
       276
       -
       

     

       277
       277
       -
       // verifyAsymmetricToken verifies a JWT using RSA or ECDSA with a public key from JWKS.

     

       278
       278
       -
       // For ES256K (secp256k1), uses indigo's crypto package since golang-jwt doesn't support it.

     

       279
       279
       -
       func verifyAsymmetricToken(ctx context.Context, tokenString, issuer string, keyFetcher JWKSFetcher) (*Claims, error) {

     

       280
       280
       -
       	// Parse header to check algorithm

     

       281
       281
       -
       	header, err := ParseJWTHeader(tokenString)

     

       282
       282
       -
       	if err != nil {

     

       283
       283
       -
       		return nil, fmt.Errorf("failed to parse JWT header: %w", err)

     

       284
       284
       -
       	}

     

       285
       285
       -
       

     

       286
       286
       -
       	// ES256K (secp256k1) requires special handling via indigo's crypto package

     

       287
       287
       -
       	// golang-jwt doesn't recognize ES256K as a valid signing method

     

       288
       288
       -
       	if header.Alg == "ES256K" {

     

       289
       289
       -
       		return verifyES256KToken(ctx, tokenString, issuer, keyFetcher)

     

       290
       290
       -
       	}

     

       291
       291
       -
       

     

       292
       292
       -
       	// For standard algorithms (ES256, ES384, ES512, RS256, etc.), use golang-jwt

     

       293
       293
       -
       	publicKey, err := keyFetcher.FetchPublicKey(ctx, issuer, tokenString)

     

       294
       294
       -
       	if err != nil {

     

       295
       295
       -
       		return nil, fmt.Errorf("failed to fetch public key: %w", err)

     

       296
       296
       -
       	}

     

       297
       297
       -
       

     

       298
       298
       -
       	token, err := jwt.ParseWithClaims(tokenString, &Claims{}, func(token *jwt.Token) (interface{}, error) {

     

       299
       299
       -
       		// Validate signing method - support both RSA and ECDSA (atProto uses ES256 primarily)

     

       300
       300
       -
       		switch token.Method.(type) {

     

       301
       301
       -
       		case *jwt.SigningMethodRSA, *jwt.SigningMethodECDSA:

     

       302
       302
       -
       			// Valid signing methods for atProto

     

       303
       303
       -
       		default:

     

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

     

       305
       305
       -
       		}

     

       306
       306
       -
       		return publicKey, nil

     

       307
       307
       -
       	})

     

       308
       308
       -
       	if err != nil {

     

       309
       309
       -
       		return nil, fmt.Errorf("asymmetric verification failed: %w", err)

     

       310
       310
       -
       	}

     

       311
       311
       -
       

     

       312
       312
       -
       	if !token.Valid {

     

       313
       313
       -
       		return nil, fmt.Errorf("asymmetric verification failed: token signature invalid")

     

       314
       314
       -
       	}

     

       315
       315
       -
       

     

       316
       316
       -
       	verifiedClaims, ok := token.Claims.(*Claims)

     

       317
       317
       -
       	if !ok {

     

       318
       318
       -
       		return nil, fmt.Errorf("asymmetric verification failed: invalid claims type")

     

       319
       319
       -
       	}

     

       320
       320
       -
       

     

       321
       321
       -
       	if err := validateClaims(verifiedClaims); err != nil {

     

       322
       322
       -
       		return nil, err

     

       323
       323
       -
       	}

     

       324
       324
       -
       

     

       325
       325
       -
       	return verifiedClaims, nil

     

       326
       326
       -
       }

     

       327
       327
       -
       

     

       328
       328
       -
       // verifyES256KToken verifies a JWT signed with ES256K (secp256k1) using indigo's crypto package.

     

       329
       329
       -
       // This is necessary because golang-jwt doesn't support ES256K as a signing method.

     

       330
       330
       -
       func verifyES256KToken(ctx context.Context, tokenString, issuer string, keyFetcher JWKSFetcher) (*Claims, error) {

     

       331
       331
       -
       	// Fetch the public key - for ES256K, the fetcher returns a JWK map or indigo PublicKey

     

       332
       332
       -
       	keyData, err := keyFetcher.FetchPublicKey(ctx, issuer, tokenString)

     

       333
       333
       -
       	if err != nil {

     

       334
       334
       -
       		return nil, fmt.Errorf("failed to fetch public key for ES256K: %w", err)

     

       335
       335
       -
       	}

     

       336
       336
       -
       

     

       337
       337
       -
       	// Convert to indigo PublicKey based on what the fetcher returned

     

       338
       338
       -
       	var pubKey indigoCrypto.PublicKey

     

       339
       339
       -
       	switch k := keyData.(type) {

     

       340
       340
       -
       	case indigoCrypto.PublicKey:

     

       341
       341
       -
       		// Already an indigo PublicKey (from DIDKeyFetcher or updated JWKSFetcher)

     

       342
       342
       -
       		pubKey = k

     

       343
       343
       -
       	case map[string]interface{}:

     

       344
       344
       -
       		// Raw JWK map - parse with indigo

     

       345
       345
       -
       		pubKey, err = parseJWKMapToIndigoPublicKey(k)

     

       346
       346
       -
       		if err != nil {

     

       347
       347
       -
       			return nil, fmt.Errorf("failed to parse ES256K JWK: %w", err)

     

       348
       348
       -
       		}

     

       349
       349
       -
       	default:

     

       350
       350
       -
       		return nil, fmt.Errorf("ES256K verification requires indigo PublicKey or JWK map, got %T", keyData)

     

       351
       351
       -
       	}

     

       352
       352
       -
       

     

       353
       353
       -
       	// Verify signature using indigo

     

       354
       354
       -
       	if err := verifyJWTSignatureWithIndigoKey(tokenString, pubKey); err != nil {

     

       355
       355
       -
       		return nil, fmt.Errorf("ES256K signature verification failed: %w", err)

     

       356
       356
       -
       	}

     

       357
       357
       -
       

     

       358
       358
       -
       	// Parse claims (signature already verified)

     

       359
       359
       -
       	claims, err := parseJWTClaimsManually(tokenString)

     

       360
       360
       -
       	if err != nil {

     

       361
       361
       -
       		return nil, fmt.Errorf("failed to parse ES256K JWT claims: %w", err)

     

       362
       362
       -
       	}

     

       363
       363
       -
       

     

       364
       364
       -
       	if err := validateClaims(claims); err != nil {

     

       365
       365
       -
       		return nil, err

     

       366
       366
       -
       	}

     

       367
       367
       -
       

     

       368
       368
       -
       	return claims, nil

     

       369
       369
       -
       }

     

       370
       370
       -
       

     

       371
       371
       -
       // parseJWKMapToIndigoPublicKey converts a JWK map to an indigo PublicKey.

     

       372
       372
       -
       // This uses indigo's crypto package which supports all atProto curves including secp256k1.

     

       373
       373
       -
       func parseJWKMapToIndigoPublicKey(jwkMap map[string]interface{}) (indigoCrypto.PublicKey, error) {

     

       374
       374
       -
       	// Convert map to JSON bytes for indigo's parser

     

       375
       375
       -
       	jwkBytes, err := json.Marshal(jwkMap)

     

       376
       376
       -
       	if err != nil {

     

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

     

       378
       378
       -
       	}

     

       379
       379
       -
       

     

       380
       380
       -
       	// Parse with indigo's crypto package - supports all atProto curves

     

       381
       381
       -
       	pubKey, err := indigoCrypto.ParsePublicJWKBytes(jwkBytes)

     

       382
       382
       -
       	if err != nil {

     

       383
       383
       -
       		return nil, fmt.Errorf("failed to parse JWK with indigo: %w", err)

     

       384
       384
       -
       	}

     

       385
       385
       -
       

     

       386
       386
       -
       	return pubKey, nil

     

       387
       387
       -
       }

     

       388
       388
       -
       

     

       389
       389
       -
       // verifyJWTSignatureWithIndigoKey verifies a JWT signature using indigo's crypto package.

     

       390
       390
       -
       // This works for all ECDSA algorithms including ES256K (secp256k1).

     

       391
       391
       -
       func verifyJWTSignatureWithIndigoKey(tokenString string, pubKey indigoCrypto.PublicKey) error {

     

       392
       392
       -
       	parts := strings.Split(tokenString, ".")

     

       393
       393
       -
       	if len(parts) != 3 {

     

       394
       394
       -
       		return fmt.Errorf("invalid JWT format: expected 3 parts, got %d", len(parts))

     

       395
       395
       -
       	}

     

       396
       396
       -
       

     

       397
       397
       -
       	// The signing input is "header.payload" (without decoding)

     

       398
       398
       -
       	signingInput := parts[0] + "." + parts[1]

     

       399
       399
       -
       

     

       400
       400
       -
       	// Decode the signature from base64url

     

       401
       401
       -
       	signature, err := base64.RawURLEncoding.DecodeString(parts[2])

     

       402
       402
       -
       	if err != nil {

     

       403
       403
       -
       		return fmt.Errorf("failed to decode JWT signature: %w", err)

     

       404
       404
       -
       	}

     

       405
       405
       -
       

     

       406
       406
       -
       	// Use indigo's verification - HashAndVerifyLenient handles hashing internally

     

       407
       407
       -
       	// and accepts both low-S and high-S signatures for maximum compatibility

     

       408
       408
       -
       	if err := pubKey.HashAndVerifyLenient([]byte(signingInput), signature); err != nil {

     

       409
       409
       -
       		return fmt.Errorf("signature verification failed: %w", err)

     

       410
       410
       -
       	}

     

       411
       411
       -
       

     

       412
       412
       -
       	return nil

     

       413
       413
       -
       }

     

       414
       414
       -
       

     

       415
       415
       -
       // parseJWTClaimsManually parses JWT claims without using golang-jwt.

     

       416
       416
       -
       // This is used for ES256K tokens where golang-jwt would reject the algorithm.

     

       417
       417
       -
       func parseJWTClaimsManually(tokenString string) (*Claims, error) {

     

       418
       418
       -
       	parts := strings.Split(tokenString, ".")

     

       419
       419
       -
       	if len(parts) != 3 {

     

       420
       420
       -
       		return nil, fmt.Errorf("invalid JWT format: expected 3 parts, got %d", len(parts))

     

       421
       421
       -
       	}

     

       422
       422
       -
       

     

       423
       423
       -
       	// Decode claims

     

       424
       424
       -
       	claimsBytes, err := base64.RawURLEncoding.DecodeString(parts[1])

     

       425
       425
       -
       	if err != nil {

     

       426
       426
       -
       		return nil, fmt.Errorf("failed to decode JWT claims: %w", err)

     

       427
       427
       -
       	}

     

       428
       428
       -
       

     

       429
       429
       -
       	// Parse into raw map first

     

       430
       430
       -
       	var rawClaims map[string]interface{}

     

       431
       431
       -
       	if err := json.Unmarshal(claimsBytes, &rawClaims); err != nil {

     

       432
       432
       -
       		return nil, fmt.Errorf("failed to parse JWT claims: %w", err)

     

       433
       433
       -
       	}

     

       434
       434
       -
       

     

       435
       435
       -
       	// Build Claims struct

     

       436
       436
       -
       	claims := &Claims{}

     

       437
       437
       -
       

     

       438
       438
       -
       	// Extract sub (subject/DID)

     

       439
       439
       -
       	if sub, ok := rawClaims["sub"].(string); ok {

     

       440
       440
       -
       		claims.Subject = sub

     

       441
       441
       -
       	}

     

       442
       442
       -
       

     

       443
       443
       -
       	// Extract iss (issuer)

     

       444
       444
       -
       	if iss, ok := rawClaims["iss"].(string); ok {

     

       445
       445
       -
       		claims.Issuer = iss

     

       446
       446
       -
       	}

     

       447
       447
       -
       

     

       448
       448
       -
       	// Extract aud (audience) - can be string or array

     

       449
       449
       -
       	switch aud := rawClaims["aud"].(type) {

     

       450
       450
       -
       	case string:

     

       451
       451
       -
       		claims.Audience = jwt.ClaimStrings{aud}

     

       452
       452
       -
       	case []interface{}:

     

       453
       453
       -
       		for _, a := range aud {

     

       454
       454
       -
       			if s, ok := a.(string); ok {

     

       455
       455
       -
       				claims.Audience = append(claims.Audience, s)

     

       456
       456
       -
       			}

     

       457
       457
       -
       		}

     

       458
       458
       -
       	}

     

       459
       459
       -
       

     

       460
       460
       -
       	// Extract exp (expiration)

     

       461
       461
       -
       	if exp, ok := rawClaims["exp"].(float64); ok {

     

       462
       462
       -
       		t := time.Unix(int64(exp), 0)

     

       463
       463
       -
       		claims.ExpiresAt = jwt.NewNumericDate(t)

     

       464
       464
       -
       	}

     

       465
       465
       -
       

     

       466
       466
       -
       	// Extract iat (issued at)

     

       467
       467
       -
       	if iat, ok := rawClaims["iat"].(float64); ok {

     

       468
       468
       -
       		t := time.Unix(int64(iat), 0)

     

       469
       469
       -
       		claims.IssuedAt = jwt.NewNumericDate(t)

     

       470
       470
       -
       	}

     

       471
       471
       -
       

     

       472
       472
       -
       	// Extract nbf (not before)

     

       473
       473
       -
       	if nbf, ok := rawClaims["nbf"].(float64); ok {

     

       474
       474
       -
       		t := time.Unix(int64(nbf), 0)

     

       475
       475
       -
       		claims.NotBefore = jwt.NewNumericDate(t)

     

       476
       476
       -
       	}

     

       477
       477
       -
       

     

       478
       478
       -
       	// Extract jti (JWT ID)

     

       479
       479
       -
       	if jti, ok := rawClaims["jti"].(string); ok {

     

       480
       480
       -
       		claims.ID = jti

     

       481
       481
       -
       	}

     

       482
       482
       -
       

     

       483
       483
       -
       	// Extract scope

     

       484
       484
       -
       	if scope, ok := rawClaims["scope"].(string); ok {

     

       485
       485
       -
       		claims.Scope = scope

     

       486
       486
       -
       	}

     

       487
       487
       -
       

     

       488
       488
       -
       	// Extract cnf (confirmation) for DPoP binding

     

       489
       489
       -
       	if cnf, ok := rawClaims["cnf"].(map[string]interface{}); ok {

     

       490
       490
       -
       		claims.Confirmation = cnf

     

       491
       491
       -
       	}

     

       492
       492
       -
       

     

       493
       493
       -
       	return claims, nil

     

       494
       494
       -
       }

     

       495
       495
       -
       

     

       496
       496
       -
       // validateClaims performs additional validation on JWT claims

     

       497
       497
       -
       func validateClaims(claims *Claims) error {

     

       498
       498
       -
       	now := time.Now()

     

       499
       499
       -
       

     

       500
       500
       -
       	// Check expiration

     

       501
       501
       -
       	if claims.ExpiresAt != nil && claims.ExpiresAt.Before(now) {

     

       502
       502
       -
       		return fmt.Errorf("token has expired")

     

       503
       503
       -
       	}

     

       504
       504
       -
       

     

       505
       505
       -
       	// Check not before

     

       506
       506
       -
       	if claims.NotBefore != nil && claims.NotBefore.After(now) {

     

       507
       507
       -
       		return fmt.Errorf("token not yet valid")

     

       508
       508
       -
       	}

     

       509
       509
       -
       

     

       510
       510
       -
       	// Validate DID format in sub claim

     

       511
       511
       -
       	if !strings.HasPrefix(claims.Subject, "did:") {

     

       512
       512
       -
       		return fmt.Errorf("invalid DID format in 'sub' claim: %s", claims.Subject)

     

       513
       513
       -
       	}

     

       514
       514
       -
       

     

       515
       515
       -
       	// Validate issuer is either an HTTPS URL or a DID

     

       516
       516
       -
       	// atProto uses DIDs (did:web:, did:plc:) or HTTPS URLs as issuer identifiers

     

       517
       517
       -
       	// In dev mode (IS_DEV_ENV=true), allow HTTP for local PDS testing

     

       518
       518
       -
       	isHTTP := strings.HasPrefix(claims.Issuer, "http://")

     

       519
       519
       -
       	isHTTPS := strings.HasPrefix(claims.Issuer, "https://")

     

       520
       520
       -
       	isDID := strings.HasPrefix(claims.Issuer, "did:")

     

       521
       521
       -
       

     

       522
       522
       -
       	if !isHTTPS && !isDID && !isHTTP {

     

       523
       523
       -
       		return fmt.Errorf("issuer must be HTTPS URL, HTTP URL (dev only), or DID, got: %s", claims.Issuer)

     

       524
       524
       -
       	}

     

       525
       525
       -
       

     

       526
       526
       -
       	// In production, reject HTTP issuers (only for non-dev environments)

     

       527
       527
       -
       	cfg := getConfig()

     

       528
       528
       -
       	if isHTTP && !cfg.isDevEnv {

     

       529
       529
       -
       		return fmt.Errorf("HTTP issuer not allowed in production, got: %s", claims.Issuer)

     

       530
       530
       -
       	}

     

       531
       531
       -
       

     

       532
       532
       -
       	// Parse to ensure it's a valid URL

     

       533
       533
       -
       	if _, err := url.Parse(claims.Issuer); err != nil {

     

       534
       534
       -
       		return fmt.Errorf("invalid issuer URL: %w", err)

     

       535
       535
       -
       	}

     

       536
       536
       -
       

     

       537
       537
       -
       	// Validate scope if present (lenient: allow empty, but reject wrong scopes)

     

       538
       538
       -
       	if claims.Scope != "" && !strings.Contains(claims.Scope, "atproto") {

     

       539
       539
       -
       		return fmt.Errorf("token missing required 'atproto' scope, got: %s", claims.Scope)

     

       540
       540
       -
       	}

     

       541
       541
       -
       

     

       542
       542
       -
       	return nil

     

       543
       543
       -
       }

     

       544
       544
       -
       

     

       545
       545
       -
       // JWKSFetcher defines the interface for fetching public keys from JWKS endpoints

     

       546
       546
       -
       // Returns interface{} to support both RSA and ECDSA keys

     

       547
       547
       -
       type JWKSFetcher interface {

     

       548
       548
       -
       	FetchPublicKey(ctx context.Context, issuer, token string) (interface{}, error)

     

       549
       549
       -
       }

     

       550
       550
       -
       

     

       551
       551
       -
       // JWK represents a JSON Web Key from a JWKS endpoint

     

       552
       552
       -
       // Supports both RSA and EC (ECDSA) keys

     

       553
       553
       -
       type JWK struct {

     

       554
       554
       -
       	Kid string `json:"kid"` // Key ID

     

       555
       555
       -
       	Kty string `json:"kty"` // Key type ("RSA" or "EC")

     

       556
       556
       -
       	Alg string `json:"alg"` // Algorithm (e.g., "RS256", "ES256")

     

       557
       557
       -
       	Use string `json:"use"` // Public key use (should be "sig" for signatures)

     

       558
       558
       -
       	// RSA fields

     

       559
       559
       -
       	N string `json:"n,omitempty"` // RSA modulus

     

       560
       560
       -
       	E string `json:"e,omitempty"` // RSA exponent

     

       561
       561
       -
       	// EC fields

     

       562
       562
       -
       	Crv string `json:"crv,omitempty"` // EC curve (e.g., "P-256")

     

       563
       563
       -
       	X   string `json:"x,omitempty"`   // EC x coordinate

     

       564
       564
       -
       	Y   string `json:"y,omitempty"`   // EC y coordinate

     

       565
       565
       -
       }

     

       566
       566
       -
       

     

       567
       567
       -
       // ToPublicKey converts a JWK to a public key (RSA, ECDSA, or indigo for secp256k1).

     

       568
       568
       -
       //

     

       569
       569
       -
       // Returns:

     

       570
       570
       -
       //   - *rsa.PublicKey for RSA keys

     

       571
       571
       -
       //   - *ecdsa.PublicKey for NIST EC curves (P-256, P-384, P-521)

     

       572
       572
       -
       //   - map[string]interface{} for secp256k1 (ES256K) - parsed by indigo

     

       573
       573
       -
       func (j *JWK) ToPublicKey() (interface{}, error) {

     

       574
       574
       -
       	switch j.Kty {

     

       575
       575
       -
       	case "RSA":

     

       576
       576
       -
       		return j.toRSAPublicKey()

     

       577
       577
       -
       	case "EC":

     

       578
       578
       -
       		// For secp256k1, return raw JWK map for indigo to parse

     

       579
       579
       -
       		if j.Crv == "secp256k1" {

     

       580
       580
       -
       			return j.toJWKMap(), nil

     

       581
       581
       -
       		}

     

       582
       582
       -
       		return j.toECPublicKey()

     

       583
       583
       -
       	default:

     

       584
       584
       -
       		return nil, fmt.Errorf("unsupported key type: %s", j.Kty)

     

       585
       585
       -
       	}

     

       586
       586
       -
       }

     

       587
       587
       -
       

     

       588
       588
       -
       // toJWKMap converts the JWK struct to a map for indigo parsing

     

       589
       589
       -
       func (j *JWK) toJWKMap() map[string]interface{} {

     

       590
       590
       -
       	m := map[string]interface{}{

     

       591
       591
       -
       		"kty": j.Kty,

     

       592
       592
       -
       	}

     

       593
       593
       -
       	if j.Kid != "" {

     

       594
       594
       -
       		m["kid"] = j.Kid

     

       595
       595
       -
       	}

     

       596
       596
       -
       	if j.Alg != "" {

     

       597
       597
       -
       		m["alg"] = j.Alg

     

       598
       598
       -
       	}

     

       599
       599
       -
       	if j.Use != "" {

     

       600
       600
       -
       		m["use"] = j.Use

     

       601
       601
       -
       	}

     

       602
       602
       -
       	// RSA fields

     

       603
       603
       -
       	if j.N != "" {

     

       604
       604
       -
       		m["n"] = j.N

     

       605
       605
       -
       	}

     

       606
       606
       -
       	if j.E != "" {

     

       607
       607
       -
       		m["e"] = j.E

     

       608
       608
       -
       	}

     

       609
       609
       -
       	// EC fields

     

       610
       610
       -
       	if j.Crv != "" {

     

       611
       611
       -
       		m["crv"] = j.Crv

     

       612
       612
       -
       	}

     

       613
       613
       -
       	if j.X != "" {

     

       614
       614
       -
       		m["x"] = j.X

     

       615
       615
       -
       	}

     

       616
       616
       -
       	if j.Y != "" {

     

       617
       617
       -
       		m["y"] = j.Y

     

       618
       618
       -
       	}

     

       619
       619
       -
       	return m

     

       620
       620
       -
       }

     

       621
       621
       -
       

     

       622
       622
       -
       // toRSAPublicKey converts a JWK to an RSA public key

     

       623
       623
       -
       func (j *JWK) toRSAPublicKey() (*rsa.PublicKey, error) {

     

       624
       624
       -
       	// Decode modulus

     

       625
       625
       -
       	nBytes, err := base64.RawURLEncoding.DecodeString(j.N)

     

       626
       626
       -
       	if err != nil {

     

       627
       627
       -
       		return nil, fmt.Errorf("failed to decode RSA modulus: %w", err)

     

       628
       628
       -
       	}

     

       629
       629
       -
       

     

       630
       630
       -
       	// Decode exponent

     

       631
       631
       -
       	eBytes, err := base64.RawURLEncoding.DecodeString(j.E)

     

       632
       632
       -
       	if err != nil {

     

       633
       633
       -
       		return nil, fmt.Errorf("failed to decode RSA exponent: %w", err)

     

       634
       634
       -
       	}

     

       635
       635
       -
       

     

       636
       636
       -
       	// Convert exponent to int

     

       637
       637
       -
       	var eInt int

     

       638
       638
       -
       	for _, b := range eBytes {

     

       639
       639
       -
       		eInt = eInt*256 + int(b)

     

       640
       640
       -
       	}

     

       641
       641
       -
       

     

       642
       642
       -
       	return &rsa.PublicKey{

     

       643
       643
       -
       		N: new(big.Int).SetBytes(nBytes),

     

       644
       644
       -
       		E: eInt,

     

       645
       645
       -
       	}, nil

     

       646
       646
       -
       }

     

       647
       647
       -
       

     

       648
       648
       -
       // toECPublicKey converts a JWK to an ECDSA public key

     

       649
       649
       -
       func (j *JWK) toECPublicKey() (*ecdsa.PublicKey, error) {

     

       650
       650
       -
       	// Determine curve

     

       651
       651
       -
       	var curve elliptic.Curve

     

       652
       652
       -
       	switch j.Crv {

     

       653
       653
       -
       	case "P-256":

     

       654
       654
       -
       		curve = elliptic.P256()

     

       655
       655
       -
       	case "P-384":

     

       656
       656
       -
       		curve = elliptic.P384()

     

       657
       657
       -
       	case "P-521":

     

       658
       658
       -
       		curve = elliptic.P521()

     

       659
       659
       -
       	default:

     

       660
       660
       -
       		return nil, fmt.Errorf("unsupported EC curve: %s", j.Crv)

     

       661
       661
       -
       	}

     

       662
       662
       -
       

     

       663
       663
       -
       	// Decode X coordinate

     

       664
       664
       -
       	xBytes, err := base64.RawURLEncoding.DecodeString(j.X)

     

       665
       665
       -
       	if err != nil {

     

       666
       666
       -
       		return nil, fmt.Errorf("failed to decode EC x coordinate: %w", err)

     

       667
       667
       -
       	}

     

       668
       668
       -
       

     

       669
       669
       -
       	// Decode Y coordinate

     

       670
       670
       -
       	yBytes, err := base64.RawURLEncoding.DecodeString(j.Y)

     

       671
       671
       -
       	if err != nil {

     

       672
       672
       -
       		return nil, fmt.Errorf("failed to decode EC y coordinate: %w", err)

     

       673
       673
       -
       	}

     

       674
       674
       -
       

     

       675
       675
       -
       	return &ecdsa.PublicKey{

     

       676
       676
       -
       		Curve: curve,

     

       677
       677
       -
       		X:     new(big.Int).SetBytes(xBytes),

     

       678
       678
       -
       		Y:     new(big.Int).SetBytes(yBytes),

     

       679
       679
       -
       	}, nil

     

       680
       680
       -
       }

     

       681
       681
       -
       

     

       682
       682
       -
       // JWKS represents a JSON Web Key Set

     

       683
       683
       -
       type JWKS struct {

     

       684
       684
       -
       	Keys []JWK `json:"keys"`

     

       685
       685
       -
       }

     

       686
       686
       -
       

     

       687
       687
       -
       // FindKeyByID finds a key in the JWKS by its key ID

     

       688
       688
       -
       func (j *JWKS) FindKeyByID(kid string) (*JWK, error) {

     

       689
       689
       -
       	for _, key := range j.Keys {

     

       690
       690
       -
       		if key.Kid == kid {

     

       691
       691
       -
       			return &key, nil

     

       692
       692
       -
       		}

     

       693
       693
       -
       	}

     

       694
       694
       -
       	return nil, fmt.Errorf("key with kid %s not found", kid)

     

       695
       695
       -
       }

     

       696
       696
       -
       

     

       697
       697
       -
       // ExtractKeyID extracts the key ID from a JWT token header

     

       698
       698
       -
       func ExtractKeyID(tokenString string) (string, error) {

     

       699
       699
       -
       	header, err := ParseJWTHeader(tokenString)

     

       700
       700
       -
       	if err != nil {

     

       701
       701
       -
       		return "", err

     

       702
       702
       -
       	}

     

       703
       703
       -
       

     

       704
       704
       -
       	if header.Kid == "" {

     

       705
       705
       -
       		return "", fmt.Errorf("missing kid in token header")

     

       706
       706
       -
       	}

     

       707
       707
       -
       

     

       708
       708
       -
       	return header.Kid, nil

     

       709
       709
       -
       }

-496

internal/atproto/auth/jwt_test.go

···

       1
       1
       -
       package auth

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"testing"

     

       6
       6
       -
       	"time"

     

       7
       7
       -
       

     

       8
       8
       -
       	"github.com/golang-jwt/jwt/v5"

     

       9
       9
       -
       )

     

       10
       10
       -
       

     

       11
       11
       -
       func TestParseJWT(t *testing.T) {

     

       12
       12
       -
       	// Create a test JWT token

     

       13
       13
       -
       	claims := &Claims{

     

       14
       14
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       15
       15
       -
       			Subject:   "did:plc:test123",

     

       16
       16
       -
       			Issuer:    "https://test-pds.example.com",

     

       17
       17
       -
       			ExpiresAt: jwt.NewNumericDate(time.Now().Add(1 * time.Hour)),

     

       18
       18
       -
       			IssuedAt:  jwt.NewNumericDate(time.Now()),

     

       19
       19
       -
       		},

     

       20
       20
       -
       		Scope: "atproto transition:generic",

     

       21
       21
       -
       	}

     

       22
       22
       -
       

     

       23
       23
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)

     

       24
       24
       -
       	tokenString, err := token.SignedString([]byte("test-secret"))

     

       25
       25
       -
       	if err != nil {

     

       26
       26
       -
       		t.Fatalf("Failed to create test token: %v", err)

     

       27
       27
       -
       	}

     

       28
       28
       -
       

     

       29
       29
       -
       	// Test parsing

     

       30
       30
       -
       	parsedClaims, err := ParseJWT(tokenString)

     

       31
       31
       -
       	if err != nil {

     

       32
       32
       -
       		t.Fatalf("ParseJWT failed: %v", err)

     

       33
       33
       -
       	}

     

       34
       34
       -
       

     

       35
       35
       -
       	if parsedClaims.Subject != "did:plc:test123" {

     

       36
       36
       -
       		t.Errorf("Expected subject 'did:plc:test123', got '%s'", parsedClaims.Subject)

     

       37
       37
       -
       	}

     

       38
       38
       -
       

     

       39
       39
       -
       	if parsedClaims.Issuer != "https://test-pds.example.com" {

     

       40
       40
       -
       		t.Errorf("Expected issuer 'https://test-pds.example.com', got '%s'", parsedClaims.Issuer)

     

       41
       41
       -
       	}

     

       42
       42
       -
       

     

       43
       43
       -
       	if parsedClaims.Scope != "atproto transition:generic" {

     

       44
       44
       -
       		t.Errorf("Expected scope 'atproto transition:generic', got '%s'", parsedClaims.Scope)

     

       45
       45
       -
       	}

     

       46
       46
       -
       }

     

       47
       47
       -
       

     

       48
       48
       -
       func TestParseJWT_MissingSubject(t *testing.T) {

     

       49
       49
       -
       	// Create a token without subject

     

       50
       50
       -
       	claims := &Claims{

     

       51
       51
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       52
       52
       -
       			Issuer:    "https://test-pds.example.com",

     

       53
       53
       -
       			ExpiresAt: jwt.NewNumericDate(time.Now().Add(1 * time.Hour)),

     

       54
       54
       -
       		},

     

       55
       55
       -
       	}

     

       56
       56
       -
       

     

       57
       57
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)

     

       58
       58
       -
       	tokenString, err := token.SignedString([]byte("test-secret"))

     

       59
       59
       -
       	if err != nil {

     

       60
       60
       -
       		t.Fatalf("Failed to create test token: %v", err)

     

       61
       61
       -
       	}

     

       62
       62
       -
       

     

       63
       63
       -
       	// Test parsing - should fail

     

       64
       64
       -
       	_, err = ParseJWT(tokenString)

     

       65
       65
       -
       	if err == nil {

     

       66
       66
       -
       		t.Error("Expected error for missing subject, got nil")

     

       67
       67
       -
       	}

     

       68
       68
       -
       }

     

       69
       69
       -
       

     

       70
       70
       -
       func TestParseJWT_MissingIssuer(t *testing.T) {

     

       71
       71
       -
       	// Create a token without issuer

     

       72
       72
       -
       	claims := &Claims{

     

       73
       73
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       74
       74
       -
       			Subject:   "did:plc:test123",

     

       75
       75
       -
       			ExpiresAt: jwt.NewNumericDate(time.Now().Add(1 * time.Hour)),

     

       76
       76
       -
       		},

     

       77
       77
       -
       	}

     

       78
       78
       -
       

     

       79
       79
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)

     

       80
       80
       -
       	tokenString, err := token.SignedString([]byte("test-secret"))

     

       81
       81
       -
       	if err != nil {

     

       82
       82
       -
       		t.Fatalf("Failed to create test token: %v", err)

     

       83
       83
       -
       	}

     

       84
       84
       -
       

     

       85
       85
       -
       	// Test parsing - should fail

     

       86
       86
       -
       	_, err = ParseJWT(tokenString)

     

       87
       87
       -
       	if err == nil {

     

       88
       88
       -
       		t.Error("Expected error for missing issuer, got nil")

     

       89
       89
       -
       	}

     

       90
       90
       -
       }

     

       91
       91
       -
       

     

       92
       92
       -
       func TestParseJWT_WithBearerPrefix(t *testing.T) {

     

       93
       93
       -
       	// Create a test JWT token

     

       94
       94
       -
       	claims := &Claims{

     

       95
       95
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       96
       96
       -
       			Subject:   "did:plc:test123",

     

       97
       97
       -
       			Issuer:    "https://test-pds.example.com",

     

       98
       98
       -
       			ExpiresAt: jwt.NewNumericDate(time.Now().Add(1 * time.Hour)),

     

       99
       99
       -
       		},

     

       100
       100
       -
       	}

     

       101
       101
       -
       

     

       102
       102
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)

     

       103
       103
       -
       	tokenString, err := token.SignedString([]byte("test-secret"))

     

       104
       104
       -
       	if err != nil {

     

       105
       105
       -
       		t.Fatalf("Failed to create test token: %v", err)

     

       106
       106
       -
       	}

     

       107
       107
       -
       

     

       108
       108
       -
       	// Test parsing with Bearer prefix

     

       109
       109
       -
       	parsedClaims, err := ParseJWT("Bearer " + tokenString)

     

       110
       110
       -
       	if err != nil {

     

       111
       111
       -
       		t.Fatalf("ParseJWT failed with Bearer prefix: %v", err)

     

       112
       112
       -
       	}

     

       113
       113
       -
       

     

       114
       114
       -
       	if parsedClaims.Subject != "did:plc:test123" {

     

       115
       115
       -
       		t.Errorf("Expected subject 'did:plc:test123', got '%s'", parsedClaims.Subject)

     

       116
       116
       -
       	}

     

       117
       117
       -
       }

     

       118
       118
       -
       

     

       119
       119
       -
       func TestValidateClaims_Expired(t *testing.T) {

     

       120
       120
       -
       	claims := &Claims{

     

       121
       121
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       122
       122
       -
       			Subject:   "did:plc:test123",

     

       123
       123
       -
       			Issuer:    "https://test-pds.example.com",

     

       124
       124
       -
       			ExpiresAt: jwt.NewNumericDate(time.Now().Add(-1 * time.Hour)), // Expired

     

       125
       125
       -
       		},

     

       126
       126
       -
       	}

     

       127
       127
       -
       

     

       128
       128
       -
       	err := validateClaims(claims)

     

       129
       129
       -
       	if err == nil {

     

       130
       130
       -
       		t.Error("Expected error for expired token, got nil")

     

       131
       131
       -
       	}

     

       132
       132
       -
       }

     

       133
       133
       -
       

     

       134
       134
       -
       func TestValidateClaims_InvalidDID(t *testing.T) {

     

       135
       135
       -
       	claims := &Claims{

     

       136
       136
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       137
       137
       -
       			Subject:   "invalid-did-format",

     

       138
       138
       -
       			Issuer:    "https://test-pds.example.com",

     

       139
       139
       -
       			ExpiresAt: jwt.NewNumericDate(time.Now().Add(1 * time.Hour)),

     

       140
       140
       -
       		},

     

       141
       141
       -
       	}

     

       142
       142
       -
       

     

       143
       143
       -
       	err := validateClaims(claims)

     

       144
       144
       -
       	if err == nil {

     

       145
       145
       -
       		t.Error("Expected error for invalid DID format, got nil")

     

       146
       146
       -
       	}

     

       147
       147
       -
       }

     

       148
       148
       -
       

     

       149
       149
       -
       func TestExtractKeyID(t *testing.T) {

     

       150
       150
       -
       	// Create a test JWT token with kid in header

     

       151
       151
       -
       	token := jwt.New(jwt.SigningMethodRS256)

     

       152
       152
       -
       	token.Header["kid"] = "test-key-id"

     

       153
       153
       -
       	token.Claims = &Claims{

     

       154
       154
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       155
       155
       -
       			Subject: "did:plc:test123",

     

       156
       156
       -
       			Issuer:  "https://test-pds.example.com",

     

       157
       157
       -
       		},

     

       158
       158
       -
       	}

     

       159
       159
       -
       

     

       160
       160
       -
       	// Sign with a dummy RSA key (we just need a valid token structure)

     

       161
       161
       -
       	tokenString, err := token.SignedString([]byte("dummy"))

     

       162
       162
       -
       	if err == nil {

     

       163
       163
       -
       		// If it succeeds (shouldn't with wrong key type, but let's handle it)

     

       164
       164
       -
       		kid, err := ExtractKeyID(tokenString)

     

       165
       165
       -
       		if err != nil {

     

       166
       166
       -
       			t.Logf("ExtractKeyID failed (expected if signing fails): %v", err)

     

       167
       167
       -
       		} else if kid != "test-key-id" {

     

       168
       168
       -
       			t.Errorf("Expected kid 'test-key-id', got '%s'", kid)

     

       169
       169
       -
       		}

     

       170
       170
       -
       	}

     

       171
       171
       -
       }

     

       172
       172
       -
       

     

       173
       173
       -
       // === HS256 Verification Tests ===

     

       174
       174
       -
       

     

       175
       175
       -
       // mockJWKSFetcher is a mock implementation of JWKSFetcher for testing

     

       176
       176
       -
       type mockJWKSFetcher struct {

     

       177
       177
       -
       	publicKey interface{}

     

       178
       178
       -
       	err       error

     

       179
       179
       -
       }

     

       180
       180
       -
       

     

       181
       181
       -
       func (m *mockJWKSFetcher) FetchPublicKey(ctx context.Context, issuer, token string) (interface{}, error) {

     

       182
       182
       -
       	return m.publicKey, m.err

     

       183
       183
       -
       }

     

       184
       184
       -
       

     

       185
       185
       -
       func createHS256Token(t *testing.T, subject, issuer, secret string, expiry time.Duration) string {

     

       186
       186
       -
       	t.Helper()

     

       187
       187
       -
       	claims := &Claims{

     

       188
       188
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       189
       189
       -
       			Subject:   subject,

     

       190
       190
       -
       			Issuer:    issuer,

     

       191
       191
       -
       			ExpiresAt: jwt.NewNumericDate(time.Now().Add(expiry)),

     

       192
       192
       -
       			IssuedAt:  jwt.NewNumericDate(time.Now()),

     

       193
       193
       -
       		},

     

       194
       194
       -
       		Scope: "atproto transition:generic",

     

       195
       195
       -
       	}

     

       196
       196
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)

     

       197
       197
       -
       	tokenString, err := token.SignedString([]byte(secret))

     

       198
       198
       -
       	if err != nil {

     

       199
       199
       -
       		t.Fatalf("Failed to create test token: %v", err)

     

       200
       200
       -
       	}

     

       201
       201
       -
       	return tokenString

     

       202
       202
       -
       }

     

       203
       203
       -
       

     

       204
       204
       -
       func TestVerifyJWT_HS256_Valid(t *testing.T) {

     

       205
       205
       -
       	// Setup: Configure environment for HS256 verification

     

       206
       206
       -
       	secret := "test-jwt-secret-key-12345"

     

       207
       207
       -
       	issuer := "https://pds.coves.social"

     

       208
       208
       -
       

     

       209
       209
       -
       	ResetJWTConfigForTesting()

     

       210
       210
       -
       	t.Setenv("PDS_JWT_SECRET", secret)

     

       211
       211
       -
       	t.Setenv("HS256_ISSUERS", issuer)

     

       212
       212
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       213
       213
       -
       

     

       214
       214
       -
       	tokenString := createHS256Token(t, "did:plc:test123", issuer, secret, 1*time.Hour)

     

       215
       215
       -
       

     

       216
       216
       -
       	// Verify token

     

       217
       217
       -
       	claims, err := VerifyJWT(context.Background(), tokenString, &mockJWKSFetcher{})

     

       218
       218
       -
       	if err != nil {

     

       219
       219
       -
       		t.Fatalf("VerifyJWT failed for valid HS256 token: %v", err)

     

       220
       220
       -
       	}

     

       221
       221
       -
       

     

       222
       222
       -
       	if claims.Subject != "did:plc:test123" {

     

       223
       223
       -
       		t.Errorf("Expected subject 'did:plc:test123', got '%s'", claims.Subject)

     

       224
       224
       -
       	}

     

       225
       225
       -
       	if claims.Issuer != issuer {

     

       226
       226
       -
       		t.Errorf("Expected issuer '%s', got '%s'", issuer, claims.Issuer)

     

       227
       227
       -
       	}

     

       228
       228
       -
       }

     

       229
       229
       -
       

     

       230
       230
       -
       func TestVerifyJWT_HS256_WrongSecret(t *testing.T) {

     

       231
       231
       -
       	// Setup: Configure environment with one secret, sign with another

     

       232
       232
       -
       	issuer := "https://pds.coves.social"

     

       233
       233
       -
       

     

       234
       234
       -
       	ResetJWTConfigForTesting()

     

       235
       235
       -
       	t.Setenv("PDS_JWT_SECRET", "correct-secret")

     

       236
       236
       -
       	t.Setenv("HS256_ISSUERS", issuer)

     

       237
       237
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       238
       238
       -
       

     

       239
       239
       -
       	// Create token with wrong secret

     

       240
       240
       -
       	tokenString := createHS256Token(t, "did:plc:test123", issuer, "wrong-secret", 1*time.Hour)

     

       241
       241
       -
       

     

       242
       242
       -
       	// Verify should fail

     

       243
       243
       -
       	_, err := VerifyJWT(context.Background(), tokenString, &mockJWKSFetcher{})

     

       244
       244
       -
       	if err == nil {

     

       245
       245
       -
       		t.Error("Expected error for HS256 token with wrong secret, got nil")

     

       246
       246
       -
       	}

     

       247
       247
       -
       }

     

       248
       248
       -
       

     

       249
       249
       -
       func TestVerifyJWT_HS256_SecretNotConfigured(t *testing.T) {

     

       250
       250
       -
       	// Setup: Whitelist issuer but don't configure secret

     

       251
       251
       -
       	issuer := "https://pds.coves.social"

     

       252
       252
       -
       

     

       253
       253
       -
       	ResetJWTConfigForTesting()

     

       254
       254
       -
       	t.Setenv("PDS_JWT_SECRET", "") // Ensure secret is not set (empty = not configured)

     

       255
       255
       -
       	t.Setenv("HS256_ISSUERS", issuer)

     

       256
       256
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       257
       257
       -
       

     

       258
       258
       -
       	tokenString := createHS256Token(t, "did:plc:test123", issuer, "any-secret", 1*time.Hour)

     

       259
       259
       -
       

     

       260
       260
       -
       	// Verify should fail with descriptive error

     

       261
       261
       -
       	_, err := VerifyJWT(context.Background(), tokenString, &mockJWKSFetcher{})

     

       262
       262
       -
       	if err == nil {

     

       263
       263
       -
       		t.Error("Expected error when PDS_JWT_SECRET not configured, got nil")

     

       264
       264
       -
       	}

     

       265
       265
       -
       	if err != nil && !contains(err.Error(), "PDS_JWT_SECRET not configured") {

     

       266
       266
       -
       		t.Errorf("Expected error about PDS_JWT_SECRET not configured, got: %v", err)

     

       267
       267
       -
       	}

     

       268
       268
       -
       }

     

       269
       269
       -
       

     

       270
       270
       -
       // === Algorithm Confusion Attack Prevention Tests ===

     

       271
       271
       -
       

     

       272
       272
       -
       func TestVerifyJWT_AlgorithmConfusionAttack_HS256WithNonWhitelistedIssuer(t *testing.T) {

     

       273
       273
       -
       	// SECURITY TEST: This tests the algorithm confusion attack prevention

     

       274
       274
       -
       	// An attacker tries to use HS256 with an issuer that should use RS256/ES256

     

       275
       275
       -
       

     

       276
       276
       -
       	ResetJWTConfigForTesting()

     

       277
       277
       -
       	t.Setenv("PDS_JWT_SECRET", "some-secret")

     

       278
       278
       -
       	t.Setenv("HS256_ISSUERS", "https://trusted.example.com") // Different from token issuer

     

       279
       279
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       280
       280
       -
       

     

       281
       281
       -
       	// Create HS256 token with non-whitelisted issuer (simulating attack)

     

       282
       282
       -
       	tokenString := createHS256Token(t, "did:plc:attacker", "https://victim-pds.example.com", "some-secret", 1*time.Hour)

     

       283
       283
       -
       

     

       284
       284
       -
       	// Verify should fail because issuer is not in HS256 whitelist

     

       285
       285
       -
       	_, err := VerifyJWT(context.Background(), tokenString, &mockJWKSFetcher{})

     

       286
       286
       -
       	if err == nil {

     

       287
       287
       -
       		t.Error("SECURITY VULNERABILITY: HS256 token accepted for non-whitelisted issuer")

     

       288
       288
       -
       	}

     

       289
       289
       -
       	if err != nil && !contains(err.Error(), "not in HS256_ISSUERS whitelist") {

     

       290
       290
       -
       		t.Errorf("Expected error about HS256 not allowed for issuer, got: %v", err)

     

       291
       291
       -
       	}

     

       292
       292
       -
       }

     

       293
       293
       -
       

     

       294
       294
       -
       func TestVerifyJWT_AlgorithmConfusionAttack_EmptyWhitelist(t *testing.T) {

     

       295
       295
       -
       	// SECURITY TEST: When no issuers are whitelisted for HS256, all HS256 tokens should be rejected

     

       296
       296
       -
       

     

       297
       297
       -
       	ResetJWTConfigForTesting()

     

       298
       298
       -
       	t.Setenv("PDS_JWT_SECRET", "some-secret")

     

       299
       299
       -
       	t.Setenv("HS256_ISSUERS", "") // Empty whitelist

     

       300
       300
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       301
       301
       -
       

     

       302
       302
       -
       	tokenString := createHS256Token(t, "did:plc:test123", "https://any-pds.example.com", "some-secret", 1*time.Hour)

     

       303
       303
       -
       

     

       304
       304
       -
       	// Verify should fail because no issuers are whitelisted for HS256

     

       305
       305
       -
       	_, err := VerifyJWT(context.Background(), tokenString, &mockJWKSFetcher{})

     

       306
       306
       -
       	if err == nil {

     

       307
       307
       -
       		t.Error("SECURITY VULNERABILITY: HS256 token accepted with empty issuer whitelist")

     

       308
       308
       -
       	}

     

       309
       309
       -
       }

     

       310
       310
       -
       

     

       311
       311
       -
       func TestVerifyJWT_IssuerRequiresHS256ButTokenUsesRS256(t *testing.T) {

     

       312
       312
       -
       	// Test that issuer whitelisted for HS256 rejects tokens claiming to use RS256

     

       313
       313
       -
       	issuer := "https://pds.coves.social"

     

       314
       314
       -
       

     

       315
       315
       -
       	ResetJWTConfigForTesting()

     

       316
       316
       -
       	t.Setenv("PDS_JWT_SECRET", "test-secret")

     

       317
       317
       -
       	t.Setenv("HS256_ISSUERS", issuer)

     

       318
       318
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       319
       319
       -
       

     

       320
       320
       -
       	// Create RS256-signed token (can't actually sign without RSA key, but we can test the header check)

     

       321
       321
       -
       	claims := &Claims{

     

       322
       322
       -
       		RegisteredClaims: jwt.RegisteredClaims{

     

       323
       323
       -
       			Subject:   "did:plc:test123",

     

       324
       324
       -
       			Issuer:    issuer,

     

       325
       325
       -
       			ExpiresAt: jwt.NewNumericDate(time.Now().Add(1 * time.Hour)),

     

       326
       326
       -
       		},

     

       327
       327
       -
       	}

     

       328
       328
       -
       	token := jwt.NewWithClaims(jwt.SigningMethodRS256, claims)

     

       329
       329
       -
       	// This will create an invalid signature but valid header structure

     

       330
       330
       -
       	// The test should fail at algorithm check, not signature verification

     

       331
       331
       -
       	tokenString, _ := token.SignedString([]byte("dummy-key"))

     

       332
       332
       -
       

     

       333
       333
       -
       	if tokenString != "" {

     

       334
       334
       -
       		_, err := VerifyJWT(context.Background(), tokenString, &mockJWKSFetcher{})

     

       335
       335
       -
       		if err == nil {

     

       336
       336
       -
       			t.Error("Expected error when HS256 issuer receives non-HS256 token")

     

       337
       337
       -
       		}

     

       338
       338
       -
       	}

     

       339
       339
       -
       }

     

       340
       340
       -
       

     

       341
       341
       -
       // === ParseJWTHeader Tests ===

     

       342
       342
       -
       

     

       343
       343
       -
       func TestParseJWTHeader_Valid(t *testing.T) {

     

       344
       344
       -
       	tokenString := createHS256Token(t, "did:plc:test123", "https://test.example.com", "secret", 1*time.Hour)

     

       345
       345
       -
       

     

       346
       346
       -
       	header, err := ParseJWTHeader(tokenString)

     

       347
       347
       -
       	if err != nil {

     

       348
       348
       -
       		t.Fatalf("ParseJWTHeader failed: %v", err)

     

       349
       349
       -
       	}

     

       350
       350
       -
       

     

       351
       351
       -
       	if header.Alg != AlgorithmHS256 {

     

       352
       352
       -
       		t.Errorf("Expected alg '%s', got '%s'", AlgorithmHS256, header.Alg)

     

       353
       353
       -
       	}

     

       354
       354
       -
       }

     

       355
       355
       -
       

     

       356
       356
       -
       func TestParseJWTHeader_WithBearerPrefix(t *testing.T) {

     

       357
       357
       -
       	tokenString := createHS256Token(t, "did:plc:test123", "https://test.example.com", "secret", 1*time.Hour)

     

       358
       358
       -
       

     

       359
       359
       -
       	header, err := ParseJWTHeader("Bearer " + tokenString)

     

       360
       360
       -
       	if err != nil {

     

       361
       361
       -
       		t.Fatalf("ParseJWTHeader failed with Bearer prefix: %v", err)

     

       362
       362
       -
       	}

     

       363
       363
       -
       

     

       364
       364
       -
       	if header.Alg != AlgorithmHS256 {

     

       365
       365
       -
       		t.Errorf("Expected alg '%s', got '%s'", AlgorithmHS256, header.Alg)

     

       366
       366
       -
       	}

     

       367
       367
       -
       }

     

       368
       368
       -
       

     

       369
       369
       -
       func TestParseJWTHeader_InvalidFormat(t *testing.T) {

     

       370
       370
       -
       	testCases := []struct {

     

       371
       371
       -
       		name  string

     

       372
       372
       -
       		input string

     

       373
       373
       -
       	}{

     

       374
       374
       -
       		{"empty string", ""},

     

       375
       375
       -
       		{"single part", "abc"},

     

       376
       376
       -
       		{"two parts", "abc.def"},

     

       377
       377
       -
       		{"too many parts", "a.b.c.d"},

     

       378
       378
       -
       	}

     

       379
       379
       -
       

     

       380
       380
       -
       	for _, tc := range testCases {

     

       381
       381
       -
       		t.Run(tc.name, func(t *testing.T) {

     

       382
       382
       -
       			_, err := ParseJWTHeader(tc.input)

     

       383
       383
       -
       			if err == nil {

     

       384
       384
       -
       				t.Errorf("Expected error for invalid JWT format '%s', got nil", tc.input)

     

       385
       385
       -
       			}

     

       386
       386
       -
       		})

     

       387
       387
       -
       	}

     

       388
       388
       -
       }

     

       389
       389
       -
       

     

       390
       390
       -
       // === shouldUseHS256 and isHS256IssuerWhitelisted Tests ===

     

       391
       391
       -
       

     

       392
       392
       -
       func TestIsHS256IssuerWhitelisted_Whitelisted(t *testing.T) {

     

       393
       393
       -
       	ResetJWTConfigForTesting()

     

       394
       394
       -
       	t.Setenv("HS256_ISSUERS", "https://pds1.example.com,https://pds2.example.com")

     

       395
       395
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       396
       396
       -
       

     

       397
       397
       -
       	if !isHS256IssuerWhitelisted("https://pds1.example.com") {

     

       398
       398
       -
       		t.Error("Expected pds1 to be whitelisted")

     

       399
       399
       -
       	}

     

       400
       400
       -
       	if !isHS256IssuerWhitelisted("https://pds2.example.com") {

     

       401
       401
       -
       		t.Error("Expected pds2 to be whitelisted")

     

       402
       402
       -
       	}

     

       403
       403
       -
       }

     

       404
       404
       -
       

     

       405
       405
       -
       func TestIsHS256IssuerWhitelisted_NotWhitelisted(t *testing.T) {

     

       406
       406
       -
       	ResetJWTConfigForTesting()

     

       407
       407
       -
       	t.Setenv("HS256_ISSUERS", "https://pds1.example.com")

     

       408
       408
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       409
       409
       -
       

     

       410
       410
       -
       	if isHS256IssuerWhitelisted("https://attacker.example.com") {

     

       411
       411
       -
       		t.Error("Expected non-whitelisted issuer to return false")

     

       412
       412
       -
       	}

     

       413
       413
       -
       }

     

       414
       414
       -
       

     

       415
       415
       -
       func TestIsHS256IssuerWhitelisted_EmptyWhitelist(t *testing.T) {

     

       416
       416
       -
       	ResetJWTConfigForTesting()

     

       417
       417
       -
       	t.Setenv("HS256_ISSUERS", "") // Empty whitelist

     

       418
       418
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       419
       419
       -
       

     

       420
       420
       -
       	if isHS256IssuerWhitelisted("https://any.example.com") {

     

       421
       421
       -
       		t.Error("Expected false when whitelist is empty (safe default)")

     

       422
       422
       -
       	}

     

       423
       423
       -
       }

     

       424
       424
       -
       

     

       425
       425
       -
       func TestIsHS256IssuerWhitelisted_WhitespaceHandling(t *testing.T) {

     

       426
       426
       -
       	ResetJWTConfigForTesting()

     

       427
       427
       -
       	t.Setenv("HS256_ISSUERS", "  https://pds1.example.com  ,  https://pds2.example.com  ")

     

       428
       428
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       429
       429
       -
       

     

       430
       430
       -
       	if !isHS256IssuerWhitelisted("https://pds1.example.com") {

     

       431
       431
       -
       		t.Error("Expected whitespace-trimmed issuer to be whitelisted")

     

       432
       432
       -
       	}

     

       433
       433
       -
       }

     

       434
       434
       -
       

     

       435
       435
       -
       // === shouldUseHS256 Tests (kid-based logic) ===

     

       436
       436
       -
       

     

       437
       437
       -
       func TestShouldUseHS256_WithKid_AlwaysFalse(t *testing.T) {

     

       438
       438
       -
       	// Tokens with kid should NEVER use HS256, regardless of issuer whitelist

     

       439
       439
       -
       	ResetJWTConfigForTesting()

     

       440
       440
       -
       	t.Setenv("HS256_ISSUERS", "https://whitelisted.example.com")

     

       441
       441
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       442
       442
       -
       

     

       443
       443
       -
       	header := &JWTHeader{

     

       444
       444
       -
       		Alg: AlgorithmHS256,

     

       445
       445
       -
       		Kid: "some-key-id", // Has kid

     

       446
       446
       -
       	}

     

       447
       447
       -
       

     

       448
       448
       -
       	// Even whitelisted issuer should not use HS256 if token has kid

     

       449
       449
       -
       	if shouldUseHS256(header, "https://whitelisted.example.com") {

     

       450
       450
       -
       		t.Error("Tokens with kid should never use HS256 (supports federation)")

     

       451
       451
       -
       	}

     

       452
       452
       -
       }

     

       453
       453
       -
       

     

       454
       454
       -
       func TestShouldUseHS256_WithoutKid_WhitelistedIssuer(t *testing.T) {

     

       455
       455
       -
       	ResetJWTConfigForTesting()

     

       456
       456
       -
       	t.Setenv("HS256_ISSUERS", "https://my-pds.example.com")

     

       457
       457
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       458
       458
       -
       

     

       459
       459
       -
       	header := &JWTHeader{

     

       460
       460
       -
       		Alg: AlgorithmHS256,

     

       461
       461
       -
       		Kid: "", // No kid

     

       462
       462
       -
       	}

     

       463
       463
       -
       

     

       464
       464
       -
       	if !shouldUseHS256(header, "https://my-pds.example.com") {

     

       465
       465
       -
       		t.Error("Token without kid from whitelisted issuer should use HS256")

     

       466
       466
       -
       	}

     

       467
       467
       -
       }

     

       468
       468
       -
       

     

       469
       469
       -
       func TestShouldUseHS256_WithoutKid_NotWhitelisted(t *testing.T) {

     

       470
       470
       -
       	ResetJWTConfigForTesting()

     

       471
       471
       -
       	t.Setenv("HS256_ISSUERS", "https://my-pds.example.com")

     

       472
       472
       -
       	t.Cleanup(ResetJWTConfigForTesting)

     

       473
       473
       -
       

     

       474
       474
       -
       	header := &JWTHeader{

     

       475
       475
       -
       		Alg: AlgorithmHS256,

     

       476
       476
       -
       		Kid: "", // No kid

     

       477
       477
       -
       	}

     

       478
       478
       -
       

     

       479
       479
       -
       	if shouldUseHS256(header, "https://external-pds.example.com") {

     

       480
       480
       -
       		t.Error("Token without kid from non-whitelisted issuer should NOT use HS256")

     

       481
       481
       -
       	}

     

       482
       482
       -
       }

     

       483
       483
       -
       

     

       484
       484
       -
       // Helper function

     

       485
       485
       -
       func contains(s, substr string) bool {

     

       486
       486
       -
       	return len(s) >= len(substr) && (s == substr || len(s) > 0 && containsHelper(s, substr))

     

       487
       487
       -
       }

     

       488
       488
       -
       

     

       489
       489
       -
       func containsHelper(s, substr string) bool {

     

       490
       490
       -
       	for i := 0; i <= len(s)-len(substr); i++ {

     

       491
       491
       -
       		if s[i:i+len(substr)] == substr {

     

       492
       492
       -
       			return true

     

       493
       493
       -
       		}

     

       494
       494
       -
       	}

     

       495
       495
       -
       	return false

     

       496
       496
       -
       }

-4

tests/integration/oauth_helpers.go

···

       69
       69
        
       		// Production mode: HTTPS PDS, use real PLC directory

     

       70
       70
        
       		config = &oauth.OAuthConfig{

     

       71
       71
        
       			PublicURL:       "http://localhost:3000", // Test server callback URL

     

       72
       72
       -
       			ClientSecret:    "",                      // Public client

     

       73
       73
       -
       			ClientKID:       "",                      // Public client

     

       74
       72
        
       			SealSecret:      sealSecretB64,           // For sealing mobile tokens

     

       75
       73
        
       			Scopes:          []string{"atproto", "transition:generic"},

     

       76
       74
        
       			DevMode:         false, // Production mode for HTTPS PDS

     
···

       82
       80
        
       		// Dev mode: localhost PDS with HTTP

     

       83
       81
        
       		config = &oauth.OAuthConfig{

     

       84
       82
        
       			PublicURL:       "http://localhost:3000", // Match the callback URL expected by PDS

     

       85
       85
       -
       			ClientSecret:    "",                      // Empty for public client in dev mode

     

       86
       86
       -
       			ClientKID:       "",                      // Empty for public client

     

       87
       83
        
       			SealSecret:      sealSecretB64,           // For sealing mobile tokens

     

       88
       84
        
       			Scopes:          []string{"atproto", "transition:generic"},

     

       89
       85
        
       			DevMode:         true,            // Enable dev mode for localhost testing

docker-compose.prod.yml

···

       62
       62
        
             # Instance identity

     

       63
       63
        
             INSTANCE_DID: did:web:coves.social

     

       64
       64
        
             INSTANCE_DOMAIN: coves.social

     

       65
       65
       +
             APPVIEW_PUBLIC_URL: https://coves.social

     

       65
       66
        
       

     

       66
       67
        
             # PDS connection (separate domain!)

     

       67
       68
        
             PDS_URL: https://coves.me

+1 -8

Caddyfile

···

       60
       60
        
               file_server

     

       61
       61
        
           }

     

       62
       62
        
       

     

       63
       63
       -
           # Serve OAuth callback page

     

       64
       64
       -
           handle /oauth/callback {

     

       65
       65
       -
               root * /srv

     

       66
       66
       -
               rewrite * /oauth/callback.html

     

       67
       67
       -
               file_server

     

       68
       68
       -
           }

     

       69
       69
       -
       

     

       70
       70
       -
           # Proxy all other requests to AppView

     

       63
       63
       +
           # Proxy all requests to AppView

     

       71
       64
        
           handle {

     

       72
       65
        
               reverse_proxy appview:8080 {

     

       73
       66
        
                   # Health check

-97

static/oauth/callback.html

···

       1
       1
       -
       <!DOCTYPE html>

     

       2
       2
       -
       <html>

     

       3
       3
       -
       <head>

     

       4
       4
       -
         <meta charset="utf-8">

     

       5
       5
       -
         <meta name="viewport" content="width=device-width, initial-scale=1">

     

       6
       6
       -
         <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'unsafe-inline'; style-src 'unsafe-inline'">

     

       7
       7
       -
         <title>Authorization Successful - Coves</title>

     

       8
       8
       -
         <style>

     

       9
       9
       -
           body {

     

       10
       10
       -
             font-family: system-ui, -apple-system, sans-serif;

     

       11
       11
       -
             display: flex;

     

       12
       12
       -
             align-items: center;

     

       13
       13
       -
             justify-content: center;

     

       14
       14
       -
             min-height: 100vh;

     

       15
       15
       -
             margin: 0;

     

       16
       16
       -
             background: #f5f5f5;

     

       17
       17
       -
           }

     

       18
       18
       -
           .container {

     

       19
       19
       -
             text-align: center;

     

       20
       20
       -
             padding: 2rem;

     

       21
       21
       -
             background: white;

     

       22
       22
       -
             border-radius: 8px;

     

       23
       23
       -
             box-shadow: 0 2px 8px rgba(0,0,0,0.1);

     

       24
       24
       -
             max-width: 400px;

     

       25
       25
       -
           }

     

       26
       26
       -
           .success { color: #22c55e; font-size: 3rem; margin-bottom: 1rem; }

     

       27
       27
       -
           h1 { margin: 0 0 0.5rem; color: #1f2937; font-size: 1.5rem; }

     

       28
       28
       -
           p { color: #6b7280; margin: 0.5rem 0; }

     

       29
       29
       -
           a {

     

       30
       30
       -
             display: inline-block;

     

       31
       31
       -
             margin-top: 1rem;

     

       32
       32
       -
             padding: 0.75rem 1.5rem;

     

       33
       33
       -
             background: #3b82f6;

     

       34
       34
       -
             color: white;

     

       35
       35
       -
             text-decoration: none;

     

       36
       36
       -
             border-radius: 6px;

     

       37
       37
       -
             font-weight: 500;

     

       38
       38
       -
           }

     

       39
       39
       -
           a:hover { background: #2563eb; }

     

       40
       40
       -
         </style>

     

       41
       41
       -
       </head>

     

       42
       42
       -
       <body>

     

       43
       43
       -
         <div class="container">

     

       44
       44
       -
           <div class="success">✓</div>

     

       45
       45
       -
           <h1>Authorization Successful!</h1>

     

       46
       46
       -
           <p id="status">Returning to Coves...</p>

     

       47
       47
       -
           <a href="#" id="manualLink">Open Coves</a>

     

       48
       48
       -
         </div>

     

       49
       49
       -
         <script>

     

       50
       50
       -
           (function() {

     

       51
       51
       -
             // Parse and sanitize query params - only allow expected OAuth parameters

     

       52
       52
       -
             const urlParams = new URLSearchParams(window.location.search);

     

       53
       53
       -
             const safeParams = new URLSearchParams();

     

       54
       54
       -
       

     

       55
       55
       -
             // Whitelist only expected OAuth callback parameters

     

       56
       56
       -
             const code = urlParams.get('code');

     

       57
       57
       -
             const state = urlParams.get('state');

     

       58
       58
       -
             const error = urlParams.get('error');

     

       59
       59
       -
             const errorDescription = urlParams.get('error_description');

     

       60
       60
       -
             const iss = urlParams.get('iss');

     

       61
       61
       -
       

     

       62
       62
       -
             if (code) safeParams.set('code', code);

     

       63
       63
       -
             if (state) safeParams.set('state', state);

     

       64
       64
       -
             if (error) safeParams.set('error', error);

     

       65
       65
       -
             if (errorDescription) safeParams.set('error_description', errorDescription);

     

       66
       66
       -
             if (iss) safeParams.set('iss', iss);

     

       67
       67
       -
       

     

       68
       68
       -
             const sanitizedQuery = safeParams.toString() ? '?' + safeParams.toString() : '';

     

       69
       69
       -
       

     

       70
       70
       -
             const userAgent = navigator.userAgent || '';

     

       71
       71
       -
             const isAndroid = /Android/i.test(userAgent);

     

       72
       72
       -
       

     

       73
       73
       -
             // Build deep link based on platform

     

       74
       74
       -
             let deepLink;

     

       75
       75
       -
             if (isAndroid) {

     

       76
       76
       -
               // Android: Intent URL format

     

       77
       77
       -
               const pathAndQuery = '/oauth/callback' + sanitizedQuery;

     

       78
       78
       -
               deepLink = 'intent:/' + pathAndQuery + '#Intent;scheme=social.coves;package=social.coves;end';

     

       79
       79
       -
             } else {

     

       80
       80
       -
               // iOS: Custom scheme

     

       81
       81
       -
               deepLink = 'social.coves:/oauth/callback' + sanitizedQuery;

     

       82
       82
       -
             }

     

       83
       83
       -
       

     

       84
       84
       -
             // Update manual link

     

       85
       85
       -
             document.getElementById('manualLink').href = deepLink;

     

       86
       86
       -
       

     

       87
       87
       -
             // Attempt automatic redirect

     

       88
       88
       -
             window.location.href = deepLink;

     

       89
       89
       -
       

     

       90
       90
       -
             // Update status after 2 seconds if redirect didn't work

     

       91
       91
       -
             setTimeout(function() {

     

       92
       92
       -
               document.getElementById('status').textContent = 'Click the button above to continue';

     

       93
       93
       -
             }, 2000);

     

       94
       94
       -
           })();

     

       95
       95
       -
         </script>

     

       96
       96
       -
       </body>

     

       97
       97
       -
       </html>

+11

static/.well-known/apple-app-site-association

···

       1
       1
       +
       {

     

       2
       2
       +
         "applinks": {

     

       3
       3
       +
           "apps": [],

     

       4
       4
       +
           "details": [

     

       5
       5
       +
             {

     

       6
       6
       +
               "appID": "TEAM_ID.social.coves",

     

       7
       7
       +
               "paths": ["/app/oauth/callback"]

     

       8
       8
       +
             }

     

       9
       9
       +
           ]

     

       10
       10
       +
         }

     

       11
       11
       +
       }

+10

static/.well-known/assetlinks.json

···

       1
       1
       +
       [{

     

       2
       2
       +
         "relation": ["delegate_permission/common.handle_all_urls"],

     

       3
       3
       +
         "target": {

     

       4
       4
       +
           "namespace": "android_app",

     

       5
       5
       +
           "package_name": "social.coves",

     

       6
       6
       +
           "sha256_cert_fingerprints": [

     

       7
       7
       +
             "0B:D8:8C:99:66:25:E5:CD:06:54:80:88:01:6F:B7:38:B9:F4:5B:41:71:F7:95:C8:68:94:87:AD:EA:9F:D9:ED"

     

       8
       8
       +
           ]

     

       9
       9
       +
         }

     

       10
       10
       +
       }]

+143 -2

internal/atproto/oauth/handlers.go

···

       4
       4
        
       	"context"

     

       5
       5
        
       	"encoding/json"

     

       6
       6
        
       	"fmt"

     

       7
       7
       +
       	"html/template"

     

       7
       8
        
       	"log/slog"

     

       8
       9
        
       	"net/http"

     

       9
       10
        
       	"net/url"

     
···

       12
       13
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       13
       14
        
       )

     

       14
       15
        
       

     

       16
       16
       +
       // mobileCallbackTemplate is the intermediate page shown after OAuth completes

     

       17
       17
       +
       // before redirecting to the mobile app via custom scheme.

     

       18
       18
       +
       // This prevents the browser from showing a stale PDS page after the redirect.

     

       19
       19
       +
       var mobileCallbackTemplate = template.Must(template.New("mobile_callback").Parse(`<!DOCTYPE html>

     

       20
       20
       +
       <html lang="en">

     

       21
       21
       +
       <head>

     

       22
       22
       +
         <meta charset="utf-8">

     

       23
       23
       +
         <meta name="viewport" content="width=device-width, initial-scale=1">

     

       24
       24
       +
         <title>Login Complete - Coves</title>

     

       25
       25
       +
         <meta http-equiv="refresh" content="1;url={{.DeepLink}}">

     

       26
       26
       +
         <style>

     

       27
       27
       +
           * { box-sizing: border-box; margin: 0; padding: 0; }

     

       28
       28
       +
           body {

     

       29
       29
       +
             font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;

     

       30
       30
       +
             background: #0B0F14;

     

       31
       31
       +
             color: #e4e6e7;

     

       32
       32
       +
             min-height: 100vh;

     

       33
       33
       +
             display: flex;

     

       34
       34
       +
             justify-content: center;

     

       35
       35
       +
             align-items: center;

     

       36
       36
       +
             padding: 24px;

     

       37
       37
       +
           }

     

       38
       38
       +
           .card {

     

       39
       39
       +
             text-align: center;

     

       40
       40
       +
             max-width: 320px;

     

       41
       41
       +
           }

     

       42
       42
       +
           .logo {

     

       43
       43
       +
             width: 80px;

     

       44
       44
       +
             height: 80px;

     

       45
       45
       +
             margin: 0 auto 16px;

     

       46
       46
       +
           }

     

       47
       47
       +
           .checkmark {

     

       48
       48
       +
             width: 64px;

     

       49
       49
       +
             height: 64px;

     

       50
       50
       +
             margin: 0 auto 24px;

     

       51
       51
       +
             background: #FF6B35;

     

       52
       52
       +
             border-radius: 50%;

     

       53
       53
       +
             display: flex;

     

       54
       54
       +
             align-items: center;

     

       55
       55
       +
             justify-content: center;

     

       56
       56
       +
             animation: scale-in 0.3s ease-out;

     

       57
       57
       +
           }

     

       58
       58
       +
           .checkmark svg {

     

       59
       59
       +
             width: 32px;

     

       60
       60
       +
             height: 32px;

     

       61
       61
       +
             stroke: white;

     

       62
       62
       +
             stroke-width: 3;

     

       63
       63
       +
             fill: none;

     

       64
       64
       +
           }

     

       65
       65
       +
           @keyframes scale-in {

     

       66
       66
       +
             0% { transform: scale(0); }

     

       67
       67
       +
             50% { transform: scale(1.1); }

     

       68
       68
       +
             100% { transform: scale(1); }

     

       69
       69
       +
           }

     

       70
       70
       +
           h1 {

     

       71
       71
       +
             font-size: 24px;

     

       72
       72
       +
             font-weight: 600;

     

       73
       73
       +
             margin-bottom: 8px;

     

       74
       74
       +
             color: #e4e6e7;

     

       75
       75
       +
           }

     

       76
       76
       +
           .subtitle {

     

       77
       77
       +
             font-size: 16px;

     

       78
       78
       +
             color: #B6C2D2;

     

       79
       79
       +
             margin-bottom: 24px;

     

       80
       80
       +
           }

     

       81
       81
       +
           .handle {

     

       82
       82
       +
             font-size: 14px;

     

       83
       83
       +
             color: #7CB9E8;

     

       84
       84
       +
             background: #1A1F26;

     

       85
       85
       +
             padding: 8px 16px;

     

       86
       86
       +
             border-radius: 8px;

     

       87
       87
       +
             margin-bottom: 24px;

     

       88
       88
       +
             display: inline-block;

     

       89
       89
       +
           }

     

       90
       90
       +
           .hint {

     

       91
       91
       +
             font-size: 13px;

     

       92
       92
       +
             color: #6B7280;

     

       93
       93
       +
             line-height: 1.5;

     

       94
       94
       +
           }

     

       95
       95
       +
           .spinner {

     

       96
       96
       +
             width: 20px;

     

       97
       97
       +
             height: 20px;

     

       98
       98
       +
             border: 2px solid #2A2F36;

     

       99
       99
       +
             border-top-color: #FF6B35;

     

       100
       100
       +
             border-radius: 50%;

     

       101
       101
       +
             animation: spin 1s linear infinite;

     

       102
       102
       +
             display: inline-block;

     

       103
       103
       +
             vertical-align: middle;

     

       104
       104
       +
             margin-right: 8px;

     

       105
       105
       +
           }

     

       106
       106
       +
           @keyframes spin {

     

       107
       107
       +
             to { transform: rotate(360deg); }

     

       108
       108
       +
           }

     

       109
       109
       +
         </style>

     

       110
       110
       +
       </head>

     

       111
       111
       +
       <body>

     

       112
       112
       +
         <div class="card">

     

       113
       113
       +
           <div class="checkmark">

     

       114
       114
       +
             <svg viewBox="0 0 24 24">

     

       115
       115
       +
               <polyline points="20 6 9 17 4 12"></polyline>

     

       116
       116
       +
             </svg>

     

       117
       117
       +
           </div>

     

       118
       118
       +
           <h1>Login Complete</h1>

     

       119
       119
       +
           <p class="subtitle">

     

       120
       120
       +
             <span class="spinner"></span>

     

       121
       121
       +
             Returning to Coves...

     

       122
       122
       +
           </p>

     

       123
       123
       +
           {{if .Handle}}

     

       124
       124
       +
           <div class="handle">@{{.Handle}}</div>

     

       125
       125
       +
           {{end}}

     

       126
       126
       +
           <p class="hint">If the app doesn't open automatically,<br>you can close this window.</p>

     

       127
       127
       +
         </div>

     

       128
       128
       +
         <script>

     

       129
       129
       +
           // Redirect to app immediately

     

       130
       130
       +
           window.location.href = {{.DeepLink}};

     

       131
       131
       +
           // Try to close window after a delay

     

       132
       132
       +
           setTimeout(function() {

     

       133
       133
       +
             window.close();

     

       134
       134
       +
           }, 1500);

     

       135
       135
       +
         </script>

     

       136
       136
       +
       </body>

     

       137
       137
       +
       </html>

     

       138
       138
       +
       `))

     

       139
       139
       +
       

     

       15
       140
        
       // MobileOAuthStore interface for mobile-specific OAuth operations

     

       16
       141
        
       // This extends the base OAuth store with mobile CSRF tracking

     

       17
       142
        
       type MobileOAuthStore interface {

     
···

       483
       608
        
       	// Log mobile redirect (sanitized - no token or session ID to avoid leaking credentials)

     

       484
       609
        
       	slog.Info("redirecting to mobile app", "did", sessData.AccountDID, "handle", handle)

     

       485
       610
        
       

     

       486
       486
       -
       	// Redirect to mobile app deep link

     

       487
       487
       -
       	http.Redirect(w, r, deepLink, http.StatusFound)

     

       611
       611
       +
       	// Serve intermediate page that redirects to the app

     

       612
       612
       +
       	// This prevents the browser from showing a stale PDS page after the custom scheme redirect

     

       613
       613
       +
       	w.Header().Set("Content-Type", "text/html; charset=utf-8")

     

       614
       614
       +
       	w.Header().Set("Cache-Control", "no-store, no-cache, must-revalidate")

     

       615
       615
       +
       

     

       616
       616
       +
       	data := struct {

     

       617
       617
       +
       		DeepLink string

     

       618
       618
       +
       		Handle   string

     

       619
       619
       +
       	}{

     

       620
       620
       +
       		DeepLink: deepLink,

     

       621
       621
       +
       		Handle:   handle,

     

       622
       622
       +
       	}

     

       623
       623
       +
       

     

       624
       624
       +
       	if err := mobileCallbackTemplate.Execute(w, data); err != nil {

     

       625
       625
       +
       		slog.Error("failed to render mobile callback template", "error", err)

     

       626
       626
       +
       		// Fallback to direct redirect if template fails

     

       627
       627
       +
       		http.Redirect(w, r, deepLink, http.StatusFound)

     

       628
       628
       +
       	}

     

       488
       629
        
       }

     

       489
       630
        
       

     

       490
       631
        
       // HandleLogout revokes the session and clears cookies

+115

internal/api/handlers/vote/create_vote.go

···

       1
       1
       +
       package vote

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/votes"

     

       6
       6
       +
       	"encoding/json"

     

       7
       7
       +
       	"log"

     

       8
       8
       +
       	"net/http"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // CreateVoteHandler handles vote creation

     

       12
       12
       +
       type CreateVoteHandler struct {

     

       13
       13
       +
       	service votes.Service

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // NewCreateVoteHandler creates a new create vote handler

     

       17
       17
       +
       func NewCreateVoteHandler(service votes.Service) *CreateVoteHandler {

     

       18
       18
       +
       	return &CreateVoteHandler{

     

       19
       19
       +
       		service: service,

     

       20
       20
       +
       	}

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       // CreateVoteInput represents the request body for creating a vote

     

       24
       24
       +
       type CreateVoteInput struct {

     

       25
       25
       +
       	Subject struct {

     

       26
       26
       +
       		URI string `json:"uri"`

     

       27
       27
       +
       		CID string `json:"cid"`

     

       28
       28
       +
       	} `json:"subject"`

     

       29
       29
       +
       	Direction string `json:"direction"`

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       // CreateVoteOutput represents the response body for creating a vote

     

       33
       33
       +
       type CreateVoteOutput struct {

     

       34
       34
       +
       	URI string `json:"uri"`

     

       35
       35
       +
       	CID string `json:"cid"`

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       // HandleCreateVote creates a vote on a post or comment

     

       39
       39
       +
       // POST /xrpc/social.coves.vote.create

     

       40
       40
       +
       //

     

       41
       41
       +
       // Request body: { "subject": { "uri": "at://...", "cid": "..." }, "direction": "up" }

     

       42
       42
       +
       // Response: { "uri": "at://...", "cid": "..." }

     

       43
       43
       +
       //

     

       44
       44
       +
       // Behavior:

     

       45
       45
       +
       // - If no vote exists: creates new vote with given direction

     

       46
       46
       +
       // - If vote exists with same direction: deletes vote (toggle off)

     

       47
       47
       +
       // - If vote exists with different direction: updates to new direction

     

       48
       48
       +
       func (h *CreateVoteHandler) HandleCreateVote(w http.ResponseWriter, r *http.Request) {

     

       49
       49
       +
       	if r.Method != http.MethodPost {

     

       50
       50
       +
       		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

     

       51
       51
       +
       		return

     

       52
       52
       +
       	}

     

       53
       53
       +
       

     

       54
       54
       +
       	// Parse request body

     

       55
       55
       +
       	var input CreateVoteInput

     

       56
       56
       +
       	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {

     

       57
       57
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "Invalid request body")

     

       58
       58
       +
       		return

     

       59
       59
       +
       	}

     

       60
       60
       +
       

     

       61
       61
       +
       	// Validate required fields

     

       62
       62
       +
       	if input.Subject.URI == "" {

     

       63
       63
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "subject.uri is required")

     

       64
       64
       +
       		return

     

       65
       65
       +
       	}

     

       66
       66
       +
       	if input.Subject.CID == "" {

     

       67
       67
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "subject.cid is required")

     

       68
       68
       +
       		return

     

       69
       69
       +
       	}

     

       70
       70
       +
       	if input.Direction == "" {

     

       71
       71
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "direction is required")

     

       72
       72
       +
       		return

     

       73
       73
       +
       	}

     

       74
       74
       +
       

     

       75
       75
       +
       	// Validate direction

     

       76
       76
       +
       	if input.Direction != "up" && input.Direction != "down" {

     

       77
       77
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "direction must be 'up' or 'down'")

     

       78
       78
       +
       		return

     

       79
       79
       +
       	}

     

       80
       80
       +
       

     

       81
       81
       +
       	// Get OAuth session from context (injected by auth middleware)

     

       82
       82
       +
       	session := middleware.GetOAuthSession(r)

     

       83
       83
       +
       	if session == nil {

     

       84
       84
       +
       		writeError(w, http.StatusUnauthorized, "AuthRequired", "Authentication required")

     

       85
       85
       +
       		return

     

       86
       86
       +
       	}

     

       87
       87
       +
       

     

       88
       88
       +
       	// Create vote request

     

       89
       89
       +
       	req := votes.CreateVoteRequest{

     

       90
       90
       +
       		Subject: votes.StrongRef{

     

       91
       91
       +
       			URI: input.Subject.URI,

     

       92
       92
       +
       			CID: input.Subject.CID,

     

       93
       93
       +
       		},

     

       94
       94
       +
       		Direction: input.Direction,

     

       95
       95
       +
       	}

     

       96
       96
       +
       

     

       97
       97
       +
       	// Call service to create vote

     

       98
       98
       +
       	response, err := h.service.CreateVote(r.Context(), session, req)

     

       99
       99
       +
       	if err != nil {

     

       100
       100
       +
       		handleServiceError(w, err)

     

       101
       101
       +
       		return

     

       102
       102
       +
       	}

     

       103
       103
       +
       

     

       104
       104
       +
       	// Return success response

     

       105
       105
       +
       	output := CreateVoteOutput{

     

       106
       106
       +
       		URI: response.URI,

     

       107
       107
       +
       		CID: response.CID,

     

       108
       108
       +
       	}

     

       109
       109
       +
       

     

       110
       110
       +
       	w.Header().Set("Content-Type", "application/json")

     

       111
       111
       +
       	w.WriteHeader(http.StatusOK)

     

       112
       112
       +
       	if err := json.NewEncoder(w).Encode(output); err != nil {

     

       113
       113
       +
       		log.Printf("Failed to encode response: %v", err)

     

       114
       114
       +
       	}

     

       115
       115
       +
       }

+93

internal/api/handlers/vote/delete_vote.go

···

       1
       1
       +
       package vote

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/votes"

     

       6
       6
       +
       	"encoding/json"

     

       7
       7
       +
       	"log"

     

       8
       8
       +
       	"net/http"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // DeleteVoteHandler handles vote deletion

     

       12
       12
       +
       type DeleteVoteHandler struct {

     

       13
       13
       +
       	service votes.Service

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // NewDeleteVoteHandler creates a new delete vote handler

     

       17
       17
       +
       func NewDeleteVoteHandler(service votes.Service) *DeleteVoteHandler {

     

       18
       18
       +
       	return &DeleteVoteHandler{

     

       19
       19
       +
       		service: service,

     

       20
       20
       +
       	}

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       // DeleteVoteInput represents the request body for deleting a vote

     

       24
       24
       +
       type DeleteVoteInput struct {

     

       25
       25
       +
       	Subject struct {

     

       26
       26
       +
       		URI string `json:"uri"`

     

       27
       27
       +
       		CID string `json:"cid"`

     

       28
       28
       +
       	} `json:"subject"`

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       31
       31
       +
       // DeleteVoteOutput represents the response body for deleting a vote

     

       32
       32
       +
       // Per lexicon: output is an empty object

     

       33
       33
       +
       type DeleteVoteOutput struct{}

     

       34
       34
       +
       

     

       35
       35
       +
       // HandleDeleteVote removes a vote from a post or comment

     

       36
       36
       +
       // POST /xrpc/social.coves.vote.delete

     

       37
       37
       +
       //

     

       38
       38
       +
       // Request body: { "subject": { "uri": "at://...", "cid": "..." } }

     

       39
       39
       +
       // Response: { "success": true }

     

       40
       40
       +
       func (h *DeleteVoteHandler) HandleDeleteVote(w http.ResponseWriter, r *http.Request) {

     

       41
       41
       +
       	if r.Method != http.MethodPost {

     

       42
       42
       +
       		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

     

       43
       43
       +
       		return

     

       44
       44
       +
       	}

     

       45
       45
       +
       

     

       46
       46
       +
       	// Parse request body

     

       47
       47
       +
       	var input DeleteVoteInput

     

       48
       48
       +
       	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {

     

       49
       49
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "Invalid request body")

     

       50
       50
       +
       		return

     

       51
       51
       +
       	}

     

       52
       52
       +
       

     

       53
       53
       +
       	// Validate required fields

     

       54
       54
       +
       	if input.Subject.URI == "" {

     

       55
       55
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "subject.uri is required")

     

       56
       56
       +
       		return

     

       57
       57
       +
       	}

     

       58
       58
       +
       	if input.Subject.CID == "" {

     

       59
       59
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "subject.cid is required")

     

       60
       60
       +
       		return

     

       61
       61
       +
       	}

     

       62
       62
       +
       

     

       63
       63
       +
       	// Get OAuth session from context (injected by auth middleware)

     

       64
       64
       +
       	session := middleware.GetOAuthSession(r)

     

       65
       65
       +
       	if session == nil {

     

       66
       66
       +
       		writeError(w, http.StatusUnauthorized, "AuthRequired", "Authentication required")

     

       67
       67
       +
       		return

     

       68
       68
       +
       	}

     

       69
       69
       +
       

     

       70
       70
       +
       	// Create delete vote request

     

       71
       71
       +
       	req := votes.DeleteVoteRequest{

     

       72
       72
       +
       		Subject: votes.StrongRef{

     

       73
       73
       +
       			URI: input.Subject.URI,

     

       74
       74
       +
       			CID: input.Subject.CID,

     

       75
       75
       +
       		},

     

       76
       76
       +
       	}

     

       77
       77
       +
       

     

       78
       78
       +
       	// Call service to delete vote

     

       79
       79
       +
       	err := h.service.DeleteVote(r.Context(), session, req)

     

       80
       80
       +
       	if err != nil {

     

       81
       81
       +
       		handleServiceError(w, err)

     

       82
       82
       +
       		return

     

       83
       83
       +
       	}

     

       84
       84
       +
       

     

       85
       85
       +
       	// Return success response (empty object per lexicon)

     

       86
       86
       +
       	output := DeleteVoteOutput{}

     

       87
       87
       +
       

     

       88
       88
       +
       	w.Header().Set("Content-Type", "application/json")

     

       89
       89
       +
       	w.WriteHeader(http.StatusOK)

     

       90
       90
       +
       	if err := json.NewEncoder(w).Encode(output); err != nil {

     

       91
       91
       +
       		log.Printf("Failed to encode response: %v", err)

     

       92
       92
       +
       	}

     

       93
       93
       +
       }

+24

internal/api/routes/vote.go

···

       1
       1
       +
       package routes

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/handlers/vote"

     

       5
       5
       +
       	"Coves/internal/api/middleware"

     

       6
       6
       +
       	"Coves/internal/core/votes"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/go-chi/chi/v5"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // RegisterVoteRoutes registers vote-related XRPC endpoints on the router

     

       12
       12
       +
       // Implements social.coves.feed.vote.* lexicon endpoints

     

       13
       13
       +
       func RegisterVoteRoutes(r chi.Router, voteService votes.Service, authMiddleware *middleware.OAuthAuthMiddleware) {

     

       14
       14
       +
       	// Initialize handlers

     

       15
       15
       +
       	createHandler := vote.NewCreateVoteHandler(voteService)

     

       16
       16
       +
       	deleteHandler := vote.NewDeleteVoteHandler(voteService)

     

       17
       17
       +
       

     

       18
       18
       +
       	// Procedure endpoints (POST) - require authentication

     

       19
       19
       +
       	// social.coves.feed.vote.create - create or update a vote on a post/comment

     

       20
       20
       +
       	r.With(authMiddleware.RequireAuth).Post("/xrpc/social.coves.feed.vote.create", createHandler.HandleCreateVote)

     

       21
       21
       +
       

     

       22
       22
       +
       	// social.coves.feed.vote.delete - delete a vote from a post/comment

     

       23
       23
       +
       	r.With(authMiddleware.RequireAuth).Post("/xrpc/social.coves.feed.vote.delete", deleteHandler.HandleDeleteVote)

     

       24
       24
       +
       }

+16

tests/integration/helpers.go

···

       322
       322
        
       

     

       323
       323
        
       // AddSession adds a session to the store

     

       324
       324
        
       func (m *MockOAuthStore) AddSession(did, sessionID, accessToken string) {

     

       325
       325
       +
       	m.AddSessionWithPDS(did, sessionID, accessToken, getTestPDSURL())

     

       326
       326
       +
       }

     

       327
       327
       +
       

     

       328
       328
       +
       // AddSessionWithPDS adds a session to the store with a specific PDS URL

     

       329
       329
       +
       func (m *MockOAuthStore) AddSessionWithPDS(did, sessionID, accessToken, pdsURL string) {

     

       325
       330
        
       	key := did + ":" + sessionID

     

       326
       331
        
       	parsedDID, _ := syntax.ParseDID(did)

     

       327
       332
        
       	m.sessions[key] = &oauthlib.ClientSessionData{

     

       328
       333
        
       		AccountDID:  parsedDID,

     

       329
       334
        
       		SessionID:   sessionID,

     

       330
       335
        
       		AccessToken: accessToken,

     

       336
       336
       +
       		HostURL:     pdsURL,

     

       331
       337
        
       	}

     

       332
       338
        
       }

     

       333
       339
        
       

     
···

       409
       415
        
       	e.store.AddSession(did, sessionID, "access-token-"+did)

     

       410
       416
        
       	return token

     

       411
       417
        
       }

     

       418
       418
       +
       

     

       419
       419
       +
       // AddUserWithPDSToken registers a user with their real PDS access token

     

       420
       420
       +
       // Use this for E2E tests that need to write to the real PDS

     

       421
       421
       +
       func (e *E2EOAuthMiddleware) AddUserWithPDSToken(did, pdsAccessToken, pdsURL string) string {

     

       422
       422
       +
       	token := "test-token-" + did

     

       423
       423
       +
       	sessionID := "session-" + did

     

       424
       424
       +
       	e.unsealer.AddSession(token, did, sessionID)

     

       425
       425
       +
       	e.store.AddSessionWithPDS(did, sessionID, pdsAccessToken, pdsURL)

     

       426
       426
       +
       	return token

     

       427
       427
       +
       }

.beads/beads.left.jsonl

···

       1
       1
       +
       {"id":"Coves-95q","content_hash":"8ec99d598f067780436b985f9ad57f0fa19632026981038df4f65f192186620b","title":"Add comprehensive API documentation","description":"","status":"open","priority":2,"issue_type":"task","created_at":"2025-11-17T20:30:34.835721854-08:00","updated_at":"2025-11-17T20:30:34.835721854-08:00","source_repo":".","dependencies":[{"issue_id":"Coves-95q","depends_on_id":"Coves-e16","type":"blocks","created_at":"2025-11-17T20:30:46.273899399-08:00","created_by":"daemon"}]}

     

       2
       2
       +
       {"id":"Coves-e16","content_hash":"7c5d0fc8f0e7f626be3dad62af0e8412467330bad01a244e5a7e52ac5afff1c1","title":"Complete post creation and moderation features","description":"","status":"open","priority":1,"issue_type":"feature","created_at":"2025-11-17T20:30:12.885991306-08:00","updated_at":"2025-11-17T20:30:12.885991306-08:00","source_repo":"."}

     

       3
       3
       +
       {"id":"Coves-fce","content_hash":"26b3e16b99f827316ee0d741cc959464bd0c813446c95aef8105c7fd1e6b09ff","title":"Implement aggregator feed federation","description":"","status":"open","priority":1,"issue_type":"feature","created_at":"2025-11-17T20:30:21.453326012-08:00","updated_at":"2025-11-17T20:30:21.453326012-08:00","source_repo":"."}

.beads/beads.left.meta.json

···

       1
       1
       +
       {"version":"0.23.1","timestamp":"2025-12-02T18:25:24.009187871-08:00","commit":"00d7d8d"}

-3

internal/api/handlers/vote/errors.go

···

       34
       34
        
       	case errors.Is(err, votes.ErrVoteNotFound):

     

       35
       35
        
       		// Matches: social.coves.feed.vote.delete#VoteNotFound

     

       36
       36
        
       		writeError(w, http.StatusNotFound, "VoteNotFound", "No vote found for this subject")

     

       37
       37
       -
       	case errors.Is(err, votes.ErrSubjectNotFound):

     

       38
       38
       -
       		// Matches: social.coves.feed.vote.create#SubjectNotFound

     

       39
       39
       -
       		writeError(w, http.StatusNotFound, "SubjectNotFound", "The subject post or comment was not found")

     

       40
       37
        
       	case errors.Is(err, votes.ErrInvalidDirection):

     

       41
       38
        
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "Vote direction must be 'up' or 'down'")

     

       42
       39
        
       	case errors.Is(err, votes.ErrInvalidSubject):

-3

internal/core/votes/errors.go

···

       6
       6
        
       	// ErrVoteNotFound indicates the requested vote doesn't exist

     

       7
       7
        
       	ErrVoteNotFound = errors.New("vote not found")

     

       8
       8
        
       

     

       9
       9
       -
       	// ErrSubjectNotFound indicates the post/comment being voted on doesn't exist

     

       10
       10
       -
       	ErrSubjectNotFound = errors.New("subject not found")

     

       11
       11
       -
       

     

       12
       9
        
       	// ErrInvalidDirection indicates the vote direction is not "up" or "down"

     

       13
       10
        
       	ErrInvalidDirection = errors.New("invalid vote direction: must be 'up' or 'down'")

     

       14
       11

+14 -27

internal/core/votes/service_impl.go

···

       19
       19
        
       

     

       20
       20
        
       // voteService implements the Service interface for vote operations

     

       21
       21
        
       type voteService struct {

     

       22
       22
       -
       	repo             Repository

     

       23
       23
       -
       	subjectValidator SubjectValidator

     

       24
       24
       -
       	oauthClient      *oauthclient.OAuthClient

     

       25
       25
       -
       	oauthStore       oauth.ClientAuthStore

     

       26
       26
       -
       	logger           *slog.Logger

     

       22
       22
       +
       	repo        Repository

     

       23
       23
       +
       	oauthClient *oauthclient.OAuthClient

     

       24
       24
       +
       	oauthStore  oauth.ClientAuthStore

     

       25
       25
       +
       	logger      *slog.Logger

     

       27
       26
        
       }

     

       28
       27
        
       

     

       29
       28
        
       // NewService creates a new vote service instance

     

       30
       30
       -
       // subjectValidator can be nil to skip subject existence checks (not recommended for production)

     

       31
       31
       -
       func NewService(repo Repository, subjectValidator SubjectValidator, oauthClient *oauthclient.OAuthClient, oauthStore oauth.ClientAuthStore, logger *slog.Logger) Service {

     

       29
       29
       +
       func NewService(repo Repository, oauthClient *oauthclient.OAuthClient, oauthStore oauth.ClientAuthStore, logger *slog.Logger) Service {

     

       32
       30
        
       	if logger == nil {

     

       33
       31
        
       		logger = slog.Default()

     

       34
       32
        
       	}

     

       35
       33
        
       	return &voteService{

     

       36
       36
       -
       		repo:             repo,

     

       37
       37
       -
       		subjectValidator: subjectValidator,

     

       38
       38
       -
       		oauthClient:      oauthClient,

     

       39
       39
       -
       		oauthStore:       oauthStore,

     

       40
       40
       -
       		logger:           logger,

     

       34
       34
       +
       		repo:        repo,

     

       35
       35
       +
       		oauthClient: oauthClient,

     

       36
       36
       +
       		oauthStore:  oauthStore,

     

       37
       37
       +
       		logger:      logger,

     

       41
       38
        
       	}

     

       42
       39
        
       }

     

       43
       40
        
       

     
···

       65
       62
        
       		return nil, ErrInvalidSubject

     

       66
       63
        
       	}

     

       67
       64
        
       

     

       68
       68
       -
       	// Validate subject exists in AppView (post or comment)

     

       69
       69
       -
       	// This prevents creating votes on non-existent content

     

       70
       70
       -
       	if s.subjectValidator != nil {

     

       71
       71
       -
       		exists, err := s.subjectValidator.SubjectExists(ctx, req.Subject.URI)

     

       72
       72
       -
       		if err != nil {

     

       73
       73
       -
       			s.logger.Error("failed to validate subject existence",

     

       74
       74
       -
       				"error", err,

     

       75
       75
       -
       				"subject", req.Subject.URI)

     

       76
       76
       -
       			return nil, fmt.Errorf("failed to validate subject: %w", err)

     

       77
       77
       -
       		}

     

       78
       78
       -
       		if !exists {

     

       79
       79
       -
       			return nil, ErrSubjectNotFound

     

       80
       80
       -
       		}

     

       81
       81
       -
       	}

     

       65
       65
       +
       	// Note: We intentionally don't validate subject existence here.

     

       66
       66
       +
       	// The vote record goes to the user's PDS regardless. The Jetstream consumer

     

       67
       67
       +
       	// handles orphaned votes correctly by only updating counts for non-deleted subjects.

     

       68
       68
       +
       	// This avoids race conditions and eventual consistency issues.

     

       82
       69
        
       

     

       83
       70
        
       	// Check for existing vote by querying PDS directly (source of truth)

     

       84
       71
        
       	// This avoids eventual consistency issues with the AppView database

     
···

       284
       271
        
       

     

       285
       272
        
       		// Parse the listRecords response

     

       286
       273
        
       		var result struct {

     

       274
       274
       +
       			Cursor  string `json:"cursor"`

     

       287
       275
        
       			Records []struct {

     

       288
       276
        
       				URI   string `json:"uri"`

     

       289
       277
        
       				CID   string `json:"cid"`

     
···

       297
       285
        
       					CreatedAt string `json:"createdAt"`

     

       298
       286
        
       				} `json:"value"`

     

       299
       287
        
       			} `json:"records"`

     

       300
       300
       -
       			Cursor string `json:"cursor"`

     

       301
       288
        
       		}

     

       302
       289
        
       

     

       303
       290
        
       		if err := json.Unmarshal(body, &result); err != nil {

+3 -2

internal/db/postgres/vote_repo.go

···

       64
       64
        
       	return nil

     

       65
       65
        
       }

     

       66
       66
        
       

     

       67
       67
       -
       // GetByURI retrieves a vote by its AT-URI

     

       67
       67
       +
       // GetByURI retrieves an active vote by its AT-URI

     

       68
       68
        
       // Used by Jetstream consumer for DELETE operations

     

       69
       69
       +
       // Returns ErrVoteNotFound for soft-deleted votes

     

       69
       70
        
       func (r *postgresVoteRepo) GetByURI(ctx context.Context, uri string) (*votes.Vote, error) {

     

       70
       71
        
       	query := `

     

       71
       72
        
       		SELECT

     
···

       73
       74
        
       			subject_uri, subject_cid, direction,

     

       74
       75
        
       			created_at, indexed_at, deleted_at

     

       75
       76
        
       		FROM votes

     

       76
       76
       -
       		WHERE uri = $1

     

       77
       77
       +
       		WHERE uri = $1 AND deleted_at IS NULL

     

       77
       78
        
       	`

     

       78
       79
        
       

     

       79
       80
        
       	var vote votes.Vote

Compare changes