comparing 185f7ae0977cb4e0bc97eb78ec04fa7871fad6e8 and main on bretton.dev/coves

-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
       +
       }]

+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
       +
       }

.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

+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

+92

.env.dev.example

···

       1
       1
       +
       # Coves Local Development Environment Configuration

     

       2
       2
       +
       # Copy this to .env.dev and fill in your values

     

       3
       3
       +
       #

     

       4
       4
       +
       # Quick Start:

     

       5
       5
       +
       #   1. cp .env.dev.example .env.dev

     

       6
       6
       +
       #   2. Generate OAuth key: go run cmd/genjwks/main.go (copy output to OAUTH_PRIVATE_JWK)

     

       7
       7
       +
       #   3. Generate cookie secret: openssl rand -hex 32

     

       8
       8
       +
       #   4. make dev-up  # Start Docker services

     

       9
       9
       +
       #   5. make run     # Start the server (uses -tags dev)

     

       10
       10
       +
       

     

       11
       11
       +
       # =============================================================================

     

       12
       12
       +
       # Dev Mode Quick Reference

     

       13
       13
       +
       # =============================================================================

     

       14
       14
       +
       # REQUIRED for local OAuth to work with local PDS:

     

       15
       15
       +
       #   IS_DEV_ENV=true              # Master switch for dev mode

     

       16
       16
       +
       #   PDS_URL=http://localhost:3001  # Local PDS for handle resolution

     

       17
       17
       +
       #   PLC_DIRECTORY_URL=http://localhost:3002  # Local PLC directory

     

       18
       18
       +
       #   APPVIEW_PUBLIC_URL=http://127.0.0.1:8081  # Use IP not localhost (RFC 8252)

     

       19
       19
       +
       #

     

       20
       20
       +
       # BUILD TAGS:

     

       21
       21
       +
       #   make run      - Runs with -tags dev (includes localhost OAuth resolvers)

     

       22
       22
       +
       #   make build    - Production binary (no dev code)

     

       23
       23
       +
       #   make build-dev - Dev binary (includes dev code)

     

       24
       24
       +
       

     

       25
       25
       +
       # =============================================================================

     

       26
       26
       +
       # PostgreSQL Configuration

     

       27
       27
       +
       # =============================================================================

     

       28
       28
       +
       POSTGRES_HOST=localhost

     

       29
       29
       +
       POSTGRES_PORT=5435

     

       30
       30
       +
       POSTGRES_DB=coves_dev

     

       31
       31
       +
       POSTGRES_USER=dev_user

     

       32
       32
       +
       POSTGRES_PASSWORD=dev_password

     

       33
       33
       +
       

     

       34
       34
       +
       # Test database

     

       35
       35
       +
       POSTGRES_TEST_DB=coves_test

     

       36
       36
       +
       POSTGRES_TEST_USER=test_user

     

       37
       37
       +
       POSTGRES_TEST_PASSWORD=test_password

     

       38
       38
       +
       POSTGRES_TEST_PORT=5434

     

       39
       39
       +
       

     

       40
       40
       +
       # =============================================================================

     

       41
       41
       +
       # PDS Configuration

     

       42
       42
       +
       # =============================================================================

     

       43
       43
       +
       PDS_HOSTNAME=localhost

     

       44
       44
       +
       PDS_PORT=3001

     

       45
       45
       +
       PDS_SERVICE_ENDPOINT=http://localhost:3000

     

       46
       46
       +
       PDS_DID_PLC_URL=http://plc-directory:3000

     

       47
       47
       +
       PDS_JWT_SECRET=local-dev-jwt-secret-change-in-production

     

       48
       48
       +
       PDS_ADMIN_PASSWORD=admin

     

       49
       49
       +
       PDS_SERVICE_HANDLE_DOMAINS=.local.coves.dev,.community.coves.social

     

       50
       50
       +
       PDS_PLC_ROTATION_KEY=<generate-a-random-hex-key>

     

       51
       51
       +
       

     

       52
       52
       +
       # =============================================================================

     

       53
       53
       +
       # AppView Configuration

     

       54
       54
       +
       # =============================================================================

     

       55
       55
       +
       APPVIEW_PORT=8081

     

       56
       56
       +
       FIREHOSE_URL=ws://localhost:3001/xrpc/com.atproto.sync.subscribeRepos

     

       57
       57
       +
       PDS_URL=http://localhost:3001

     

       58
       58
       +
       APPVIEW_PUBLIC_URL=http://127.0.0.1:8081

     

       59
       59
       +
       

     

       60
       60
       +
       # =============================================================================

     

       61
       61
       +
       # Jetstream Configuration

     

       62
       62
       +
       # =============================================================================

     

       63
       63
       +
       JETSTREAM_URL=ws://localhost:6008/subscribe

     

       64
       64
       +
       

     

       65
       65
       +
       # =============================================================================

     

       66
       66
       +
       # Identity Resolution

     

       67
       67
       +
       # =============================================================================

     

       68
       68
       +
       IDENTITY_CACHE_TTL=24h

     

       69
       69
       +
       PLC_DIRECTORY_URL=http://localhost:3002

     

       70
       70
       +
       

     

       71
       71
       +
       # =============================================================================

     

       72
       72
       +
       # OAuth Configuration (MUST GENERATE YOUR OWN)

     

       73
       73
       +
       # =============================================================================

     

       74
       74
       +
       # Generate with: go run cmd/genjwks/main.go

     

       75
       75
       +
       OAUTH_PRIVATE_JWK=<generate-your-own-jwk>

     

       76
       76
       +
       

     

       77
       77
       +
       # Generate with: openssl rand -hex 32

     

       78
       78
       +
       OAUTH_COOKIE_SECRET=<generate-your-own-secret>

     

       79
       79
       +
       

     

       80
       80
       +
       # =============================================================================

     

       81
       81
       +
       # Development Settings

     

       82
       82
       +
       # =============================================================================

     

       83
       83
       +
       ENV=development

     

       84
       84
       +
       NODE_ENV=development

     

       85
       85
       +
       IS_DEV_ENV=true

     

       86
       86
       +
       LOG_LEVEL=debug

     

       87
       87
       +
       LOG_ENABLED=true

     

       88
       88
       +
       

     

       89
       89
       +
       # Security settings (ONLY for local dev - set to false in production!)

     

       90
       90
       +
       SKIP_DID_WEB_VERIFICATION=true

     

       91
       91
       +
       AUTH_SKIP_VERIFY=true

     

       92
       92
       +
       HS256_ISSUERS=http://localhost:3001

+25 -3

Makefile

···

       1
       1
       -
       .PHONY: help dev-up dev-down dev-logs dev-status dev-reset test e2e-test clean

     

       1
       1
       +
       .PHONY: help dev-up dev-down dev-logs dev-status dev-reset test e2e-test clean verify-stack create-test-account mobile-full-setup

     

       2
       2
        
       

     

       3
       3
        
       # Default target - show help

     

       4
       4
        
       .DEFAULT_GOAL := help

     
···

       186
       186
        
       

     

       187
       187
        
       ##@ Build & Run

     

       188
       188
        
       

     

       189
       189
       -
       build: ## Build the Coves server

     

       190
       190
       -
       	@echo "$(GREEN)Building Coves server...$(RESET)"

     

       189
       189
       +
       build: ## Build the Coves server (production - no dev code)

     

       190
       190
       +
       	@echo "$(GREEN)Building Coves server (production)...$(RESET)"

     

       191
       191
        
       	@go build -o server ./cmd/server

     

       192
       192
        
       	@echo "$(GREEN)✓ Build complete: ./server$(RESET)"

     

       193
       193
        
       

     

       194
       194
       +
       build-dev: ## Build the Coves server with dev mode (includes localhost OAuth resolvers)

     

       195
       195
       +
       	@echo "$(GREEN)Building Coves server (dev mode)...$(RESET)"

     

       196
       196
       +
       	@go build -tags dev -o server ./cmd/server

     

       197
       197
       +
       	@echo "$(GREEN)✓ Build complete: ./server (with dev tags)$(RESET)"

     

       198
       198
       +
       

     

       194
       199
        
       run: ## Run the Coves server with dev environment (requires database running)

     

       195
       200
        
       	@./scripts/dev-run.sh

     

       196
       201
        
       

     
···

       236
       241
        
       	@adb reverse --remove-all || echo "$(YELLOW)No device connected$(RESET)"

     

       237
       242
        
       	@echo "$(GREEN)✓ Port forwarding removed$(RESET)"

     

       238
       243
        
       

     

       244
       244
       +
       verify-stack: ## Verify local development stack (PLC, PDS, configs)

     

       245
       245
       +
       	@./scripts/verify-local-stack.sh

     

       246
       246
       +
       

     

       247
       247
       +
       create-test-account: ## Create a test account on local PDS for OAuth testing

     

       248
       248
       +
       	@./scripts/create-test-account.sh

     

       249
       249
       +
       

     

       250
       250
       +
       mobile-full-setup: verify-stack create-test-account mobile-setup ## Full mobile setup: verify stack, create account, setup ports

     

       251
       251
       +
       	@echo ""

     

       252
       252
       +
       	@echo "$(GREEN)═══════════════════════════════════════════════════════════$(RESET)"

     

       253
       253
       +
       	@echo "$(GREEN)  Mobile development environment ready!                     $(RESET)"

     

       254
       254
       +
       	@echo "$(GREEN)═══════════════════════════════════════════════════════════$(RESET)"

     

       255
       255
       +
       	@echo ""

     

       256
       256
       +
       	@echo "$(CYAN)Run the Flutter app with:$(RESET)"

     

       257
       257
       +
       	@echo "  $(YELLOW)cd /home/bretton/Code/coves-mobile$(RESET)"

     

       258
       258
       +
       	@echo "  $(YELLOW)flutter run --dart-define=ENVIRONMENT=local$(RESET)"

     

       259
       259
       +
       	@echo ""

     

       260
       260
       +
       

     

       239
       261
        
       ngrok-up: ## Start ngrok tunnels (for iOS or WiFi testing - requires paid plan for 3 tunnels)

     

       240
       262
        
       	@echo "$(GREEN)Starting ngrok tunnels for mobile testing...$(RESET)"

     

       241
       263
        
       	@./scripts/start-ngrok.sh

+5 -1

docker-compose.dev.yml

···

       58
       58
        
       

     

       59
       59
        
         # Bluesky Personal Data Server (PDS)

     

       60
       60
        
         # Handles user repositories, DIDs, and CAR files

     

       61
       61
       +
         # NOTE: When using --profile plc, PDS waits for PLC directory to be healthy

     

       61
       62
        
         pds:

     

       62
       63
        
           image: ghcr.io/bluesky-social/pds:latest

     

       63
       64
        
           container_name: coves-dev-pds

     
···

       69
       70
        
             PDS_PORT: 3001  # Match external port for correct DID registration

     

       70
       71
        
             PDS_DATA_DIRECTORY: /pds

     

       71
       72
        
             PDS_BLOBSTORE_DISK_LOCATION: /pds/blocks

     

       72
       72
       -
             PDS_DID_PLC_URL: ${PDS_DID_PLC_URL:-https://plc.directory}

     

       73
       73
       +
             # IMPORTANT: For local E2E testing, this MUST point to local PLC directory

     

       74
       74
       +
             # Default to local PLC (http://plc-directory:3000) for full local stack

     

       75
       75
       +
             # The container hostname 'plc-directory' is used for Docker network communication

     

       76
       76
       +
             PDS_DID_PLC_URL: ${PDS_DID_PLC_URL:-http://plc-directory:3000}

     

       73
       77
        
             # PDS_CRAWLERS not needed - we're not using a relay for local dev

     

       74
       78
        
       

     

       75
       79
        
             # Note: PDS uses its own internal SQLite database and CAR file storage

+13 -2

internal/atproto/oauth/client.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"encoding/base64"

     

       5
       5
        
       	"fmt"

     

       6
       6
       +
       	"log/slog"

     

       6
       7
        
       	"net/url"

     

       7
       8
        
       	"time"

     

       8
       9
        
       

     
···

       22
       23
        
       	PublicURL       string

     

       23
       24
        
       	SealSecret      string

     

       24
       25
        
       	PLCURL          string

     

       26
       26
       +
       	PDSURL          string // For dev mode: resolve handles via local PDS

     

       25
       27
        
       	Scopes          []string

     

       26
       28
        
       	SessionTTL      time.Duration

     

       27
       29
        
       	SealedTokenTTL  time.Duration

     
···

       77
       79
        
       	// Create indigo client config

     

       78
       80
        
       	var clientConfig oauth.ClientConfig

     

       79
       81
        
       	if config.DevMode {

     

       80
       80
       -
       		// Dev mode: localhost with HTTP

     

       81
       81
       -
       		callbackURL := "http://localhost:3000/oauth/callback"

     

       82
       82
       +
       		// Dev mode: loopback with HTTP

     

       83
       83
       +
       		// IMPORTANT: Use 127.0.0.1 instead of localhost per RFC 8252 - PDS rejects localhost

     

       84
       84
       +
       		// The callback URL must match the APPVIEW_PUBLIC_URL from .env.dev

     

       85
       85
       +
       		callbackURL := config.PublicURL + "/oauth/callback"

     

       82
       86
        
       		clientConfig = oauth.NewLocalhostConfig(callbackURL, config.Scopes)

     

       87
       87
       +
       		slog.Info("dev mode: OAuth client configured",

     

       88
       88
       +
       			"callback_url", callbackURL,

     

       89
       89
       +
       			"client_id", clientConfig.ClientID)

     

       83
       90
        
       	} else {

     

       84
       91
        
       		// Production mode: public OAuth client with HTTPS

     

       85
       92
        
       		// client_id must be the URL of the client metadata document per atproto OAuth spec

     
···

       112
       119
        
       		// Use pointer since CacheDirectory methods have pointer receivers

     

       113
       120
        
       		cacheDir := identity.NewCacheDirectory(baseDir, 100_000, time.Hour*24, time.Minute*2, time.Minute*5)

     

       114
       121
        
       		clientApp.Dir = &cacheDir

     

       122
       122
       +
       		// Log the PLC URL being used for OAuth directory resolution

     

       123
       123
       +
       		fmt.Printf("🔐 OAuth client directory configured with PLC URL: %s (AllowPrivateIPs: %v)\n", config.PLCURL, config.AllowPrivateIPs)

     

       124
       124
       +
       	} else {

     

       125
       125
       +
       		fmt.Println("⚠️  OAuth client using DEFAULT PLC directory (production plc.directory)")

     

       115
       126
        
       	}

     

       116
       127
        
       

     

       117
       128
        
       	return &OAuthClient{

+285

internal/atproto/oauth/dev_auth_resolver.go

···

       1
       1
       +
       //go:build dev

     

       2
       2
       +
       

     

       3
       3
       +
       package oauth

     

       4
       4
       +
       

     

       5
       5
       +
       import (

     

       6
       6
       +
       	"context"

     

       7
       7
       +
       	"encoding/json"

     

       8
       8
       +
       	"fmt"

     

       9
       9
       +
       	"log/slog"

     

       10
       10
       +
       	"net/http"

     

       11
       11
       +
       	"net/url"

     

       12
       12
       +
       	"strings"

     

       13
       13
       +
       

     

       14
       14
       +
       	oauthlib "github.com/bluesky-social/indigo/atproto/auth/oauth"

     

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

     

       16
       16
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       17
       17
       +
       )

     

       18
       18
       +
       

     

       19
       19
       +
       // DevAuthResolver is a custom OAuth resolver that allows HTTP localhost URLs for development.

     

       20
       20
       +
       // The standard indigo OAuth resolver requires HTTPS and no port numbers, which breaks local testing.

     

       21
       21
       +
       type DevAuthResolver struct {

     

       22
       22
       +
       	Client         *http.Client

     

       23
       23
       +
       	UserAgent      string

     

       24
       24
       +
       	PDSURL         string // For resolving handles via local PDS

     

       25
       25
       +
       	handleResolver *DevHandleResolver

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       // ProtectedResourceMetadata matches the OAuth protected resource metadata document format

     

       29
       29
       +
       type ProtectedResourceMetadata struct {

     

       30
       30
       +
       	Resource             string   `json:"resource"`

     

       31
       31
       +
       	AuthorizationServers []string `json:"authorization_servers"`

     

       32
       32
       +
       }

     

       33
       33
       +
       

     

       34
       34
       +
       // NewDevAuthResolver creates a resolver that accepts localhost HTTP URLs

     

       35
       35
       +
       func NewDevAuthResolver(pdsURL string, allowPrivateIPs bool) *DevAuthResolver {

     

       36
       36
       +
       	resolver := &DevAuthResolver{

     

       37
       37
       +
       		Client:    NewSSRFSafeHTTPClient(allowPrivateIPs),

     

       38
       38
       +
       		UserAgent: "Coves/1.0",

     

       39
       39
       +
       		PDSURL:    pdsURL,

     

       40
       40
       +
       	}

     

       41
       41
       +
       	// Create handle resolver for resolving handles via local PDS

     

       42
       42
       +
       	if pdsURL != "" {

     

       43
       43
       +
       		resolver.handleResolver = NewDevHandleResolver(pdsURL, allowPrivateIPs)

     

       44
       44
       +
       	}

     

       45
       45
       +
       	return resolver

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       48
       48
       +
       // ResolveAuthServerURL resolves a PDS URL to an auth server URL.

     

       49
       49
       +
       // Unlike indigo's standard resolver, this allows HTTP and ports for localhost.

     

       50
       50
       +
       func (r *DevAuthResolver) ResolveAuthServerURL(ctx context.Context, hostURL string) (string, error) {

     

       51
       51
       +
       	u, err := url.Parse(hostURL)

     

       52
       52
       +
       	if err != nil {

     

       53
       53
       +
       		return "", err

     

       54
       54
       +
       	}

     

       55
       55
       +
       

     

       56
       56
       +
       	// For localhost, allow HTTP and port numbers

     

       57
       57
       +
       	isLocalhost := u.Hostname() == "localhost" || u.Hostname() == "127.0.0.1"

     

       58
       58
       +
       	if !isLocalhost {

     

       59
       59
       +
       		// For non-localhost, enforce HTTPS and no port (standard rules)

     

       60
       60
       +
       		if u.Scheme != "https" || u.Port() != "" {

     

       61
       61
       +
       			return "", fmt.Errorf("not a valid public host URL: %s", hostURL)

     

       62
       62
       +
       		}

     

       63
       63
       +
       	}

     

       64
       64
       +
       

     

       65
       65
       +
       	// Build the protected resource document URL

     

       66
       66
       +
       	var docURL string

     

       67
       67
       +
       	if isLocalhost {

     

       68
       68
       +
       		// For localhost, preserve the port and use HTTP

     

       69
       69
       +
       		port := u.Port()

     

       70
       70
       +
       		if port == "" {

     

       71
       71
       +
       			port = "3001" // Default PDS port

     

       72
       72
       +
       		}

     

       73
       73
       +
       		docURL = fmt.Sprintf("http://%s:%s/.well-known/oauth-protected-resource", u.Hostname(), port)

     

       74
       74
       +
       	} else {

     

       75
       75
       +
       		docURL = fmt.Sprintf("https://%s/.well-known/oauth-protected-resource", u.Hostname())

     

       76
       76
       +
       	}

     

       77
       77
       +
       

     

       78
       78
       +
       	// Fetch the protected resource document

     

       79
       79
       +
       	req, err := http.NewRequestWithContext(ctx, "GET", docURL, nil)

     

       80
       80
       +
       	if err != nil {

     

       81
       81
       +
       		return "", err

     

       82
       82
       +
       	}

     

       83
       83
       +
       	if r.UserAgent != "" {

     

       84
       84
       +
       		req.Header.Set("User-Agent", r.UserAgent)

     

       85
       85
       +
       	}

     

       86
       86
       +
       

     

       87
       87
       +
       	resp, err := r.Client.Do(req)

     

       88
       88
       +
       	if err != nil {

     

       89
       89
       +
       		return "", fmt.Errorf("fetching protected resource document: %w", err)

     

       90
       90
       +
       	}

     

       91
       91
       +
       	defer resp.Body.Close()

     

       92
       92
       +
       

     

       93
       93
       +
       	if resp.StatusCode != http.StatusOK {

     

       94
       94
       +
       		return "", fmt.Errorf("HTTP error fetching protected resource document: %d", resp.StatusCode)

     

       95
       95
       +
       	}

     

       96
       96
       +
       

     

       97
       97
       +
       	var body ProtectedResourceMetadata

     

       98
       98
       +
       	if err := json.NewDecoder(resp.Body).Decode(&body); err != nil {

     

       99
       99
       +
       		return "", fmt.Errorf("invalid protected resource document: %w", err)

     

       100
       100
       +
       	}

     

       101
       101
       +
       

     

       102
       102
       +
       	if len(body.AuthorizationServers) < 1 {

     

       103
       103
       +
       		return "", fmt.Errorf("no auth server URL in protected resource document")

     

       104
       104
       +
       	}

     

       105
       105
       +
       

     

       106
       106
       +
       	authURL := body.AuthorizationServers[0]

     

       107
       107
       +
       

     

       108
       108
       +
       	// Validate the auth server URL (with localhost exception)

     

       109
       109
       +
       	au, err := url.Parse(authURL)

     

       110
       110
       +
       	if err != nil {

     

       111
       111
       +
       		return "", fmt.Errorf("invalid auth server URL: %w", err)

     

       112
       112
       +
       	}

     

       113
       113
       +
       

     

       114
       114
       +
       	authIsLocalhost := au.Hostname() == "localhost" || au.Hostname() == "127.0.0.1"

     

       115
       115
       +
       	if !authIsLocalhost {

     

       116
       116
       +
       		if au.Scheme != "https" || au.Port() != "" {

     

       117
       117
       +
       			return "", fmt.Errorf("invalid auth server URL: %s", authURL)

     

       118
       118
       +
       		}

     

       119
       119
       +
       	}

     

       120
       120
       +
       

     

       121
       121
       +
       	return authURL, nil

     

       122
       122
       +
       }

     

       123
       123
       +
       

     

       124
       124
       +
       // ResolveAuthServerMetadataDev fetches OAuth server metadata from a given auth server URL.

     

       125
       125
       +
       // Unlike indigo's resolver, this allows HTTP and ports for localhost.

     

       126
       126
       +
       func (r *DevAuthResolver) ResolveAuthServerMetadataDev(ctx context.Context, serverURL string) (*oauthlib.AuthServerMetadata, error) {

     

       127
       127
       +
       	u, err := url.Parse(serverURL)

     

       128
       128
       +
       	if err != nil {

     

       129
       129
       +
       		return nil, err

     

       130
       130
       +
       	}

     

       131
       131
       +
       

     

       132
       132
       +
       	// Build metadata URL - preserve port for localhost

     

       133
       133
       +
       	var metaURL string

     

       134
       134
       +
       	isLocalhost := u.Hostname() == "localhost" || u.Hostname() == "127.0.0.1"

     

       135
       135
       +
       	if isLocalhost && u.Port() != "" {

     

       136
       136
       +
       		metaURL = fmt.Sprintf("%s://%s:%s/.well-known/oauth-authorization-server", u.Scheme, u.Hostname(), u.Port())

     

       137
       137
       +
       	} else if isLocalhost {

     

       138
       138
       +
       		metaURL = fmt.Sprintf("%s://%s/.well-known/oauth-authorization-server", u.Scheme, u.Hostname())

     

       139
       139
       +
       	} else {

     

       140
       140
       +
       		metaURL = fmt.Sprintf("https://%s/.well-known/oauth-authorization-server", u.Hostname())

     

       141
       141
       +
       	}

     

       142
       142
       +
       

     

       143
       143
       +
       	slog.Debug("dev mode: fetching auth server metadata", "url", metaURL)

     

       144
       144
       +
       

     

       145
       145
       +
       	req, err := http.NewRequestWithContext(ctx, "GET", metaURL, nil)

     

       146
       146
       +
       	if err != nil {

     

       147
       147
       +
       		return nil, err

     

       148
       148
       +
       	}

     

       149
       149
       +
       	if r.UserAgent != "" {

     

       150
       150
       +
       		req.Header.Set("User-Agent", r.UserAgent)

     

       151
       151
       +
       	}

     

       152
       152
       +
       

     

       153
       153
       +
       	resp, err := r.Client.Do(req)

     

       154
       154
       +
       	if err != nil {

     

       155
       155
       +
       		return nil, fmt.Errorf("fetching auth server metadata: %w", err)

     

       156
       156
       +
       	}

     

       157
       157
       +
       	defer resp.Body.Close()

     

       158
       158
       +
       

     

       159
       159
       +
       	if resp.StatusCode != http.StatusOK {

     

       160
       160
       +
       		return nil, fmt.Errorf("HTTP error fetching auth server metadata: %d", resp.StatusCode)

     

       161
       161
       +
       	}

     

       162
       162
       +
       

     

       163
       163
       +
       	var metadata oauthlib.AuthServerMetadata

     

       164
       164
       +
       	if err := json.NewDecoder(resp.Body).Decode(&metadata); err != nil {

     

       165
       165
       +
       		return nil, fmt.Errorf("invalid auth server metadata: %w", err)

     

       166
       166
       +
       	}

     

       167
       167
       +
       

     

       168
       168
       +
       	// Skip validation for localhost (indigo's Validate checks HTTPS)

     

       169
       169
       +
       	if !isLocalhost {

     

       170
       170
       +
       		if err := metadata.Validate(serverURL); err != nil {

     

       171
       171
       +
       			return nil, fmt.Errorf("invalid auth server metadata: %w", err)

     

       172
       172
       +
       		}

     

       173
       173
       +
       	}

     

       174
       174
       +
       

     

       175
       175
       +
       	return &metadata, nil

     

       176
       176
       +
       }

     

       177
       177
       +
       

     

       178
       178
       +
       // StartDevAuthFlow performs OAuth flow for localhost development.

     

       179
       179
       +
       // This bypasses indigo's HTTPS validation for the auth server URL.

     

       180
       180
       +
       // It resolves the identity, gets the PDS endpoint, fetches auth server metadata,

     

       181
       181
       +
       // and returns a redirect URL for the user to approve.

     

       182
       182
       +
       func (r *DevAuthResolver) StartDevAuthFlow(ctx context.Context, client *OAuthClient, identifier string, dir identity.Directory) (string, error) {

     

       183
       183
       +
       	var accountDID syntax.DID

     

       184
       184
       +
       	var pdsEndpoint string

     

       185
       185
       +
       

     

       186
       186
       +
       	// Check if identifier is a handle or DID

     

       187
       187
       +
       	if strings.HasPrefix(identifier, "did:") {

     

       188
       188
       +
       		// It's a DID - look up via directory (PLC)

     

       189
       189
       +
       		atid, err := syntax.ParseAtIdentifier(identifier)

     

       190
       190
       +
       		if err != nil {

     

       191
       191
       +
       			return "", fmt.Errorf("not a valid DID (%s): %w", identifier, err)

     

       192
       192
       +
       		}

     

       193
       193
       +
       		ident, err := dir.Lookup(ctx, *atid)

     

       194
       194
       +
       		if err != nil {

     

       195
       195
       +
       			return "", fmt.Errorf("failed to resolve DID (%s): %w", identifier, err)

     

       196
       196
       +
       		}

     

       197
       197
       +
       		accountDID = ident.DID

     

       198
       198
       +
       		pdsEndpoint = ident.PDSEndpoint()

     

       199
       199
       +
       	} else {

     

       200
       200
       +
       		// It's a handle - resolve via local PDS first

     

       201
       201
       +
       		if r.handleResolver == nil {

     

       202
       202
       +
       			return "", fmt.Errorf("handle resolution not configured (PDS URL not set)")

     

       203
       203
       +
       		}

     

       204
       204
       +
       

     

       205
       205
       +
       		// Resolve handle to DID via local PDS

     

       206
       206
       +
       		did, err := r.handleResolver.ResolveHandle(ctx, identifier)

     

       207
       207
       +
       		if err != nil {

     

       208
       208
       +
       			return "", fmt.Errorf("failed to resolve handle via PDS (%s): %w", identifier, err)

     

       209
       209
       +
       		}

     

       210
       210
       +
       		if did == "" {

     

       211
       211
       +
       			return "", fmt.Errorf("handle not found: %s", identifier)

     

       212
       212
       +
       		}

     

       213
       213
       +
       

     

       214
       214
       +
       		slog.Info("dev mode: resolved handle via local PDS", "handle", identifier, "did", did)

     

       215
       215
       +
       

     

       216
       216
       +
       		// Parse the DID

     

       217
       217
       +
       		parsedDID, err := syntax.ParseDID(did)

     

       218
       218
       +
       		if err != nil {

     

       219
       219
       +
       			return "", fmt.Errorf("invalid DID from PDS (%s): %w", did, err)

     

       220
       220
       +
       		}

     

       221
       221
       +
       		accountDID = parsedDID

     

       222
       222
       +
       

     

       223
       223
       +
       		// Now look up the DID document via PLC to get PDS endpoint

     

       224
       224
       +
       		atid, err := syntax.ParseAtIdentifier(did)

     

       225
       225
       +
       		if err != nil {

     

       226
       226
       +
       			return "", fmt.Errorf("not a valid DID (%s): %w", did, err)

     

       227
       227
       +
       		}

     

       228
       228
       +
       		ident, err := dir.Lookup(ctx, *atid)

     

       229
       229
       +
       		if err != nil {

     

       230
       230
       +
       			return "", fmt.Errorf("failed to resolve DID document (%s): %w", did, err)

     

       231
       231
       +
       		}

     

       232
       232
       +
       		pdsEndpoint = ident.PDSEndpoint()

     

       233
       233
       +
       	}

     

       234
       234
       +
       

     

       235
       235
       +
       	if pdsEndpoint == "" {

     

       236
       236
       +
       		return "", fmt.Errorf("identity does not link to an atproto host (PDS)")

     

       237
       237
       +
       	}

     

       238
       238
       +
       

     

       239
       239
       +
       	slog.Debug("dev mode: resolving auth server",

     

       240
       240
       +
       		"did", accountDID,

     

       241
       241
       +
       		"pds", pdsEndpoint)

     

       242
       242
       +
       

     

       243
       243
       +
       	// Resolve auth server URL (allowing HTTP for localhost)

     

       244
       244
       +
       	authServerURL, err := r.ResolveAuthServerURL(ctx, pdsEndpoint)

     

       245
       245
       +
       	if err != nil {

     

       246
       246
       +
       		return "", fmt.Errorf("resolving auth server: %w", err)

     

       247
       247
       +
       	}

     

       248
       248
       +
       

     

       249
       249
       +
       	slog.Info("dev mode: resolved auth server", "url", authServerURL)

     

       250
       250
       +
       

     

       251
       251
       +
       	// Fetch auth server metadata using our dev-friendly resolver

     

       252
       252
       +
       	authMeta, err := r.ResolveAuthServerMetadataDev(ctx, authServerURL)

     

       253
       253
       +
       	if err != nil {

     

       254
       254
       +
       		return "", fmt.Errorf("fetching auth server metadata: %w", err)

     

       255
       255
       +
       	}

     

       256
       256
       +
       

     

       257
       257
       +
       	slog.Debug("dev mode: got auth server metadata",

     

       258
       258
       +
       		"issuer", authMeta.Issuer,

     

       259
       259
       +
       		"authorization_endpoint", authMeta.AuthorizationEndpoint,

     

       260
       260
       +
       		"token_endpoint", authMeta.TokenEndpoint)

     

       261
       261
       +
       

     

       262
       262
       +
       	// Send auth request (PAR) using indigo's method

     

       263
       263
       +
       	info, err := client.ClientApp.SendAuthRequest(ctx, authMeta, client.Config.Scopes, identifier)

     

       264
       264
       +
       	if err != nil {

     

       265
       265
       +
       		return "", fmt.Errorf("auth request failed: %w", err)

     

       266
       266
       +
       	}

     

       267
       267
       +
       

     

       268
       268
       +
       	// Set the account DID

     

       269
       269
       +
       	info.AccountDID = &accountDID

     

       270
       270
       +
       

     

       271
       271
       +
       	// Persist auth request info

     

       272
       272
       +
       	client.ClientApp.Store.SaveAuthRequestInfo(ctx, *info)

     

       273
       273
       +
       

     

       274
       274
       +
       	// Build redirect URL

     

       275
       275
       +
       	params := url.Values{}

     

       276
       276
       +
       	params.Set("client_id", client.ClientApp.Config.ClientID)

     

       277
       277
       +
       	params.Set("request_uri", info.RequestURI)

     

       278
       278
       +
       

     

       279
       279
       +
       	authEndpoint := authMeta.AuthorizationEndpoint

     

       280
       280
       +
       	redirectURL := fmt.Sprintf("%s?%s", authEndpoint, params.Encode())

     

       281
       281
       +
       

     

       282
       282
       +
       	slog.Info("dev mode: OAuth redirect URL built", "url_prefix", authEndpoint)

     

       283
       283
       +
       

     

       284
       284
       +
       	return redirectURL, nil

     

       285
       285
       +
       }

+106

internal/atproto/oauth/dev_resolver.go

···

       1
       1
       +
       //go:build dev

     

       2
       2
       +
       

     

       3
       3
       +
       package oauth

     

       4
       4
       +
       

     

       5
       5
       +
       import (

     

       6
       6
       +
       	"context"

     

       7
       7
       +
       	"encoding/json"

     

       8
       8
       +
       	"fmt"

     

       9
       9
       +
       	"log/slog"

     

       10
       10
       +
       	"net/http"

     

       11
       11
       +
       	"net/url"

     

       12
       12
       +
       	"strings"

     

       13
       13
       +
       	"time"

     

       14
       14
       +
       )

     

       15
       15
       +
       

     

       16
       16
       +
       // DevHandleResolver resolves handles via local PDS for development

     

       17
       17
       +
       // This is needed because local handles (e.g., user.local.coves.dev) can't be

     

       18
       18
       +
       // resolved via standard DNS/HTTP well-known methods - they only exist on the local PDS.

     

       19
       19
       +
       type DevHandleResolver struct {

     

       20
       20
       +
       	pdsURL     string

     

       21
       21
       +
       	httpClient *http.Client

     

       22
       22
       +
       }

     

       23
       23
       +
       

     

       24
       24
       +
       // NewDevHandleResolver creates a resolver that queries local PDS for handle resolution

     

       25
       25
       +
       func NewDevHandleResolver(pdsURL string, allowPrivateIPs bool) *DevHandleResolver {

     

       26
       26
       +
       	return &DevHandleResolver{

     

       27
       27
       +
       		pdsURL:     strings.TrimSuffix(pdsURL, "/"),

     

       28
       28
       +
       		httpClient: NewSSRFSafeHTTPClient(allowPrivateIPs),

     

       29
       29
       +
       	}

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       // ResolveHandle queries the local PDS to resolve a handle to a DID

     

       33
       33
       +
       // Returns the DID if successful, or empty string if not found

     

       34
       34
       +
       func (r *DevHandleResolver) ResolveHandle(ctx context.Context, handle string) (string, error) {

     

       35
       35
       +
       	if r.pdsURL == "" {

     

       36
       36
       +
       		return "", fmt.Errorf("PDS URL not configured")

     

       37
       37
       +
       	}

     

       38
       38
       +
       

     

       39
       39
       +
       	// Build the resolve handle URL

     

       40
       40
       +
       	resolveURL := fmt.Sprintf("%s/xrpc/com.atproto.identity.resolveHandle?handle=%s",

     

       41
       41
       +
       		r.pdsURL, url.QueryEscape(handle))

     

       42
       42
       +
       

     

       43
       43
       +
       	// Create request with context and timeout

     

       44
       44
       +
       	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)

     

       45
       45
       +
       	defer cancel()

     

       46
       46
       +
       

     

       47
       47
       +
       	req, err := http.NewRequestWithContext(ctx, "GET", resolveURL, nil)

     

       48
       48
       +
       	if err != nil {

     

       49
       49
       +
       		return "", fmt.Errorf("failed to create request: %w", err)

     

       50
       50
       +
       	}

     

       51
       51
       +
       	req.Header.Set("User-Agent", "Coves/1.0")

     

       52
       52
       +
       

     

       53
       53
       +
       	// Execute request

     

       54
       54
       +
       	resp, err := r.httpClient.Do(req)

     

       55
       55
       +
       	if err != nil {

     

       56
       56
       +
       		return "", fmt.Errorf("failed to query PDS: %w", err)

     

       57
       57
       +
       	}

     

       58
       58
       +
       	defer resp.Body.Close()

     

       59
       59
       +
       

     

       60
       60
       +
       	// Check response status

     

       61
       61
       +
       	if resp.StatusCode == http.StatusNotFound || resp.StatusCode == http.StatusBadRequest {

     

       62
       62
       +
       		return "", nil // Handle not found

     

       63
       63
       +
       	}

     

       64
       64
       +
       	if resp.StatusCode != http.StatusOK {

     

       65
       65
       +
       		return "", fmt.Errorf("PDS returned status %d", resp.StatusCode)

     

       66
       66
       +
       	}

     

       67
       67
       +
       

     

       68
       68
       +
       	// Parse response

     

       69
       69
       +
       	var result struct {

     

       70
       70
       +
       		DID string `json:"did"`

     

       71
       71
       +
       	}

     

       72
       72
       +
       	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {

     

       73
       73
       +
       		return "", fmt.Errorf("failed to parse PDS response: %w", err)

     

       74
       74
       +
       	}

     

       75
       75
       +
       

     

       76
       76
       +
       	if result.DID == "" {

     

       77
       77
       +
       		return "", nil // No DID in response

     

       78
       78
       +
       	}

     

       79
       79
       +
       

     

       80
       80
       +
       	slog.Debug("resolved handle via local PDS",

     

       81
       81
       +
       		"handle", handle,

     

       82
       82
       +
       		"did", result.DID,

     

       83
       83
       +
       		"pds_url", r.pdsURL)

     

       84
       84
       +
       

     

       85
       85
       +
       	return result.DID, nil

     

       86
       86
       +
       }

     

       87
       87
       +
       

     

       88
       88
       +
       // ResolveIdentifier attempts to resolve a handle to DID, or returns the DID if already provided

     

       89
       89
       +
       // This is the main entry point for the handlers

     

       90
       90
       +
       func (r *DevHandleResolver) ResolveIdentifier(ctx context.Context, identifier string) (string, error) {

     

       91
       91
       +
       	// If it's already a DID, return as-is

     

       92
       92
       +
       	if strings.HasPrefix(identifier, "did:") {

     

       93
       93
       +
       		return identifier, nil

     

       94
       94
       +
       	}

     

       95
       95
       +
       

     

       96
       96
       +
       	// Try to resolve the handle via local PDS

     

       97
       97
       +
       	did, err := r.ResolveHandle(ctx, identifier)

     

       98
       98
       +
       	if err != nil {

     

       99
       99
       +
       		return "", fmt.Errorf("failed to resolve handle via PDS: %w", err)

     

       100
       100
       +
       	}

     

       101
       101
       +
       	if did == "" {

     

       102
       102
       +
       		return "", fmt.Errorf("handle not found on local PDS: %s", identifier)

     

       103
       103
       +
       	}

     

       104
       104
       +
       

     

       105
       105
       +
       	return did, nil

     

       106
       106
       +
       }

+41

internal/atproto/oauth/dev_stubs.go

···

       1
       1
       +
       //go:build !dev

     

       2
       2
       +
       

     

       3
       3
       +
       package oauth

     

       4
       4
       +
       

     

       5
       5
       +
       import (

     

       6
       6
       +
       	"context"

     

       7
       7
       +
       

     

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

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // DevHandleResolver is a stub for production builds.

     

       12
       12
       +
       // The actual implementation is in dev_resolver.go (only compiled with -tags dev).

     

       13
       13
       +
       type DevHandleResolver struct{}

     

       14
       14
       +
       

     

       15
       15
       +
       // NewDevHandleResolver returns nil in production builds.

     

       16
       16
       +
       // Dev mode features are only available when built with -tags dev.

     

       17
       17
       +
       func NewDevHandleResolver(pdsURL string, allowPrivateIPs bool) *DevHandleResolver {

     

       18
       18
       +
       	return nil

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       // ResolveHandle is a stub that should never be called in production.

     

       22
       22
       +
       // The nil check in handlers.go prevents this from being reached.

     

       23
       23
       +
       func (r *DevHandleResolver) ResolveHandle(ctx context.Context, handle string) (string, error) {

     

       24
       24
       +
       	panic("dev mode: ResolveHandle called in production build - this should never happen")

     

       25
       25
       +
       }

     

       26
       26
       +
       

     

       27
       27
       +
       // DevAuthResolver is a stub for production builds.

     

       28
       28
       +
       // The actual implementation is in dev_auth_resolver.go (only compiled with -tags dev).

     

       29
       29
       +
       type DevAuthResolver struct{}

     

       30
       30
       +
       

     

       31
       31
       +
       // NewDevAuthResolver returns nil in production builds.

     

       32
       32
       +
       // Dev mode features are only available when built with -tags dev.

     

       33
       33
       +
       func NewDevAuthResolver(pdsURL string, allowPrivateIPs bool) *DevAuthResolver {

     

       34
       34
       +
       	return nil

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       // StartDevAuthFlow is a stub that should never be called in production.

     

       38
       38
       +
       // The nil check in handlers.go prevents this from being reached.

     

       39
       39
       +
       func (r *DevAuthResolver) StartDevAuthFlow(ctx context.Context, client *OAuthClient, identifier string, dir identity.Directory) (string, error) {

     

       40
       40
       +
       	panic("dev mode: StartDevAuthFlow called in production build - this should never happen")

     

       41
       41
       +
       }

+5 -1

scripts/dev-run.sh

···

       1
       1
        
       #!/bin/bash

     

       2
       2
        
       # Development server runner - loads .env.dev before starting

     

       3
       3
       +
       # Uses -tags dev to include dev-only code (localhost OAuth resolvers, etc.)

     

       3
       4
        
       

     

       4
       5
        
       set -a  # automatically export all variables

     

       5
       6
        
       source .env.dev

     
···

       9
       10
        
       echo "   IS_DEV_ENV: $IS_DEV_ENV"

     

       10
       11
        
       echo "   PLC_DIRECTORY_URL: $PLC_DIRECTORY_URL"

     

       11
       12
        
       echo "   JETSTREAM_URL: $JETSTREAM_URL"

     

       13
       13
       +
       echo "   APPVIEW_PUBLIC_URL: $APPVIEW_PUBLIC_URL"

     

       14
       14
       +
       echo "   PDS_URL: $PDS_URL"

     

       15
       15
       +
       echo "   Build tags: dev"

     

       12
       16
        
       echo ""

     

       13
       17
        
       

     

       14
       14
       -
       go run ./cmd/server

     

       18
       18
       +
       go run -tags dev ./cmd/server

+125

internal/atproto/pds/factory.go

···

       1
       1
       +
       package pds

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"net/http"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/bluesky-social/indigo/atproto/atclient"

     

       9
       9
       +
       	"github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       10
       10
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       11
       11
       +
       )

     

       12
       12
       +
       

     

       13
       13
       +
       // NewFromOAuthSession creates a PDS client from an OAuth session.

     

       14
       14
       +
       // This uses DPoP authentication - the correct method for OAuth tokens.

     

       15
       15
       +
       //

     

       16
       16
       +
       // The oauthClient is used to resume the session and get a properly configured

     

       17
       17
       +
       // APIClient that handles DPoP proof generation and nonce rotation automatically.

     

       18
       18
       +
       func NewFromOAuthSession(ctx context.Context, oauthClient *oauth.ClientApp, sessionData *oauth.ClientSessionData) (Client, error) {

     

       19
       19
       +
       	if oauthClient == nil {

     

       20
       20
       +
       		return nil, fmt.Errorf("oauthClient is required")

     

       21
       21
       +
       	}

     

       22
       22
       +
       	if sessionData == nil {

     

       23
       23
       +
       		return nil, fmt.Errorf("sessionData is required")

     

       24
       24
       +
       	}

     

       25
       25
       +
       

     

       26
       26
       +
       	// ResumeSession reconstructs the OAuth session with DPoP key

     

       27
       27
       +
       	// and returns a ClientSession that can generate authenticated requests

     

       28
       28
       +
       	sess, err := oauthClient.ResumeSession(ctx, sessionData.AccountDID, sessionData.SessionID)

     

       29
       29
       +
       	if err != nil {

     

       30
       30
       +
       		return nil, fmt.Errorf("failed to resume OAuth session: %w", err)

     

       31
       31
       +
       	}

     

       32
       32
       +
       

     

       33
       33
       +
       	// APIClient() returns an *atclient.APIClient configured with DPoP auth

     

       34
       34
       +
       	apiClient := sess.APIClient()

     

       35
       35
       +
       

     

       36
       36
       +
       	return &client{

     

       37
       37
       +
       		apiClient: apiClient,

     

       38
       38
       +
       		did:       sessionData.AccountDID.String(),

     

       39
       39
       +
       		host:      sessionData.HostURL,

     

       40
       40
       +
       	}, nil

     

       41
       41
       +
       }

     

       42
       42
       +
       

     

       43
       43
       +
       // NewFromPasswordAuth creates a PDS client using password authentication.

     

       44
       44
       +
       // This uses Bearer token authentication from com.atproto.server.createSession.

     

       45
       45
       +
       //

     

       46
       46
       +
       // Primarily used for:

     

       47
       47
       +
       // - E2E tests with local PDS

     

       48
       48
       +
       // - Development/debugging tools

     

       49
       49
       +
       // - Non-OAuth clients

     

       50
       50
       +
       //

     

       51
       51
       +
       // Note: This establishes a new session with the PDS. For repeated calls,

     

       52
       52
       +
       // consider using NewFromAccessToken if you already have a valid access token.

     

       53
       53
       +
       func NewFromPasswordAuth(ctx context.Context, host, handle, password string) (Client, error) {

     

       54
       54
       +
       	if host == "" {

     

       55
       55
       +
       		return nil, fmt.Errorf("host is required")

     

       56
       56
       +
       	}

     

       57
       57
       +
       	if handle == "" {

     

       58
       58
       +
       		return nil, fmt.Errorf("handle is required")

     

       59
       59
       +
       	}

     

       60
       60
       +
       	if password == "" {

     

       61
       61
       +
       		return nil, fmt.Errorf("password is required")

     

       62
       62
       +
       	}

     

       63
       63
       +
       

     

       64
       64
       +
       	// LoginWithPasswordHost creates a session and returns an authenticated APIClient

     

       65
       65
       +
       	// This handles the createSession call and Bearer token setup

     

       66
       66
       +
       	apiClient, err := atclient.LoginWithPasswordHost(ctx, host, handle, password, "", nil)

     

       67
       67
       +
       	if err != nil {

     

       68
       68
       +
       		return nil, fmt.Errorf("failed to login with password: %w", err)

     

       69
       69
       +
       	}

     

       70
       70
       +
       

     

       71
       71
       +
       	// Get DID from the authenticated client

     

       72
       72
       +
       	did := ""

     

       73
       73
       +
       	if apiClient.AccountDID != nil {

     

       74
       74
       +
       		did = apiClient.AccountDID.String()

     

       75
       75
       +
       	}

     

       76
       76
       +
       

     

       77
       77
       +
       	return &client{

     

       78
       78
       +
       		apiClient: apiClient,

     

       79
       79
       +
       		did:       did,

     

       80
       80
       +
       		host:      host,

     

       81
       81
       +
       	}, nil

     

       82
       82
       +
       }

     

       83
       83
       +
       

     

       84
       84
       +
       // NewFromAccessToken creates a PDS client from an existing access token.

     

       85
       85
       +
       // This is useful when you already have a valid Bearer token (e.g., from createSession)

     

       86
       86
       +
       // and don't want to re-authenticate.

     

       87
       87
       +
       //

     

       88
       88
       +
       // WARNING: This creates a client with Bearer auth only. Do NOT use this with

     

       89
       89
       +
       // OAuth access tokens - those require DPoP proofs. Use NewFromOAuthSession instead.

     

       90
       90
       +
       func NewFromAccessToken(host, did, accessToken string) (Client, error) {

     

       91
       91
       +
       	if host == "" {

     

       92
       92
       +
       		return nil, fmt.Errorf("host is required")

     

       93
       93
       +
       	}

     

       94
       94
       +
       	if did == "" {

     

       95
       95
       +
       		return nil, fmt.Errorf("did is required")

     

       96
       96
       +
       	}

     

       97
       97
       +
       	if accessToken == "" {

     

       98
       98
       +
       		return nil, fmt.Errorf("accessToken is required")

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	// Create APIClient with Bearer auth

     

       102
       102
       +
       	apiClient := atclient.NewAPIClient(host)

     

       103
       103
       +
       	apiClient.Auth = &bearerAuth{token: accessToken}

     

       104
       104
       +
       

     

       105
       105
       +
       	return &client{

     

       106
       106
       +
       		apiClient: apiClient,

     

       107
       107
       +
       		did:       did,

     

       108
       108
       +
       		host:      host,

     

       109
       109
       +
       	}, nil

     

       110
       110
       +
       }

     

       111
       111
       +
       

     

       112
       112
       +
       // bearerAuth implements atclient.AuthMethod for simple Bearer token auth.

     

       113
       113
       +
       // This is used for password-based sessions where DPoP is not required.

     

       114
       114
       +
       type bearerAuth struct {

     

       115
       115
       +
       	token string

     

       116
       116
       +
       }

     

       117
       117
       +
       

     

       118
       118
       +
       // Ensure bearerAuth implements atclient.AuthMethod.

     

       119
       119
       +
       var _ atclient.AuthMethod = (*bearerAuth)(nil)

     

       120
       120
       +
       

     

       121
       121
       +
       // DoWithAuth adds the Bearer token to the request and executes it.

     

       122
       122
       +
       func (b *bearerAuth) DoWithAuth(c *http.Client, req *http.Request, _ syntax.NSID) (*http.Response, error) {

     

       123
       123
       +
       	req.Header.Set("Authorization", "Bearer "+b.token)

     

       124
       124
       +
       	return c.Do(req)

     

       125
       125
       +
       }

+267

cmd/reindex-votes/main.go

···

       1
       1
       +
       // cmd/reindex-votes/main.go

     

       2
       2
       +
       // Quick tool to reindex votes from PDS to AppView database

     

       3
       3
       +
       package main

     

       4
       4
       +
       

     

       5
       5
       +
       import (

     

       6
       6
       +
       	"context"

     

       7
       7
       +
       	"database/sql"

     

       8
       8
       +
       	"encoding/json"

     

       9
       9
       +
       	"fmt"

     

       10
       10
       +
       	"log"

     

       11
       11
       +
       	"net/http"

     

       12
       12
       +
       	"net/url"

     

       13
       13
       +
       	"os"

     

       14
       14
       +
       	"strings"

     

       15
       15
       +
       	"time"

     

       16
       16
       +
       

     

       17
       17
       +
       	_ "github.com/lib/pq"

     

       18
       18
       +
       )

     

       19
       19
       +
       

     

       20
       20
       +
       type ListRecordsResponse struct {

     

       21
       21
       +
       	Records []Record `json:"records"`

     

       22
       22
       +
       	Cursor  string   `json:"cursor"`

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       type Record struct {

     

       26
       26
       +
       	URI   string                 `json:"uri"`

     

       27
       27
       +
       	CID   string                 `json:"cid"`

     

       28
       28
       +
       	Value map[string]interface{} `json:"value"`

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       31
       31
       +
       func main() {

     

       32
       32
       +
       	// Get config from env

     

       33
       33
       +
       	dbURL := os.Getenv("DATABASE_URL")

     

       34
       34
       +
       	if dbURL == "" {

     

       35
       35
       +
       		dbURL = "postgres://dev_user:dev_password@localhost:5435/coves_dev?sslmode=disable"

     

       36
       36
       +
       	}

     

       37
       37
       +
       	pdsURL := os.Getenv("PDS_URL")

     

       38
       38
       +
       	if pdsURL == "" {

     

       39
       39
       +
       		pdsURL = "http://localhost:3001"

     

       40
       40
       +
       	}

     

       41
       41
       +
       

     

       42
       42
       +
       	log.Printf("Connecting to database...")

     

       43
       43
       +
       	db, err := sql.Open("postgres", dbURL)

     

       44
       44
       +
       	if err != nil {

     

       45
       45
       +
       		log.Fatalf("Failed to connect to database: %v", err)

     

       46
       46
       +
       	}

     

       47
       47
       +
       	defer db.Close()

     

       48
       48
       +
       

     

       49
       49
       +
       	ctx := context.Background()

     

       50
       50
       +
       

     

       51
       51
       +
       	// Get all accounts directly from the PDS

     

       52
       52
       +
       	log.Printf("Fetching accounts from PDS (%s)...", pdsURL)

     

       53
       53
       +
       	dids, err := fetchAllAccountsFromPDS(pdsURL)

     

       54
       54
       +
       	if err != nil {

     

       55
       55
       +
       		log.Fatalf("Failed to fetch accounts from PDS: %v", err)

     

       56
       56
       +
       	}

     

       57
       57
       +
       	log.Printf("Found %d accounts on PDS to check for votes", len(dids))

     

       58
       58
       +
       

     

       59
       59
       +
       	// Reset vote counts first

     

       60
       60
       +
       	log.Printf("Resetting all vote counts...")

     

       61
       61
       +
       	if _, err := db.ExecContext(ctx, "DELETE FROM votes"); err != nil {

     

       62
       62
       +
       		log.Fatalf("Failed to clear votes table: %v", err)

     

       63
       63
       +
       	}

     

       64
       64
       +
       	if _, err := db.ExecContext(ctx, "UPDATE posts SET upvote_count = 0, downvote_count = 0, score = 0"); err != nil {

     

       65
       65
       +
       		log.Fatalf("Failed to reset post vote counts: %v", err)

     

       66
       66
       +
       	}

     

       67
       67
       +
       	if _, err := db.ExecContext(ctx, "UPDATE comments SET upvote_count = 0, downvote_count = 0, score = 0"); err != nil {

     

       68
       68
       +
       		log.Fatalf("Failed to reset comment vote counts: %v", err)

     

       69
       69
       +
       	}

     

       70
       70
       +
       

     

       71
       71
       +
       	// For each user, fetch their votes from PDS

     

       72
       72
       +
       	totalVotes := 0

     

       73
       73
       +
       	for _, did := range dids {

     

       74
       74
       +
       		votes, err := fetchVotesFromPDS(pdsURL, did)

     

       75
       75
       +
       		if err != nil {

     

       76
       76
       +
       			log.Printf("Warning: failed to fetch votes for %s: %v", did, err)

     

       77
       77
       +
       			continue

     

       78
       78
       +
       		}

     

       79
       79
       +
       

     

       80
       80
       +
       		if len(votes) == 0 {

     

       81
       81
       +
       			continue

     

       82
       82
       +
       		}

     

       83
       83
       +
       

     

       84
       84
       +
       		log.Printf("Found %d votes for %s", len(votes), did)

     

       85
       85
       +
       

     

       86
       86
       +
       		// Index each vote

     

       87
       87
       +
       		for _, vote := range votes {

     

       88
       88
       +
       			if err := indexVote(ctx, db, did, vote); err != nil {

     

       89
       89
       +
       				log.Printf("Warning: failed to index vote %s: %v", vote.URI, err)

     

       90
       90
       +
       				continue

     

       91
       91
       +
       			}

     

       92
       92
       +
       			totalVotes++

     

       93
       93
       +
       		}

     

       94
       94
       +
       	}

     

       95
       95
       +
       

     

       96
       96
       +
       	log.Printf("✓ Reindexed %d votes from PDS", totalVotes)

     

       97
       97
       +
       }

     

       98
       98
       +
       

     

       99
       99
       +
       // fetchAllAccountsFromPDS queries the PDS sync API to get all repo DIDs

     

       100
       100
       +
       func fetchAllAccountsFromPDS(pdsURL string) ([]string, error) {

     

       101
       101
       +
       	// Use com.atproto.sync.listRepos to get all repos on this PDS

     

       102
       102
       +
       	var allDIDs []string

     

       103
       103
       +
       	cursor := ""

     

       104
       104
       +
       

     

       105
       105
       +
       	for {

     

       106
       106
       +
       		reqURL := fmt.Sprintf("%s/xrpc/com.atproto.sync.listRepos?limit=100", pdsURL)

     

       107
       107
       +
       		if cursor != "" {

     

       108
       108
       +
       			reqURL += "&cursor=" + url.QueryEscape(cursor)

     

       109
       109
       +
       		}

     

       110
       110
       +
       

     

       111
       111
       +
       		resp, err := http.Get(reqURL)

     

       112
       112
       +
       		if err != nil {

     

       113
       113
       +
       			return nil, fmt.Errorf("HTTP request failed: %w", err)

     

       114
       114
       +
       		}

     

       115
       115
       +
       		defer resp.Body.Close()

     

       116
       116
       +
       

     

       117
       117
       +
       		if resp.StatusCode != 200 {

     

       118
       118
       +
       			return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)

     

       119
       119
       +
       		}

     

       120
       120
       +
       

     

       121
       121
       +
       		var result struct {

     

       122
       122
       +
       			Repos []struct {

     

       123
       123
       +
       				DID string `json:"did"`

     

       124
       124
       +
       			} `json:"repos"`

     

       125
       125
       +
       			Cursor string `json:"cursor"`

     

       126
       126
       +
       		}

     

       127
       127
       +
       		if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {

     

       128
       128
       +
       			return nil, fmt.Errorf("failed to decode response: %w", err)

     

       129
       129
       +
       		}

     

       130
       130
       +
       

     

       131
       131
       +
       		for _, repo := range result.Repos {

     

       132
       132
       +
       			allDIDs = append(allDIDs, repo.DID)

     

       133
       133
       +
       		}

     

       134
       134
       +
       

     

       135
       135
       +
       		if result.Cursor == "" {

     

       136
       136
       +
       			break

     

       137
       137
       +
       		}

     

       138
       138
       +
       		cursor = result.Cursor

     

       139
       139
       +
       	}

     

       140
       140
       +
       

     

       141
       141
       +
       	return allDIDs, nil

     

       142
       142
       +
       }

     

       143
       143
       +
       

     

       144
       144
       +
       func fetchVotesFromPDS(pdsURL, did string) ([]Record, error) {

     

       145
       145
       +
       	var allRecords []Record

     

       146
       146
       +
       	cursor := ""

     

       147
       147
       +
       	collection := "social.coves.feed.vote"

     

       148
       148
       +
       

     

       149
       149
       +
       	for {

     

       150
       150
       +
       		reqURL := fmt.Sprintf("%s/xrpc/com.atproto.repo.listRecords?repo=%s&collection=%s&limit=100",

     

       151
       151
       +
       			pdsURL, url.QueryEscape(did), url.QueryEscape(collection))

     

       152
       152
       +
       		if cursor != "" {

     

       153
       153
       +
       			reqURL += "&cursor=" + url.QueryEscape(cursor)

     

       154
       154
       +
       		}

     

       155
       155
       +
       

     

       156
       156
       +
       		resp, err := http.Get(reqURL)

     

       157
       157
       +
       		if err != nil {

     

       158
       158
       +
       			return nil, fmt.Errorf("HTTP request failed: %w", err)

     

       159
       159
       +
       		}

     

       160
       160
       +
       		defer resp.Body.Close()

     

       161
       161
       +
       

     

       162
       162
       +
       		if resp.StatusCode == 400 {

     

       163
       163
       +
       			// User doesn't exist on this PDS or has no records - that's OK

     

       164
       164
       +
       			return nil, nil

     

       165
       165
       +
       		}

     

       166
       166
       +
       		if resp.StatusCode != 200 {

     

       167
       167
       +
       			return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)

     

       168
       168
       +
       		}

     

       169
       169
       +
       

     

       170
       170
       +
       		var result ListRecordsResponse

     

       171
       171
       +
       		if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {

     

       172
       172
       +
       			return nil, fmt.Errorf("failed to decode response: %w", err)

     

       173
       173
       +
       		}

     

       174
       174
       +
       

     

       175
       175
       +
       		allRecords = append(allRecords, result.Records...)

     

       176
       176
       +
       

     

       177
       177
       +
       		if result.Cursor == "" {

     

       178
       178
       +
       			break

     

       179
       179
       +
       		}

     

       180
       180
       +
       		cursor = result.Cursor

     

       181
       181
       +
       	}

     

       182
       182
       +
       

     

       183
       183
       +
       	return allRecords, nil

     

       184
       184
       +
       }

     

       185
       185
       +
       

     

       186
       186
       +
       func indexVote(ctx context.Context, db *sql.DB, voterDID string, record Record) error {

     

       187
       187
       +
       	// Extract vote data from record

     

       188
       188
       +
       	subject, ok := record.Value["subject"].(map[string]interface{})

     

       189
       189
       +
       	if !ok {

     

       190
       190
       +
       		return fmt.Errorf("missing subject")

     

       191
       191
       +
       	}

     

       192
       192
       +
       	subjectURI, _ := subject["uri"].(string)

     

       193
       193
       +
       	subjectCID, _ := subject["cid"].(string)

     

       194
       194
       +
       	direction, _ := record.Value["direction"].(string)

     

       195
       195
       +
       	createdAtStr, _ := record.Value["createdAt"].(string)

     

       196
       196
       +
       

     

       197
       197
       +
       	if subjectURI == "" || direction == "" {

     

       198
       198
       +
       		return fmt.Errorf("invalid vote record: missing required fields")

     

       199
       199
       +
       	}

     

       200
       200
       +
       

     

       201
       201
       +
       	// Parse created_at

     

       202
       202
       +
       	createdAt, err := time.Parse(time.RFC3339, createdAtStr)

     

       203
       203
       +
       	if err != nil {

     

       204
       204
       +
       		createdAt = time.Now()

     

       205
       205
       +
       	}

     

       206
       206
       +
       

     

       207
       207
       +
       	// Extract rkey from URI (at://did/collection/rkey)

     

       208
       208
       +
       	parts := strings.Split(record.URI, "/")

     

       209
       209
       +
       	if len(parts) < 5 {

     

       210
       210
       +
       		return fmt.Errorf("invalid URI format: %s", record.URI)

     

       211
       211
       +
       	}

     

       212
       212
       +
       	rkey := parts[len(parts)-1]

     

       213
       213
       +
       

     

       214
       214
       +
       	// Start transaction

     

       215
       215
       +
       	tx, err := db.BeginTx(ctx, nil)

     

       216
       216
       +
       	if err != nil {

     

       217
       217
       +
       		return fmt.Errorf("failed to begin transaction: %w", err)

     

       218
       218
       +
       	}

     

       219
       219
       +
       	defer tx.Rollback()

     

       220
       220
       +
       

     

       221
       221
       +
       	// Insert vote

     

       222
       222
       +
       	_, err = tx.ExecContext(ctx, `

     

       223
       223
       +
       		INSERT INTO votes (uri, cid, rkey, voter_did, subject_uri, subject_cid, direction, created_at, indexed_at)

     

       224
       224
       +
       		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, NOW())

     

       225
       225
       +
       		ON CONFLICT (uri) DO NOTHING

     

       226
       226
       +
       	`, record.URI, record.CID, rkey, voterDID, subjectURI, subjectCID, direction, createdAt)

     

       227
       227
       +
       	if err != nil {

     

       228
       228
       +
       		return fmt.Errorf("failed to insert vote: %w", err)

     

       229
       229
       +
       	}

     

       230
       230
       +
       

     

       231
       231
       +
       	// Update post/comment counts

     

       232
       232
       +
       	collection := extractCollectionFromURI(subjectURI)

     

       233
       233
       +
       	var updateQuery string

     

       234
       234
       +
       

     

       235
       235
       +
       	switch collection {

     

       236
       236
       +
       	case "social.coves.community.post":

     

       237
       237
       +
       		if direction == "up" {

     

       238
       238
       +
       			updateQuery = `UPDATE posts SET upvote_count = upvote_count + 1, score = upvote_count + 1 - downvote_count WHERE uri = $1 AND deleted_at IS NULL`

     

       239
       239
       +
       		} else {

     

       240
       240
       +
       			updateQuery = `UPDATE posts SET downvote_count = downvote_count + 1, score = upvote_count - (downvote_count + 1) WHERE uri = $1 AND deleted_at IS NULL`

     

       241
       241
       +
       		}

     

       242
       242
       +
       	case "social.coves.community.comment":

     

       243
       243
       +
       		if direction == "up" {

     

       244
       244
       +
       			updateQuery = `UPDATE comments SET upvote_count = upvote_count + 1, score = upvote_count + 1 - downvote_count WHERE uri = $1 AND deleted_at IS NULL`

     

       245
       245
       +
       		} else {

     

       246
       246
       +
       			updateQuery = `UPDATE comments SET downvote_count = downvote_count + 1, score = upvote_count - (downvote_count + 1) WHERE uri = $1 AND deleted_at IS NULL`

     

       247
       247
       +
       		}

     

       248
       248
       +
       	default:

     

       249
       249
       +
       		// Unknown collection, just index the vote

     

       250
       250
       +
       		return tx.Commit()

     

       251
       251
       +
       	}

     

       252
       252
       +
       

     

       253
       253
       +
       	if _, err := tx.ExecContext(ctx, updateQuery, subjectURI); err != nil {

     

       254
       254
       +
       		return fmt.Errorf("failed to update vote counts: %w", err)

     

       255
       255
       +
       	}

     

       256
       256
       +
       

     

       257
       257
       +
       	return tx.Commit()

     

       258
       258
       +
       }

     

       259
       259
       +
       

     

       260
       260
       +
       func extractCollectionFromURI(uri string) string {

     

       261
       261
       +
       	// at://did:plc:xxx/social.coves.community.post/rkey

     

       262
       262
       +
       	parts := strings.Split(uri, "/")

     

       263
       263
       +
       	if len(parts) >= 4 {

     

       264
       264
       +
       		return parts[3]

     

       265
       265
       +
       	}

     

       266
       266
       +
       	return ""

     

       267
       267
       +
       }

+7 -5

internal/api/routes/communityFeed.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/api/handlers/communityFeed"

     

       5
       5
       +
       	"Coves/internal/api/middleware"

     

       5
       6
        
       	"Coves/internal/core/communityFeeds"

     

       7
       7
       +
       	"Coves/internal/core/votes"

     

       6
       8
        
       

     

       7
       9
        
       	"github.com/go-chi/chi/v5"

     

       8
       10
        
       )

     
···

       11
       13
        
       func RegisterCommunityFeedRoutes(

     

       12
       14
        
       	r chi.Router,

     

       13
       15
        
       	feedService communityFeeds.Service,

     

       16
       16
       +
       	voteService votes.Service,

     

       17
       17
       +
       	authMiddleware *middleware.OAuthAuthMiddleware,

     

       14
       18
        
       ) {

     

       15
       19
        
       	// Create handlers

     

       16
       16
       -
       	getCommunityHandler := communityFeed.NewGetCommunityHandler(feedService)

     

       20
       20
       +
       	getCommunityHandler := communityFeed.NewGetCommunityHandler(feedService, voteService)

     

       17
       21
        
       

     

       18
       22
        
       	// GET /xrpc/social.coves.communityFeed.getCommunity

     

       19
       19
       -
       	// Public endpoint - basic community sorting only for Alpha

     

       20
       20
       -
       	// TODO(feed-generator): Add OptionalAuth middleware when implementing viewer-specific state

     

       21
       21
       -
       	//                       (blocks, upvotes, saves, etc.) in feed generator skeleton

     

       22
       22
       -
       	r.Get("/xrpc/social.coves.communityFeed.getCommunity", getCommunityHandler.HandleGetCommunity)

     

       23
       23
       +
       	// Public endpoint with optional auth for viewer-specific state (vote state)

     

       24
       24
       +
       	r.With(authMiddleware.OptionalAuth).Get("/xrpc/social.coves.communityFeed.getCommunity", getCommunityHandler.HandleGetCommunity)

     

       23
       25
        
       }

+3 -1

internal/api/routes/timeline.go

···

       4
       4
        
       	"Coves/internal/api/handlers/timeline"

     

       5
       5
        
       	"Coves/internal/api/middleware"

     

       6
       6
        
       	timelineCore "Coves/internal/core/timeline"

     

       7
       7
       +
       	"Coves/internal/core/votes"

     

       7
       8
        
       

     

       8
       9
        
       	"github.com/go-chi/chi/v5"

     

       9
       10
        
       )

     
···

       12
       13
        
       func RegisterTimelineRoutes(

     

       13
       14
        
       	r chi.Router,

     

       14
       15
        
       	timelineService timelineCore.Service,

     

       16
       16
       +
       	voteService votes.Service,

     

       15
       17
        
       	authMiddleware *middleware.OAuthAuthMiddleware,

     

       16
       18
        
       ) {

     

       17
       19
        
       	// Create handlers

     

       18
       18
       -
       	getTimelineHandler := timeline.NewGetTimelineHandler(timelineService)

     

       20
       20
       +
       	getTimelineHandler := timeline.NewGetTimelineHandler(timelineService, voteService)

     

       19
       21
        
       

     

       20
       22
        
       	// GET /xrpc/social.coves.feed.getTimeline

     

       21
       23
        
       	// Requires authentication - user must be logged in to see their timeline

+221

internal/core/votes/cache.go

···

       1
       1
       +
       package votes

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"log/slog"

     

       7
       7
       +
       	"strings"

     

       8
       8
       +
       	"sync"

     

       9
       9
       +
       	"time"

     

       10
       10
       +
       

     

       11
       11
       +
       	"Coves/internal/atproto/pds"

     

       12
       12
       +
       )

     

       13
       13
       +
       

     

       14
       14
       +
       // CachedVote represents a vote stored in the cache

     

       15
       15
       +
       type CachedVote struct {

     

       16
       16
       +
       	Direction string // "up" or "down"

     

       17
       17
       +
       	URI       string // vote record URI (at://did/collection/rkey)

     

       18
       18
       +
       	RKey      string // record key

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       // VoteCache provides an in-memory cache of user votes fetched from their PDS.

     

       22
       22
       +
       // This avoids eventual consistency issues with the AppView database.

     

       23
       23
       +
       type VoteCache struct {

     

       24
       24
       +
       	mu     sync.RWMutex

     

       25
       25
       +
       	votes  map[string]map[string]*CachedVote // userDID -> subjectURI -> vote

     

       26
       26
       +
       	expiry map[string]time.Time              // userDID -> expiry time

     

       27
       27
       +
       	ttl    time.Duration

     

       28
       28
       +
       	logger *slog.Logger

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       31
       31
       +
       // NewVoteCache creates a new vote cache with the specified TTL

     

       32
       32
       +
       func NewVoteCache(ttl time.Duration, logger *slog.Logger) *VoteCache {

     

       33
       33
       +
       	if logger == nil {

     

       34
       34
       +
       		logger = slog.Default()

     

       35
       35
       +
       	}

     

       36
       36
       +
       	return &VoteCache{

     

       37
       37
       +
       		votes:  make(map[string]map[string]*CachedVote),

     

       38
       38
       +
       		expiry: make(map[string]time.Time),

     

       39
       39
       +
       		ttl:    ttl,

     

       40
       40
       +
       		logger: logger,

     

       41
       41
       +
       	}

     

       42
       42
       +
       }

     

       43
       43
       +
       

     

       44
       44
       +
       // GetVotesForUser returns all cached votes for a user.

     

       45
       45
       +
       // Returns nil if cache is empty or expired for this user.

     

       46
       46
       +
       func (c *VoteCache) GetVotesForUser(userDID string) map[string]*CachedVote {

     

       47
       47
       +
       	c.mu.RLock()

     

       48
       48
       +
       	defer c.mu.RUnlock()

     

       49
       49
       +
       

     

       50
       50
       +
       	// Check if cache exists and is not expired

     

       51
       51
       +
       	expiry, exists := c.expiry[userDID]

     

       52
       52
       +
       	if !exists || time.Now().After(expiry) {

     

       53
       53
       +
       		return nil

     

       54
       54
       +
       	}

     

       55
       55
       +
       

     

       56
       56
       +
       	return c.votes[userDID]

     

       57
       57
       +
       }

     

       58
       58
       +
       

     

       59
       59
       +
       // GetVote returns the cached vote for a specific subject, or nil if not found/expired

     

       60
       60
       +
       func (c *VoteCache) GetVote(userDID, subjectURI string) *CachedVote {

     

       61
       61
       +
       	votes := c.GetVotesForUser(userDID)

     

       62
       62
       +
       	if votes == nil {

     

       63
       63
       +
       		return nil

     

       64
       64
       +
       	}

     

       65
       65
       +
       	return votes[subjectURI]

     

       66
       66
       +
       }

     

       67
       67
       +
       

     

       68
       68
       +
       // IsCached returns true if the user's votes are cached and not expired

     

       69
       69
       +
       func (c *VoteCache) IsCached(userDID string) bool {

     

       70
       70
       +
       	c.mu.RLock()

     

       71
       71
       +
       	defer c.mu.RUnlock()

     

       72
       72
       +
       

     

       73
       73
       +
       	expiry, exists := c.expiry[userDID]

     

       74
       74
       +
       	return exists && time.Now().Before(expiry)

     

       75
       75
       +
       }

     

       76
       76
       +
       

     

       77
       77
       +
       // SetVotesForUser replaces all cached votes for a user

     

       78
       78
       +
       func (c *VoteCache) SetVotesForUser(userDID string, votes map[string]*CachedVote) {

     

       79
       79
       +
       	c.mu.Lock()

     

       80
       80
       +
       	defer c.mu.Unlock()

     

       81
       81
       +
       

     

       82
       82
       +
       	c.votes[userDID] = votes

     

       83
       83
       +
       	c.expiry[userDID] = time.Now().Add(c.ttl)

     

       84
       84
       +
       

     

       85
       85
       +
       	c.logger.Debug("vote cache updated",

     

       86
       86
       +
       		"user", userDID,

     

       87
       87
       +
       		"vote_count", len(votes),

     

       88
       88
       +
       		"expires_at", c.expiry[userDID])

     

       89
       89
       +
       }

     

       90
       90
       +
       

     

       91
       91
       +
       // SetVote adds or updates a single vote in the cache

     

       92
       92
       +
       func (c *VoteCache) SetVote(userDID, subjectURI string, vote *CachedVote) {

     

       93
       93
       +
       	c.mu.Lock()

     

       94
       94
       +
       	defer c.mu.Unlock()

     

       95
       95
       +
       

     

       96
       96
       +
       	if c.votes[userDID] == nil {

     

       97
       97
       +
       		c.votes[userDID] = make(map[string]*CachedVote)

     

       98
       98
       +
       	}

     

       99
       99
       +
       

     

       100
       100
       +
       	c.votes[userDID][subjectURI] = vote

     

       101
       101
       +
       

     

       102
       102
       +
       	// Always extend expiry on vote action - active users keep their cache fresh

     

       103
       103
       +
       	c.expiry[userDID] = time.Now().Add(c.ttl)

     

       104
       104
       +
       

     

       105
       105
       +
       	c.logger.Debug("vote cached",

     

       106
       106
       +
       		"user", userDID,

     

       107
       107
       +
       		"subject", subjectURI,

     

       108
       108
       +
       		"direction", vote.Direction)

     

       109
       109
       +
       }

     

       110
       110
       +
       

     

       111
       111
       +
       // RemoveVote removes a vote from the cache (for toggle-off)

     

       112
       112
       +
       func (c *VoteCache) RemoveVote(userDID, subjectURI string) {

     

       113
       113
       +
       	c.mu.Lock()

     

       114
       114
       +
       	defer c.mu.Unlock()

     

       115
       115
       +
       

     

       116
       116
       +
       	if c.votes[userDID] != nil {

     

       117
       117
       +
       		delete(c.votes[userDID], subjectURI)

     

       118
       118
       +
       

     

       119
       119
       +
       		// Extend expiry on vote action - active users keep their cache fresh

     

       120
       120
       +
       		c.expiry[userDID] = time.Now().Add(c.ttl)

     

       121
       121
       +
       

     

       122
       122
       +
       		c.logger.Debug("vote removed from cache",

     

       123
       123
       +
       			"user", userDID,

     

       124
       124
       +
       			"subject", subjectURI)

     

       125
       125
       +
       	}

     

       126
       126
       +
       }

     

       127
       127
       +
       

     

       128
       128
       +
       // Invalidate removes all cached votes for a user

     

       129
       129
       +
       func (c *VoteCache) Invalidate(userDID string) {

     

       130
       130
       +
       	c.mu.Lock()

     

       131
       131
       +
       	defer c.mu.Unlock()

     

       132
       132
       +
       

     

       133
       133
       +
       	delete(c.votes, userDID)

     

       134
       134
       +
       	delete(c.expiry, userDID)

     

       135
       135
       +
       

     

       136
       136
       +
       	c.logger.Debug("vote cache invalidated", "user", userDID)

     

       137
       137
       +
       }

     

       138
       138
       +
       

     

       139
       139
       +
       // FetchAndCacheFromPDS fetches all votes from the user's PDS and caches them.

     

       140
       140
       +
       // This should be called on first authenticated request or when cache is expired.

     

       141
       141
       +
       func (c *VoteCache) FetchAndCacheFromPDS(ctx context.Context, pdsClient pds.Client) error {

     

       142
       142
       +
       	userDID := pdsClient.DID()

     

       143
       143
       +
       

     

       144
       144
       +
       	c.logger.Debug("fetching votes from PDS",

     

       145
       145
       +
       		"user", userDID,

     

       146
       146
       +
       		"pds", pdsClient.HostURL())

     

       147
       147
       +
       

     

       148
       148
       +
       	votes, err := c.fetchAllVotesFromPDS(ctx, pdsClient)

     

       149
       149
       +
       	if err != nil {

     

       150
       150
       +
       		return fmt.Errorf("failed to fetch votes from PDS: %w", err)

     

       151
       151
       +
       	}

     

       152
       152
       +
       

     

       153
       153
       +
       	c.SetVotesForUser(userDID, votes)

     

       154
       154
       +
       

     

       155
       155
       +
       	c.logger.Info("vote cache populated from PDS",

     

       156
       156
       +
       		"user", userDID,

     

       157
       157
       +
       		"vote_count", len(votes))

     

       158
       158
       +
       

     

       159
       159
       +
       	return nil

     

       160
       160
       +
       }

     

       161
       161
       +
       

     

       162
       162
       +
       // fetchAllVotesFromPDS paginates through all vote records on the user's PDS

     

       163
       163
       +
       func (c *VoteCache) fetchAllVotesFromPDS(ctx context.Context, pdsClient pds.Client) (map[string]*CachedVote, error) {

     

       164
       164
       +
       	votes := make(map[string]*CachedVote)

     

       165
       165
       +
       	cursor := ""

     

       166
       166
       +
       	const pageSize = 100

     

       167
       167
       +
       	const collection = "social.coves.feed.vote"

     

       168
       168
       +
       

     

       169
       169
       +
       	for {

     

       170
       170
       +
       		result, err := pdsClient.ListRecords(ctx, collection, pageSize, cursor)

     

       171
       171
       +
       		if err != nil {

     

       172
       172
       +
       			if pds.IsAuthError(err) {

     

       173
       173
       +
       				return nil, ErrNotAuthorized

     

       174
       174
       +
       			}

     

       175
       175
       +
       			return nil, fmt.Errorf("listRecords failed: %w", err)

     

       176
       176
       +
       		}

     

       177
       177
       +
       

     

       178
       178
       +
       		for _, rec := range result.Records {

     

       179
       179
       +
       			// Extract subject from record value

     

       180
       180
       +
       			subject, ok := rec.Value["subject"].(map[string]any)

     

       181
       181
       +
       			if !ok {

     

       182
       182
       +
       				continue

     

       183
       183
       +
       			}

     

       184
       184
       +
       

     

       185
       185
       +
       			subjectURI, ok := subject["uri"].(string)

     

       186
       186
       +
       			if !ok || subjectURI == "" {

     

       187
       187
       +
       				continue

     

       188
       188
       +
       			}

     

       189
       189
       +
       

     

       190
       190
       +
       			direction, _ := rec.Value["direction"].(string)

     

       191
       191
       +
       			if direction == "" {

     

       192
       192
       +
       				continue

     

       193
       193
       +
       			}

     

       194
       194
       +
       

     

       195
       195
       +
       			// Extract rkey from URI

     

       196
       196
       +
       			rkey := extractRKeyFromURI(rec.URI)

     

       197
       197
       +
       

     

       198
       198
       +
       			votes[subjectURI] = &CachedVote{

     

       199
       199
       +
       				Direction: direction,

     

       200
       200
       +
       				URI:       rec.URI,

     

       201
       201
       +
       				RKey:      rkey,

     

       202
       202
       +
       			}

     

       203
       203
       +
       		}

     

       204
       204
       +
       

     

       205
       205
       +
       		if result.Cursor == "" {

     

       206
       206
       +
       			break

     

       207
       207
       +
       		}

     

       208
       208
       +
       		cursor = result.Cursor

     

       209
       209
       +
       	}

     

       210
       210
       +
       

     

       211
       211
       +
       	return votes, nil

     

       212
       212
       +
       }

     

       213
       213
       +
       

     

       214
       214
       +
       // extractRKeyFromURI extracts the rkey from an AT-URI (at://did/collection/rkey)

     

       215
       215
       +
       func extractRKeyFromURI(uri string) string {

     

       216
       216
       +
       	parts := strings.Split(uri, "/")

     

       217
       217
       +
       	if len(parts) >= 5 {

     

       218
       218
       +
       		return parts[len(parts)-1]

     

       219
       219
       +
       	}

     

       220
       220
       +
       	return ""

     

       221
       221
       +
       }

+14

internal/core/votes/service.go

···

       44
       44
        
       	// - Deletes the user's vote record from their PDS

     

       45
       45
        
       	// - AppView will soft-delete via Jetstream consumer

     

       46
       46
        
       	DeleteVote(ctx context.Context, session *oauthlib.ClientSessionData, req DeleteVoteRequest) error

     

       47
       47
       +
       

     

       48
       48
       +
       	// EnsureCachePopulated fetches the user's votes from their PDS if not already cached.

     

       49
       49
       +
       	// This should be called before rendering feeds to ensure vote state is available.

     

       50
       50
       +
       	// If cache is already populated and not expired, this is a no-op.

     

       51
       51
       +
       	EnsureCachePopulated(ctx context.Context, session *oauthlib.ClientSessionData) error

     

       52
       52
       +
       

     

       53
       53
       +
       	// GetViewerVote returns the viewer's vote for a specific subject, or nil if not voted.

     

       54
       54
       +
       	// Returns from cache if available, otherwise returns nil (caller should ensure cache is populated).

     

       55
       55
       +
       	GetViewerVote(userDID, subjectURI string) *CachedVote

     

       56
       56
       +
       

     

       57
       57
       +
       	// GetViewerVotesForSubjects returns the viewer's votes for multiple subjects.

     

       58
       58
       +
       	// Returns a map of subjectURI -> CachedVote for subjects the user has voted on.

     

       59
       59
       +
       	// This is efficient for batch lookups when rendering feeds.

     

       60
       60
       +
       	GetViewerVotesForSubjects(userDID string, subjectURIs []string) map[string]*CachedVote

     

       47
       61
        
       }

     

       48
       62
        
       

     

       49
       63
        
       // CreateVoteRequest contains the parameters for creating a vote

+84 -2

internal/core/votes/service_impl.go

···

       30
       30
        
       	oauthStore       oauth.ClientAuthStore

     

       31
       31
        
       	logger           *slog.Logger

     

       32
       32
        
       	pdsClientFactory PDSClientFactory // Optional, for testing. If nil, uses OAuth.

     

       33
       33
       +
       	cache            *VoteCache       // In-memory cache of user votes from PDS

     

       33
       34
        
       }

     

       34
       35
        
       

     

       35
       36
        
       // NewService creates a new vote service instance

     

       36
       36
       -
       func NewService(repo Repository, oauthClient *oauthclient.OAuthClient, oauthStore oauth.ClientAuthStore, logger *slog.Logger) Service {

     

       37
       37
       +
       func NewService(repo Repository, oauthClient *oauthclient.OAuthClient, oauthStore oauth.ClientAuthStore, cache *VoteCache, logger *slog.Logger) Service {

     

       37
       38
        
       	if logger == nil {

     

       38
       39
        
       		logger = slog.Default()

     

       39
       40
        
       	}

     
···

       41
       42
        
       		repo:        repo,

     

       42
       43
        
       		oauthClient: oauthClient,

     

       43
       44
        
       		oauthStore:  oauthStore,

     

       45
       45
       +
       		cache:       cache,

     

       44
       46
        
       		logger:      logger,

     

       45
       47
        
       	}

     

       46
       48
        
       }

     

       47
       49
        
       

     

       48
       50
        
       // NewServiceWithPDSFactory creates a vote service with a custom PDS client factory.

     

       49
       51
        
       // This is primarily for testing with password-based authentication.

     

       50
       50
       -
       func NewServiceWithPDSFactory(repo Repository, logger *slog.Logger, factory PDSClientFactory) Service {

     

       52
       52
       +
       func NewServiceWithPDSFactory(repo Repository, cache *VoteCache, logger *slog.Logger, factory PDSClientFactory) Service {

     

       51
       53
        
       	if logger == nil {

     

       52
       54
        
       		logger = slog.Default()

     

       53
       55
        
       	}

     

       54
       56
        
       	return &voteService{

     

       55
       57
        
       		repo:             repo,

     

       58
       58
       +
       		cache:            cache,

     

       56
       59
        
       		logger:           logger,

     

       57
       60
        
       		pdsClientFactory: factory,

     

       58
       61
        
       	}

     
···

       150
       153
        
       				"subject", req.Subject.URI,

     

       151
       154
        
       				"direction", req.Direction)

     

       152
       155
        
       

     

       156
       156
       +
       			// Update cache - remove the vote

     

       157
       157
       +
       			if s.cache != nil {

     

       158
       158
       +
       				s.cache.RemoveVote(session.AccountDID.String(), req.Subject.URI)

     

       159
       159
       +
       			}

     

       160
       160
       +
       

     

       153
       161
        
       			// Return empty response to indicate deletion

     

       154
       162
        
       			return &CreateVoteResponse{

     

       155
       163
        
       				URI: "",

     
···

       197
       205
        
       		"uri", uri,

     

       198
       206
        
       		"cid", cid)

     

       199
       207
        
       

     

       208
       208
       +
       	// Update cache - add the new vote

     

       209
       209
       +
       	if s.cache != nil {

     

       210
       210
       +
       		s.cache.SetVote(session.AccountDID.String(), req.Subject.URI, &CachedVote{

     

       211
       211
       +
       			Direction: req.Direction,

     

       212
       212
       +
       			URI:       uri,

     

       213
       213
       +
       			RKey:      extractRKeyFromURI(uri),

     

       214
       214
       +
       		})

     

       215
       215
       +
       	}

     

       216
       216
       +
       

     

       200
       217
        
       	return &CreateVoteResponse{

     

       201
       218
        
       		URI: uri,

     

       202
       219
        
       		CID: cid,

     
···

       253
       270
        
       		"subject", req.Subject.URI,

     

       254
       271
        
       		"uri", existing.URI)

     

       255
       272
        
       

     

       273
       273
       +
       	// Update cache - remove the vote

     

       274
       274
       +
       	if s.cache != nil {

     

       275
       275
       +
       		s.cache.RemoveVote(session.AccountDID.String(), req.Subject.URI)

     

       276
       276
       +
       	}

     

       277
       277
       +
       

     

       256
       278
        
       	return nil

     

       257
       279
        
       }

     

       258
       280
        
       

     
···

       350
       372
        
       	// No vote found for this subject after checking all pages

     

       351
       373
        
       	return nil, nil

     

       352
       374
        
       }

     

       375
       375
       +
       

     

       376
       376
       +
       // EnsureCachePopulated fetches the user's votes from their PDS if not already cached.

     

       377
       377
       +
       func (s *voteService) EnsureCachePopulated(ctx context.Context, session *oauth.ClientSessionData) error {

     

       378
       378
       +
       	if s.cache == nil {

     

       379
       379
       +
       		return nil // No cache configured

     

       380
       380
       +
       	}

     

       381
       381
       +
       

     

       382
       382
       +
       	// Check if already cached

     

       383
       383
       +
       	if s.cache.IsCached(session.AccountDID.String()) {

     

       384
       384
       +
       		return nil

     

       385
       385
       +
       	}

     

       386
       386
       +
       

     

       387
       387
       +
       	// Create PDS client for this session

     

       388
       388
       +
       	pdsClient, err := s.getPDSClient(ctx, session)

     

       389
       389
       +
       	if err != nil {

     

       390
       390
       +
       		s.logger.Error("failed to create PDS client for cache population",

     

       391
       391
       +
       			"error", err,

     

       392
       392
       +
       			"user", session.AccountDID)

     

       393
       393
       +
       		return fmt.Errorf("failed to create PDS client: %w", err)

     

       394
       394
       +
       	}

     

       395
       395
       +
       

     

       396
       396
       +
       	// Fetch and cache votes from PDS

     

       397
       397
       +
       	if err := s.cache.FetchAndCacheFromPDS(ctx, pdsClient); err != nil {

     

       398
       398
       +
       		s.logger.Error("failed to populate vote cache from PDS",

     

       399
       399
       +
       			"error", err,

     

       400
       400
       +
       			"user", session.AccountDID)

     

       401
       401
       +
       		return fmt.Errorf("failed to populate vote cache: %w", err)

     

       402
       402
       +
       	}

     

       403
       403
       +
       

     

       404
       404
       +
       	return nil

     

       405
       405
       +
       }

     

       406
       406
       +
       

     

       407
       407
       +
       // GetViewerVote returns the viewer's vote for a specific subject, or nil if not voted.

     

       408
       408
       +
       func (s *voteService) GetViewerVote(userDID, subjectURI string) *CachedVote {

     

       409
       409
       +
       	if s.cache == nil {

     

       410
       410
       +
       		return nil

     

       411
       411
       +
       	}

     

       412
       412
       +
       	return s.cache.GetVote(userDID, subjectURI)

     

       413
       413
       +
       }

     

       414
       414
       +
       

     

       415
       415
       +
       // GetViewerVotesForSubjects returns the viewer's votes for multiple subjects.

     

       416
       416
       +
       func (s *voteService) GetViewerVotesForSubjects(userDID string, subjectURIs []string) map[string]*CachedVote {

     

       417
       417
       +
       	result := make(map[string]*CachedVote)

     

       418
       418
       +
       	if s.cache == nil {

     

       419
       419
       +
       		return result

     

       420
       420
       +
       	}

     

       421
       421
       +
       

     

       422
       422
       +
       	allVotes := s.cache.GetVotesForUser(userDID)

     

       423
       423
       +
       	if allVotes == nil {

     

       424
       424
       +
       		return result

     

       425
       425
       +
       	}

     

       426
       426
       +
       

     

       427
       427
       +
       	for _, uri := range subjectURIs {

     

       428
       428
       +
       		if vote, exists := allVotes[uri]; exists {

     

       429
       429
       +
       			result[uri] = vote

     

       430
       430
       +
       		}

     

       431
       431
       +
       	}

     

       432
       432
       +
       

     

       433
       433
       +
       	return result

     

       434
       434
       +
       }

+76 -16

internal/atproto/jetstream/vote_consumer.go

···

       99
       99
        
       	}

     

       100
       100
        
       

     

       101
       101
        
       	// Atomically: Index vote + Update post counts

     

       102
       102
       -
       	if err := c.indexVoteAndUpdateCounts(ctx, vote); err != nil {

     

       102
       102
       +
       	wasNew, err := c.indexVoteAndUpdateCounts(ctx, vote)

     

       103
       103
       +
       	if err != nil {

     

       103
       104
        
       		return fmt.Errorf("failed to index vote and update counts: %w", err)

     

       104
       105
        
       	}

     

       105
       106
        
       

     

       106
       106
       -
       	log.Printf("✓ Indexed vote: %s (%s on %s)", uri, vote.Direction, vote.SubjectURI)

     

       107
       107
       +
       	if wasNew {

     

       108
       108
       +
       		log.Printf("✓ Indexed vote: %s (%s on %s)", uri, vote.Direction, vote.SubjectURI)

     

       109
       109
       +
       	}

     

       107
       110
        
       	return nil

     

       108
       111
        
       }

     

       109
       112
        
       

     
···

       133
       136
        
       }

     

       134
       137
        
       

     

       135
       138
        
       // indexVoteAndUpdateCounts atomically indexes a vote and updates post vote counts

     

       136
       136
       -
       func (c *VoteEventConsumer) indexVoteAndUpdateCounts(ctx context.Context, vote *votes.Vote) error {

     

       139
       139
       +
       // Returns (true, nil) if vote was newly inserted, (false, nil) if already existed (idempotent)

     

       140
       140
       +
       func (c *VoteEventConsumer) indexVoteAndUpdateCounts(ctx context.Context, vote *votes.Vote) (bool, error) {

     

       137
       141
        
       	tx, err := c.db.BeginTx(ctx, nil)

     

       138
       142
        
       	if err != nil {

     

       139
       139
       -
       		return fmt.Errorf("failed to begin transaction: %w", err)

     

       143
       143
       +
       		return false, fmt.Errorf("failed to begin transaction: %w", err)

     

       140
       144
        
       	}

     

       141
       145
        
       	defer func() {

     

       142
       146
        
       		if rollbackErr := tx.Rollback(); rollbackErr != nil && rollbackErr != sql.ErrTxDone {

     
···

       144
       148
        
       		}

     

       145
       149
        
       	}()

     

       146
       150
        
       

     

       147
       147
       -
       	// 1. Index the vote (idempotent with ON CONFLICT DO NOTHING)

     

       151
       151
       +
       	// 1. Check for existing active vote with different URI (stale record)

     

       152
       152
       +
       	// This handles cases where:

     

       153
       153
       +
       	// - User voted on another client and we missed the delete event

     

       154
       154
       +
       	// - Vote was reindexed but user created a new vote with different rkey

     

       155
       155
       +
       	// - Any other state mismatch between PDS and AppView

     

       156
       156
       +
       	var existingDirection sql.NullString

     

       157
       157
       +
       	checkQuery := `

     

       158
       158
       +
       		SELECT direction FROM votes

     

       159
       159
       +
       		WHERE voter_did = $1

     

       160
       160
       +
       		  AND subject_uri = $2

     

       161
       161
       +
       		  AND deleted_at IS NULL

     

       162
       162
       +
       		  AND uri != $3

     

       163
       163
       +
       		LIMIT 1

     

       164
       164
       +
       	`

     

       165
       165
       +
       	if err := tx.QueryRowContext(ctx, checkQuery, vote.VoterDID, vote.SubjectURI, vote.URI).Scan(&existingDirection); err != nil && err != sql.ErrNoRows {

     

       166
       166
       +
       		return false, fmt.Errorf("failed to check existing vote: %w", err)

     

       167
       167
       +
       	}

     

       168
       168
       +
       

     

       169
       169
       +
       	// If there's a stale vote, soft-delete it and adjust counts

     

       170
       170
       +
       	if existingDirection.Valid {

     

       171
       171
       +
       		softDeleteQuery := `

     

       172
       172
       +
       			UPDATE votes

     

       173
       173
       +
       			SET deleted_at = NOW()

     

       174
       174
       +
       			WHERE voter_did = $1

     

       175
       175
       +
       			  AND subject_uri = $2

     

       176
       176
       +
       			  AND deleted_at IS NULL

     

       177
       177
       +
       			  AND uri != $3

     

       178
       178
       +
       		`

     

       179
       179
       +
       		if _, err := tx.ExecContext(ctx, softDeleteQuery, vote.VoterDID, vote.SubjectURI, vote.URI); err != nil {

     

       180
       180
       +
       			return false, fmt.Errorf("failed to soft-delete existing votes: %w", err)

     

       181
       181
       +
       		}

     

       182
       182
       +
       

     

       183
       183
       +
       		// Decrement the old vote's count (will be re-incremented below if same direction)

     

       184
       184
       +
       		collection := utils.ExtractCollectionFromURI(vote.SubjectURI)

     

       185
       185
       +
       		var decrementQuery string

     

       186
       186
       +
       		if existingDirection.String == "up" {

     

       187
       187
       +
       			if collection == "social.coves.community.post" {

     

       188
       188
       +
       				decrementQuery = `UPDATE posts SET upvote_count = GREATEST(0, upvote_count - 1), score = upvote_count - 1 - downvote_count WHERE uri = $1 AND deleted_at IS NULL`

     

       189
       189
       +
       			} else if collection == "social.coves.community.comment" {

     

       190
       190
       +
       				decrementQuery = `UPDATE comments SET upvote_count = GREATEST(0, upvote_count - 1), score = upvote_count - 1 - downvote_count WHERE uri = $1 AND deleted_at IS NULL`

     

       191
       191
       +
       			}

     

       192
       192
       +
       		} else {

     

       193
       193
       +
       			if collection == "social.coves.community.post" {

     

       194
       194
       +
       				decrementQuery = `UPDATE posts SET downvote_count = GREATEST(0, downvote_count - 1), score = upvote_count - (downvote_count - 1) WHERE uri = $1 AND deleted_at IS NULL`

     

       195
       195
       +
       			} else if collection == "social.coves.community.comment" {

     

       196
       196
       +
       				decrementQuery = `UPDATE comments SET downvote_count = GREATEST(0, downvote_count - 1), score = upvote_count - (downvote_count - 1) WHERE uri = $1 AND deleted_at IS NULL`

     

       197
       197
       +
       			}

     

       198
       198
       +
       		}

     

       199
       199
       +
       		if decrementQuery != "" {

     

       200
       200
       +
       			if _, err := tx.ExecContext(ctx, decrementQuery, vote.SubjectURI); err != nil {

     

       201
       201
       +
       				return false, fmt.Errorf("failed to decrement old vote count: %w", err)

     

       202
       202
       +
       			}

     

       203
       203
       +
       		}

     

       204
       204
       +
       		log.Printf("Cleaned up stale vote for %s on %s (was %s)", vote.VoterDID, vote.SubjectURI, existingDirection.String)

     

       205
       205
       +
       	}

     

       206
       206
       +
       

     

       207
       207
       +
       	// 2. Index the vote (idempotent with ON CONFLICT DO NOTHING)

     

       148
       208
        
       	query := `

     

       149
       209
        
       		INSERT INTO votes (

     

       150
       210
        
       			uri, cid, rkey, voter_did,

     
···

       169
       229
        
       

     

       170
       230
        
       	// If no rows returned, vote already exists (idempotent - OK for Jetstream replays)

     

       171
       231
        
       	if err == sql.ErrNoRows {

     

       172
       172
       -
       		log.Printf("Vote already indexed: %s (idempotent)", vote.URI)

     

       232
       232
       +
       		// Silently handle idempotent case - no log needed for replayed events

     

       173
       233
        
       		if commitErr := tx.Commit(); commitErr != nil {

     

       174
       174
       -
       			return fmt.Errorf("failed to commit transaction: %w", commitErr)

     

       234
       234
       +
       			return false, fmt.Errorf("failed to commit transaction: %w", commitErr)

     

       175
       235
        
       		}

     

       176
       176
       -
       		return nil

     

       236
       236
       +
       		return false, nil // Vote already existed

     

       177
       237
        
       	}

     

       178
       238
        
       

     

       179
       239
        
       	if err != nil {

     

       180
       180
       -
       		return fmt.Errorf("failed to insert vote: %w", err)

     

       240
       240
       +
       		return false, fmt.Errorf("failed to insert vote: %w", err)

     

       181
       241
        
       	}

     

       182
       242
        
       

     

       183
       183
       -
       	// 2. Update vote counts on the subject (post or comment)

     

       243
       243
       +
       	// 3. Update vote counts on the subject (post or comment)

     

       184
       244
        
       	// Parse collection from subject URI to determine target table

     

       185
       245
        
       	collection := utils.ExtractCollectionFromURI(vote.SubjectURI)

     

       186
       246
        
       

     
···

       227
       287
        
       		// Vote is still indexed in votes table, we just don't update denormalized counts

     

       228
       288
        
       		log.Printf("Vote subject has unsupported collection: %s (vote indexed, counts not updated)", collection)

     

       229
       289
        
       		if commitErr := tx.Commit(); commitErr != nil {

     

       230
       230
       -
       			return fmt.Errorf("failed to commit transaction: %w", commitErr)

     

       290
       290
       +
       			return false, fmt.Errorf("failed to commit transaction: %w", commitErr)

     

       231
       291
        
       		}

     

       232
       232
       -
       		return nil

     

       292
       292
       +
       		return true, nil // Vote was newly indexed

     

       233
       293
        
       	}

     

       234
       294
        
       

     

       235
       295
        
       	result, err := tx.ExecContext(ctx, updateQuery, vote.SubjectURI)

     

       236
       296
        
       	if err != nil {

     

       237
       237
       -
       		return fmt.Errorf("failed to update vote counts: %w", err)

     

       297
       297
       +
       		return false, fmt.Errorf("failed to update vote counts: %w", err)

     

       238
       298
        
       	}

     

       239
       299
        
       

     

       240
       300
        
       	rowsAffected, err := result.RowsAffected()

     

       241
       301
        
       	if err != nil {

     

       242
       242
       -
       		return fmt.Errorf("failed to check update result: %w", err)

     

       302
       302
       +
       		return false, fmt.Errorf("failed to check update result: %w", err)

     

       243
       303
        
       	}

     

       244
       304
        
       

     

       245
       305
        
       	// If subject doesn't exist or is deleted, that's OK (vote still indexed)

     
···

       249
       309
        
       

     

       250
       310
        
       	// Commit transaction

     

       251
       311
        
       	if err := tx.Commit(); err != nil {

     

       252
       252
       -
       		return fmt.Errorf("failed to commit transaction: %w", err)

     

       312
       312
       +
       		return false, fmt.Errorf("failed to commit transaction: %w", err)

     

       253
       313
        
       	}

     

       254
       314
        
       

     

       255
       255
       -
       	return nil

     

       315
       315
       +
       	return true, nil // Vote was newly indexed

     

       256
       316
        
       }

     

       257
       317
        
       

     

       258
       318
        
       // deleteVoteAndUpdateCounts atomically soft-deletes a vote and updates post vote counts

+109

internal/atproto/lexicon/social/coves/community/comment/create.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "social.coves.community.comment.create",

     

       4
       4
       +
         "defs": {

     

       5
       5
       +
           "main": {

     

       6
       6
       +
             "type": "procedure",

     

       7
       7
       +
             "description": "Create a comment on a post or another comment. Comments support nested threading, rich text, embeds, and self-labeling.",

     

       8
       8
       +
             "input": {

     

       9
       9
       +
               "encoding": "application/json",

     

       10
       10
       +
               "schema": {

     

       11
       11
       +
                 "type": "object",

     

       12
       12
       +
                 "required": ["reply", "content"],

     

       13
       13
       +
                 "properties": {

     

       14
       14
       +
                   "reply": {

     

       15
       15
       +
                     "type": "object",

     

       16
       16
       +
                     "description": "References for maintaining thread structure. Root always points to the original post, parent points to the immediate parent (post or comment).",

     

       17
       17
       +
                     "required": ["root", "parent"],

     

       18
       18
       +
                     "properties": {

     

       19
       19
       +
                       "root": {

     

       20
       20
       +
                         "type": "ref",

     

       21
       21
       +
                         "ref": "com.atproto.repo.strongRef",

     

       22
       22
       +
                         "description": "Strong reference to the original post that started the thread"

     

       23
       23
       +
                       },

     

       24
       24
       +
                       "parent": {

     

       25
       25
       +
                         "type": "ref",

     

       26
       26
       +
                         "ref": "com.atproto.repo.strongRef",

     

       27
       27
       +
                         "description": "Strong reference to the immediate parent (post or comment) being replied to"

     

       28
       28
       +
                       }

     

       29
       29
       +
                     }

     

       30
       30
       +
                   },

     

       31
       31
       +
                   "content": {

     

       32
       32
       +
                     "type": "string",

     

       33
       33
       +
                     "maxGraphemes": 10000,

     

       34
       34
       +
                     "maxLength": 100000,

     

       35
       35
       +
                     "description": "Comment text content"

     

       36
       36
       +
                   },

     

       37
       37
       +
                   "facets": {

     

       38
       38
       +
                     "type": "array",

     

       39
       39
       +
                     "description": "Annotations for rich text (mentions, links, etc.)",

     

       40
       40
       +
                     "items": {

     

       41
       41
       +
                       "type": "ref",

     

       42
       42
       +
                       "ref": "social.coves.richtext.facet"

     

       43
       43
       +
                     }

     

       44
       44
       +
                   },

     

       45
       45
       +
                   "embed": {

     

       46
       46
       +
                     "type": "union",

     

       47
       47
       +
                     "description": "Embedded media or quoted posts",

     

       48
       48
       +
                     "refs": [

     

       49
       49
       +
                       "social.coves.embed.images",

     

       50
       50
       +
                       "social.coves.embed.post"

     

       51
       51
       +
                     ]

     

       52
       52
       +
                   },

     

       53
       53
       +
                   "langs": {

     

       54
       54
       +
                     "type": "array",

     

       55
       55
       +
                     "description": "Languages used in the comment content (ISO 639-1)",

     

       56
       56
       +
                     "maxLength": 3,

     

       57
       57
       +
                     "items": {

     

       58
       58
       +
                       "type": "string",

     

       59
       59
       +
                       "format": "language"

     

       60
       60
       +
                     }

     

       61
       61
       +
                   },

     

       62
       62
       +
                   "labels": {

     

       63
       63
       +
                     "type": "ref",

     

       64
       64
       +
                     "ref": "com.atproto.label.defs#selfLabels",

     

       65
       65
       +
                     "description": "Self-applied content labels"

     

       66
       66
       +
                   }

     

       67
       67
       +
                 }

     

       68
       68
       +
               }

     

       69
       69
       +
             },

     

       70
       70
       +
             "output": {

     

       71
       71
       +
               "encoding": "application/json",

     

       72
       72
       +
               "schema": {

     

       73
       73
       +
                 "type": "object",

     

       74
       74
       +
                 "required": ["uri", "cid"],

     

       75
       75
       +
                 "properties": {

     

       76
       76
       +
                   "uri": {

     

       77
       77
       +
                     "type": "string",

     

       78
       78
       +
                     "format": "at-uri",

     

       79
       79
       +
                     "description": "AT-URI of the created comment"

     

       80
       80
       +
                   },

     

       81
       81
       +
                   "cid": {

     

       82
       82
       +
                     "type": "string",

     

       83
       83
       +
                     "format": "cid",

     

       84
       84
       +
                     "description": "CID of the created comment record"

     

       85
       85
       +
                   }

     

       86
       86
       +
                 }

     

       87
       87
       +
               }

     

       88
       88
       +
             },

     

       89
       89
       +
             "errors": [

     

       90
       90
       +
               {

     

       91
       91
       +
                 "name": "InvalidReply",

     

       92
       92
       +
                 "description": "The reply reference is invalid, malformed, or refers to non-existent content"

     

       93
       93
       +
               },

     

       94
       94
       +
               {

     

       95
       95
       +
                 "name": "ContentTooLong",

     

       96
       96
       +
                 "description": "Comment content exceeds maximum length constraints"

     

       97
       97
       +
               },

     

       98
       98
       +
               {

     

       99
       99
       +
                 "name": "ContentEmpty",

     

       100
       100
       +
                 "description": "Comment content is empty or contains only whitespace"

     

       101
       101
       +
               },

     

       102
       102
       +
               {

     

       103
       103
       +
                 "name": "NotAuthorized",

     

       104
       104
       +
                 "description": "User is not authorized to create comments on this content"

     

       105
       105
       +
               }

     

       106
       106
       +
             ]

     

       107
       107
       +
           }

     

       108
       108
       +
         }

     

       109
       109
       +
       }

+41

internal/atproto/lexicon/social/coves/community/comment/delete.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "social.coves.community.comment.delete",

     

       4
       4
       +
         "defs": {

     

       5
       5
       +
           "main": {

     

       6
       6
       +
             "type": "procedure",

     

       7
       7
       +
             "description": "Delete a comment. Only the comment author can delete their own comments.",

     

       8
       8
       +
             "input": {

     

       9
       9
       +
               "encoding": "application/json",

     

       10
       10
       +
               "schema": {

     

       11
       11
       +
                 "type": "object",

     

       12
       12
       +
                 "required": ["uri"],

     

       13
       13
       +
                 "properties": {

     

       14
       14
       +
                   "uri": {

     

       15
       15
       +
                     "type": "string",

     

       16
       16
       +
                     "format": "at-uri",

     

       17
       17
       +
                     "description": "AT-URI of the comment to delete"

     

       18
       18
       +
                   }

     

       19
       19
       +
                 }

     

       20
       20
       +
               }

     

       21
       21
       +
             },

     

       22
       22
       +
             "output": {

     

       23
       23
       +
               "encoding": "application/json",

     

       24
       24
       +
               "schema": {

     

       25
       25
       +
                 "type": "object",

     

       26
       26
       +
                 "properties": {}

     

       27
       27
       +
               }

     

       28
       28
       +
             },

     

       29
       29
       +
             "errors": [

     

       30
       30
       +
               {

     

       31
       31
       +
                 "name": "CommentNotFound",

     

       32
       32
       +
                 "description": "Comment with the specified URI does not exist"

     

       33
       33
       +
               },

     

       34
       34
       +
               {

     

       35
       35
       +
                 "name": "NotAuthorized",

     

       36
       36
       +
                 "description": "User is not authorized to delete this comment (not the author)"

     

       37
       37
       +
               }

     

       38
       38
       +
             ]

     

       39
       39
       +
           }

     

       40
       40
       +
         }

     

       41
       41
       +
       }

+97

internal/atproto/lexicon/social/coves/community/comment/update.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "social.coves.community.comment.update",

     

       4
       4
       +
         "defs": {

     

       5
       5
       +
           "main": {

     

       6
       6
       +
             "type": "procedure",

     

       7
       7
       +
             "description": "Update an existing comment's content, facets, embed, languages, or labels. Threading references (reply.root and reply.parent) are immutable and cannot be changed.",

     

       8
       8
       +
             "input": {

     

       9
       9
       +
               "encoding": "application/json",

     

       10
       10
       +
               "schema": {

     

       11
       11
       +
                 "type": "object",

     

       12
       12
       +
                 "required": ["uri", "content"],

     

       13
       13
       +
                 "properties": {

     

       14
       14
       +
                   "uri": {

     

       15
       15
       +
                     "type": "string",

     

       16
       16
       +
                     "format": "at-uri",

     

       17
       17
       +
                     "description": "AT-URI of the comment to update"

     

       18
       18
       +
                   },

     

       19
       19
       +
                   "content": {

     

       20
       20
       +
                     "type": "string",

     

       21
       21
       +
                     "maxGraphemes": 10000,

     

       22
       22
       +
                     "maxLength": 100000,

     

       23
       23
       +
                     "description": "Updated comment text content"

     

       24
       24
       +
                   },

     

       25
       25
       +
                   "facets": {

     

       26
       26
       +
                     "type": "array",

     

       27
       27
       +
                     "description": "Updated annotations for rich text (mentions, links, etc.)",

     

       28
       28
       +
                     "items": {

     

       29
       29
       +
                       "type": "ref",

     

       30
       30
       +
                       "ref": "social.coves.richtext.facet"

     

       31
       31
       +
                     }

     

       32
       32
       +
                   },

     

       33
       33
       +
                   "embed": {

     

       34
       34
       +
                     "type": "union",

     

       35
       35
       +
                     "description": "Updated embedded media or quoted posts",

     

       36
       36
       +
                     "refs": [

     

       37
       37
       +
                       "social.coves.embed.images",

     

       38
       38
       +
                       "social.coves.embed.post"

     

       39
       39
       +
                     ]

     

       40
       40
       +
                   },

     

       41
       41
       +
                   "langs": {

     

       42
       42
       +
                     "type": "array",

     

       43
       43
       +
                     "description": "Updated languages used in the comment content (ISO 639-1)",

     

       44
       44
       +
                     "maxLength": 3,

     

       45
       45
       +
                     "items": {

     

       46
       46
       +
                       "type": "string",

     

       47
       47
       +
                       "format": "language"

     

       48
       48
       +
                     }

     

       49
       49
       +
                   },

     

       50
       50
       +
                   "labels": {

     

       51
       51
       +
                     "type": "ref",

     

       52
       52
       +
                     "ref": "com.atproto.label.defs#selfLabels",

     

       53
       53
       +
                     "description": "Updated self-applied content labels"

     

       54
       54
       +
                   }

     

       55
       55
       +
                 }

     

       56
       56
       +
               }

     

       57
       57
       +
             },

     

       58
       58
       +
             "output": {

     

       59
       59
       +
               "encoding": "application/json",

     

       60
       60
       +
               "schema": {

     

       61
       61
       +
                 "type": "object",

     

       62
       62
       +
                 "required": ["uri", "cid"],

     

       63
       63
       +
                 "properties": {

     

       64
       64
       +
                   "uri": {

     

       65
       65
       +
                     "type": "string",

     

       66
       66
       +
                     "format": "at-uri",

     

       67
       67
       +
                     "description": "AT-URI of the updated comment (unchanged from input)"

     

       68
       68
       +
                   },

     

       69
       69
       +
                   "cid": {

     

       70
       70
       +
                     "type": "string",

     

       71
       71
       +
                     "format": "cid",

     

       72
       72
       +
                     "description": "New CID of the updated comment record"

     

       73
       73
       +
                   }

     

       74
       74
       +
                 }

     

       75
       75
       +
               }

     

       76
       76
       +
             },

     

       77
       77
       +
             "errors": [

     

       78
       78
       +
               {

     

       79
       79
       +
                 "name": "CommentNotFound",

     

       80
       80
       +
                 "description": "Comment with the specified URI does not exist"

     

       81
       81
       +
               },

     

       82
       82
       +
               {

     

       83
       83
       +
                 "name": "ContentTooLong",

     

       84
       84
       +
                 "description": "Updated comment content exceeds maximum length constraints"

     

       85
       85
       +
               },

     

       86
       86
       +
               {

     

       87
       87
       +
                 "name": "ContentEmpty",

     

       88
       88
       +
                 "description": "Updated comment content is empty or contains only whitespace"

     

       89
       89
       +
               },

     

       90
       90
       +
               {

     

       91
       91
       +
                 "name": "NotAuthorized",

     

       92
       92
       +
                 "description": "User is not authorized to update this comment (not the author)"

     

       93
       93
       +
               }

     

       94
       94
       +
             ]

     

       95
       95
       +
           }

     

       96
       96
       +
         }

     

       97
       97
       +
       }

+38

internal/core/comments/types.go

···

       1
       1
       +
       package comments

     

       2
       2
       +
       

     

       3
       3
       +
       // CreateCommentRequest contains parameters for creating a comment

     

       4
       4
       +
       type CreateCommentRequest struct {

     

       5
       5
       +
       	Reply   ReplyRef      `json:"reply"`

     

       6
       6
       +
       	Content string        `json:"content"`

     

       7
       7
       +
       	Facets  []interface{} `json:"facets,omitempty"`

     

       8
       8
       +
       	Embed   interface{}   `json:"embed,omitempty"`

     

       9
       9
       +
       	Langs   []string      `json:"langs,omitempty"`

     

       10
       10
       +
       	Labels  *SelfLabels   `json:"labels,omitempty"`

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       // CreateCommentResponse contains the result of creating a comment

     

       14
       14
       +
       type CreateCommentResponse struct {

     

       15
       15
       +
       	URI string `json:"uri"`

     

       16
       16
       +
       	CID string `json:"cid"`

     

       17
       17
       +
       }

     

       18
       18
       +
       

     

       19
       19
       +
       // UpdateCommentRequest contains parameters for updating a comment

     

       20
       20
       +
       type UpdateCommentRequest struct {

     

       21
       21
       +
       	URI     string        `json:"uri"`

     

       22
       22
       +
       	Content string        `json:"content"`

     

       23
       23
       +
       	Facets  []interface{} `json:"facets,omitempty"`

     

       24
       24
       +
       	Embed   interface{}   `json:"embed,omitempty"`

     

       25
       25
       +
       	Langs   []string      `json:"langs,omitempty"`

     

       26
       26
       +
       	Labels  *SelfLabels   `json:"labels,omitempty"`

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       // UpdateCommentResponse contains the result of updating a comment

     

       30
       30
       +
       type UpdateCommentResponse struct {

     

       31
       31
       +
       	URI string `json:"uri"`

     

       32
       32
       +
       	CID string `json:"cid"`

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       // DeleteCommentRequest contains parameters for deleting a comment

     

       36
       36
       +
       type DeleteCommentRequest struct {

     

       37
       37
       +
       	URI string `json:"uri"`

     

       38
       38
       +
       }

+130

internal/api/handlers/comments/create_comment.go

···

       1
       1
       +
       package comments

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/comments"

     

       6
       6
       +
       	"encoding/json"

     

       7
       7
       +
       	"log"

     

       8
       8
       +
       	"net/http"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // CreateCommentHandler handles comment creation requests

     

       12
       12
       +
       type CreateCommentHandler struct {

     

       13
       13
       +
       	service comments.Service

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // NewCreateCommentHandler creates a new handler for creating comments

     

       17
       17
       +
       func NewCreateCommentHandler(service comments.Service) *CreateCommentHandler {

     

       18
       18
       +
       	return &CreateCommentHandler{

     

       19
       19
       +
       		service: service,

     

       20
       20
       +
       	}

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       // CreateCommentInput matches the lexicon input schema for social.coves.community.comment.create

     

       24
       24
       +
       type CreateCommentInput struct {

     

       25
       25
       +
       	Reply struct {

     

       26
       26
       +
       		Root struct {

     

       27
       27
       +
       			URI string `json:"uri"`

     

       28
       28
       +
       			CID string `json:"cid"`

     

       29
       29
       +
       		} `json:"root"`

     

       30
       30
       +
       		Parent struct {

     

       31
       31
       +
       			URI string `json:"uri"`

     

       32
       32
       +
       			CID string `json:"cid"`

     

       33
       33
       +
       		} `json:"parent"`

     

       34
       34
       +
       	} `json:"reply"`

     

       35
       35
       +
       	Content string        `json:"content"`

     

       36
       36
       +
       	Facets  []interface{} `json:"facets,omitempty"`

     

       37
       37
       +
       	Embed   interface{}   `json:"embed,omitempty"`

     

       38
       38
       +
       	Langs   []string      `json:"langs,omitempty"`

     

       39
       39
       +
       	Labels  interface{}   `json:"labels,omitempty"`

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       // CreateCommentOutput matches the lexicon output schema

     

       43
       43
       +
       type CreateCommentOutput struct {

     

       44
       44
       +
       	URI string `json:"uri"`

     

       45
       45
       +
       	CID string `json:"cid"`

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       48
       48
       +
       // HandleCreate handles comment creation requests

     

       49
       49
       +
       // POST /xrpc/social.coves.community.comment.create

     

       50
       50
       +
       //

     

       51
       51
       +
       // Request body: { "reply": { "root": {...}, "parent": {...} }, "content": "..." }

     

       52
       52
       +
       // Response: { "uri": "at://...", "cid": "..." }

     

       53
       53
       +
       func (h *CreateCommentHandler) HandleCreate(w http.ResponseWriter, r *http.Request) {

     

       54
       54
       +
       	// 1. Check method is POST

     

       55
       55
       +
       	if r.Method != http.MethodPost {

     

       56
       56
       +
       		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

     

       57
       57
       +
       		return

     

       58
       58
       +
       	}

     

       59
       59
       +
       

     

       60
       60
       +
       	// 2. Limit request body size to prevent DoS attacks (100KB should be plenty for comments)

     

       61
       61
       +
       	r.Body = http.MaxBytesReader(w, r.Body, 100*1024)

     

       62
       62
       +
       

     

       63
       63
       +
       	// 3. Parse JSON body into CreateCommentInput

     

       64
       64
       +
       	var input CreateCommentInput

     

       65
       65
       +
       	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {

     

       66
       66
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "Invalid request body")

     

       67
       67
       +
       		return

     

       68
       68
       +
       	}

     

       69
       69
       +
       

     

       70
       70
       +
       	// 4. Get OAuth session from context (injected by auth middleware)

     

       71
       71
       +
       	session := middleware.GetOAuthSession(r)

     

       72
       72
       +
       	if session == nil {

     

       73
       73
       +
       		writeError(w, http.StatusUnauthorized, "AuthRequired", "Authentication required")

     

       74
       74
       +
       		return

     

       75
       75
       +
       	}

     

       76
       76
       +
       

     

       77
       77
       +
       	// 5. Convert labels interface{} to *comments.SelfLabels if provided

     

       78
       78
       +
       	var labels *comments.SelfLabels

     

       79
       79
       +
       	if input.Labels != nil {

     

       80
       80
       +
       		labelsJSON, err := json.Marshal(input.Labels)

     

       81
       81
       +
       		if err != nil {

     

       82
       82
       +
       			writeError(w, http.StatusBadRequest, "InvalidLabels", "Invalid labels format")

     

       83
       83
       +
       			return

     

       84
       84
       +
       		}

     

       85
       85
       +
       		var selfLabels comments.SelfLabels

     

       86
       86
       +
       		if err := json.Unmarshal(labelsJSON, &selfLabels); err != nil {

     

       87
       87
       +
       			writeError(w, http.StatusBadRequest, "InvalidLabels", "Invalid labels structure")

     

       88
       88
       +
       			return

     

       89
       89
       +
       		}

     

       90
       90
       +
       		labels = &selfLabels

     

       91
       91
       +
       	}

     

       92
       92
       +
       

     

       93
       93
       +
       	// 6. Convert input to CreateCommentRequest

     

       94
       94
       +
       	req := comments.CreateCommentRequest{

     

       95
       95
       +
       		Reply: comments.ReplyRef{

     

       96
       96
       +
       			Root: comments.StrongRef{

     

       97
       97
       +
       				URI: input.Reply.Root.URI,

     

       98
       98
       +
       				CID: input.Reply.Root.CID,

     

       99
       99
       +
       			},

     

       100
       100
       +
       			Parent: comments.StrongRef{

     

       101
       101
       +
       				URI: input.Reply.Parent.URI,

     

       102
       102
       +
       				CID: input.Reply.Parent.CID,

     

       103
       103
       +
       			},

     

       104
       104
       +
       		},

     

       105
       105
       +
       		Content: input.Content,

     

       106
       106
       +
       		Facets:  input.Facets,

     

       107
       107
       +
       		Embed:   input.Embed,

     

       108
       108
       +
       		Langs:   input.Langs,

     

       109
       109
       +
       		Labels:  labels,

     

       110
       110
       +
       	}

     

       111
       111
       +
       

     

       112
       112
       +
       	// 7. Call service to create comment

     

       113
       113
       +
       	response, err := h.service.CreateComment(r.Context(), session, req)

     

       114
       114
       +
       	if err != nil {

     

       115
       115
       +
       		handleServiceError(w, err)

     

       116
       116
       +
       		return

     

       117
       117
       +
       	}

     

       118
       118
       +
       

     

       119
       119
       +
       	// 8. Return JSON response with URI and CID

     

       120
       120
       +
       	output := CreateCommentOutput{

     

       121
       121
       +
       		URI: response.URI,

     

       122
       122
       +
       		CID: response.CID,

     

       123
       123
       +
       	}

     

       124
       124
       +
       

     

       125
       125
       +
       	w.Header().Set("Content-Type", "application/json")

     

       126
       126
       +
       	w.WriteHeader(http.StatusOK)

     

       127
       127
       +
       	if err := json.NewEncoder(w).Encode(output); err != nil {

     

       128
       128
       +
       		log.Printf("Failed to encode response: %v", err)

     

       129
       129
       +
       	}

     

       130
       130
       +
       }

+80

internal/api/handlers/comments/delete_comment.go

···

       1
       1
       +
       package comments

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/comments"

     

       6
       6
       +
       	"encoding/json"

     

       7
       7
       +
       	"log"

     

       8
       8
       +
       	"net/http"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // DeleteCommentHandler handles comment deletion requests

     

       12
       12
       +
       type DeleteCommentHandler struct {

     

       13
       13
       +
       	service comments.Service

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // NewDeleteCommentHandler creates a new handler for deleting comments

     

       17
       17
       +
       func NewDeleteCommentHandler(service comments.Service) *DeleteCommentHandler {

     

       18
       18
       +
       	return &DeleteCommentHandler{

     

       19
       19
       +
       		service: service,

     

       20
       20
       +
       	}

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       // DeleteCommentInput matches the lexicon input schema for social.coves.community.comment.delete

     

       24
       24
       +
       type DeleteCommentInput struct {

     

       25
       25
       +
       	URI string `json:"uri"`

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       // DeleteCommentOutput is empty per lexicon specification

     

       29
       29
       +
       type DeleteCommentOutput struct{}

     

       30
       30
       +
       

     

       31
       31
       +
       // HandleDelete handles comment deletion requests

     

       32
       32
       +
       // POST /xrpc/social.coves.community.comment.delete

     

       33
       33
       +
       //

     

       34
       34
       +
       // Request body: { "uri": "at://..." }

     

       35
       35
       +
       // Response: {}

     

       36
       36
       +
       func (h *DeleteCommentHandler) HandleDelete(w http.ResponseWriter, r *http.Request) {

     

       37
       37
       +
       	// 1. Check method is POST

     

       38
       38
       +
       	if r.Method != http.MethodPost {

     

       39
       39
       +
       		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

     

       40
       40
       +
       		return

     

       41
       41
       +
       	}

     

       42
       42
       +
       

     

       43
       43
       +
       	// 2. Limit request body size to prevent DoS attacks (100KB should be plenty for comments)

     

       44
       44
       +
       	r.Body = http.MaxBytesReader(w, r.Body, 100*1024)

     

       45
       45
       +
       

     

       46
       46
       +
       	// 3. Parse JSON body into DeleteCommentInput

     

       47
       47
       +
       	var input DeleteCommentInput

     

       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
       +
       	// 4. Get OAuth session from context (injected by auth middleware)

     

       54
       54
       +
       	session := middleware.GetOAuthSession(r)

     

       55
       55
       +
       	if session == nil {

     

       56
       56
       +
       		writeError(w, http.StatusUnauthorized, "AuthRequired", "Authentication required")

     

       57
       57
       +
       		return

     

       58
       58
       +
       	}

     

       59
       59
       +
       

     

       60
       60
       +
       	// 5. Convert input to DeleteCommentRequest

     

       61
       61
       +
       	req := comments.DeleteCommentRequest{

     

       62
       62
       +
       		URI: input.URI,

     

       63
       63
       +
       	}

     

       64
       64
       +
       

     

       65
       65
       +
       	// 6. Call service to delete comment

     

       66
       66
       +
       	err := h.service.DeleteComment(r.Context(), session, req)

     

       67
       67
       +
       	if err != nil {

     

       68
       68
       +
       		handleServiceError(w, err)

     

       69
       69
       +
       		return

     

       70
       70
       +
       	}

     

       71
       71
       +
       

     

       72
       72
       +
       	// 7. Return empty JSON object per lexicon specification

     

       73
       73
       +
       	output := DeleteCommentOutput{}

     

       74
       74
       +
       

     

       75
       75
       +
       	w.Header().Set("Content-Type", "application/json")

     

       76
       76
       +
       	w.WriteHeader(http.StatusOK)

     

       77
       77
       +
       	if err := json.NewEncoder(w).Encode(output); err != nil {

     

       78
       78
       +
       		log.Printf("Failed to encode response: %v", err)

     

       79
       79
       +
       	}

     

       80
       80
       +
       }

+34 -2

internal/api/handlers/comments/errors.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/core/comments"

     

       5
       5
        
       	"encoding/json"

     

       6
       6
       +
       	"errors"

     

       6
       7
        
       	"log"

     

       7
       8
        
       	"net/http"

     

       8
       9
        
       )

     
···

       30
       31
        
       func handleServiceError(w http.ResponseWriter, err error) {

     

       31
       32
        
       	switch {

     

       32
       33
        
       	case comments.IsNotFound(err):

     

       33
       33
       -
       		writeError(w, http.StatusNotFound, "NotFound", err.Error())

     

       34
       34
       +
       		// Map specific not found errors to appropriate messages

     

       35
       35
       +
       		switch {

     

       36
       36
       +
       		case errors.Is(err, comments.ErrCommentNotFound):

     

       37
       37
       +
       			writeError(w, http.StatusNotFound, "CommentNotFound", "Comment not found")

     

       38
       38
       +
       		case errors.Is(err, comments.ErrParentNotFound):

     

       39
       39
       +
       			writeError(w, http.StatusNotFound, "ParentNotFound", "Parent post or comment not found")

     

       40
       40
       +
       		case errors.Is(err, comments.ErrRootNotFound):

     

       41
       41
       +
       			writeError(w, http.StatusNotFound, "RootNotFound", "Root post not found")

     

       42
       42
       +
       		default:

     

       43
       43
       +
       			writeError(w, http.StatusNotFound, "NotFound", err.Error())

     

       44
       44
       +
       		}

     

       34
       45
        
       

     

       35
       46
        
       	case comments.IsValidationError(err):

     

       36
       36
       -
       		writeError(w, http.StatusBadRequest, "InvalidRequest", err.Error())

     

       47
       47
       +
       		// Map specific validation errors to appropriate messages

     

       48
       48
       +
       		switch {

     

       49
       49
       +
       		case errors.Is(err, comments.ErrInvalidReply):

     

       50
       50
       +
       			writeError(w, http.StatusBadRequest, "InvalidReply", "The reply reference is invalid or malformed")

     

       51
       51
       +
       		case errors.Is(err, comments.ErrContentTooLong):

     

       52
       52
       +
       			writeError(w, http.StatusBadRequest, "ContentTooLong", "Comment content exceeds 10000 graphemes")

     

       53
       53
       +
       		case errors.Is(err, comments.ErrContentEmpty):

     

       54
       54
       +
       			writeError(w, http.StatusBadRequest, "ContentEmpty", "Comment content is required")

     

       55
       55
       +
       		default:

     

       56
       56
       +
       			writeError(w, http.StatusBadRequest, "InvalidRequest", err.Error())

     

       57
       57
       +
       		}

     

       58
       58
       +
       

     

       59
       59
       +
       	case errors.Is(err, comments.ErrNotAuthorized):

     

       60
       60
       +
       		writeError(w, http.StatusForbidden, "NotAuthorized", "User is not authorized to perform this action")

     

       61
       61
       +
       

     

       62
       62
       +
       	case errors.Is(err, comments.ErrBanned):

     

       63
       63
       +
       		writeError(w, http.StatusForbidden, "Banned", "User is banned from this community")

     

       64
       64
       +
       

     

       65
       65
       +
       	// NOTE: IsConflict case removed - the PDS handles duplicate detection via CreateRecord,

     

       66
       66
       +
       	// so ErrCommentAlreadyExists is never returned from the service layer. If the PDS rejects

     

       67
       67
       +
       	// a duplicate record, it returns an auth/validation error which is handled by other cases.

     

       68
       68
       +
       	// Keeping this code would be dead code that never executes.

     

       37
       69
        
       

     

       38
       70
        
       	default:

     

       39
       71
        
       		// Don't leak internal error details to clients

+112

internal/api/handlers/comments/update_comment.go

···

       1
       1
       +
       package comments

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/comments"

     

       6
       6
       +
       	"encoding/json"

     

       7
       7
       +
       	"log"

     

       8
       8
       +
       	"net/http"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // UpdateCommentHandler handles comment update requests

     

       12
       12
       +
       type UpdateCommentHandler struct {

     

       13
       13
       +
       	service comments.Service

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // NewUpdateCommentHandler creates a new handler for updating comments

     

       17
       17
       +
       func NewUpdateCommentHandler(service comments.Service) *UpdateCommentHandler {

     

       18
       18
       +
       	return &UpdateCommentHandler{

     

       19
       19
       +
       		service: service,

     

       20
       20
       +
       	}

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       // UpdateCommentInput matches the lexicon input schema for social.coves.community.comment.update

     

       24
       24
       +
       type UpdateCommentInput struct {

     

       25
       25
       +
       	URI     string        `json:"uri"`

     

       26
       26
       +
       	Content string        `json:"content"`

     

       27
       27
       +
       	Facets  []interface{} `json:"facets,omitempty"`

     

       28
       28
       +
       	Embed   interface{}   `json:"embed,omitempty"`

     

       29
       29
       +
       	Langs   []string      `json:"langs,omitempty"`

     

       30
       30
       +
       	Labels  interface{}   `json:"labels,omitempty"`

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       // UpdateCommentOutput matches the lexicon output schema

     

       34
       34
       +
       type UpdateCommentOutput struct {

     

       35
       35
       +
       	URI string `json:"uri"`

     

       36
       36
       +
       	CID string `json:"cid"`

     

       37
       37
       +
       }

     

       38
       38
       +
       

     

       39
       39
       +
       // HandleUpdate handles comment update requests

     

       40
       40
       +
       // POST /xrpc/social.coves.community.comment.update

     

       41
       41
       +
       //

     

       42
       42
       +
       // Request body: { "uri": "at://...", "content": "..." }

     

       43
       43
       +
       // Response: { "uri": "at://...", "cid": "..." }

     

       44
       44
       +
       func (h *UpdateCommentHandler) HandleUpdate(w http.ResponseWriter, r *http.Request) {

     

       45
       45
       +
       	// 1. Check method is POST

     

       46
       46
       +
       	if r.Method != http.MethodPost {

     

       47
       47
       +
       		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

     

       48
       48
       +
       		return

     

       49
       49
       +
       	}

     

       50
       50
       +
       

     

       51
       51
       +
       	// 2. Limit request body size to prevent DoS attacks (100KB should be plenty for comments)

     

       52
       52
       +
       	r.Body = http.MaxBytesReader(w, r.Body, 100*1024)

     

       53
       53
       +
       

     

       54
       54
       +
       	// 3. Parse JSON body into UpdateCommentInput

     

       55
       55
       +
       	var input UpdateCommentInput

     

       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
       +
       	// 4. Get OAuth session from context (injected by auth middleware)

     

       62
       62
       +
       	session := middleware.GetOAuthSession(r)

     

       63
       63
       +
       	if session == nil {

     

       64
       64
       +
       		writeError(w, http.StatusUnauthorized, "AuthRequired", "Authentication required")

     

       65
       65
       +
       		return

     

       66
       66
       +
       	}

     

       67
       67
       +
       

     

       68
       68
       +
       	// 5. Convert labels interface{} to *comments.SelfLabels if provided

     

       69
       69
       +
       	var labels *comments.SelfLabels

     

       70
       70
       +
       	if input.Labels != nil {

     

       71
       71
       +
       		labelsJSON, err := json.Marshal(input.Labels)

     

       72
       72
       +
       		if err != nil {

     

       73
       73
       +
       			writeError(w, http.StatusBadRequest, "InvalidLabels", "Invalid labels format")

     

       74
       74
       +
       			return

     

       75
       75
       +
       		}

     

       76
       76
       +
       		var selfLabels comments.SelfLabels

     

       77
       77
       +
       		if err := json.Unmarshal(labelsJSON, &selfLabels); err != nil {

     

       78
       78
       +
       			writeError(w, http.StatusBadRequest, "InvalidLabels", "Invalid labels structure")

     

       79
       79
       +
       			return

     

       80
       80
       +
       		}

     

       81
       81
       +
       		labels = &selfLabels

     

       82
       82
       +
       	}

     

       83
       83
       +
       

     

       84
       84
       +
       	// 6. Convert input to UpdateCommentRequest

     

       85
       85
       +
       	req := comments.UpdateCommentRequest{

     

       86
       86
       +
       		URI:     input.URI,

     

       87
       87
       +
       		Content: input.Content,

     

       88
       88
       +
       		Facets:  input.Facets,

     

       89
       89
       +
       		Embed:   input.Embed,

     

       90
       90
       +
       		Langs:   input.Langs,

     

       91
       91
       +
       		Labels:  labels,

     

       92
       92
       +
       	}

     

       93
       93
       +
       

     

       94
       94
       +
       	// 7. Call service to update comment

     

       95
       95
       +
       	response, err := h.service.UpdateComment(r.Context(), session, req)

     

       96
       96
       +
       	if err != nil {

     

       97
       97
       +
       		handleServiceError(w, err)

     

       98
       98
       +
       		return

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	// 8. Return JSON response with URI and CID

     

       102
       102
       +
       	output := UpdateCommentOutput{

     

       103
       103
       +
       		URI: response.URI,

     

       104
       104
       +
       		CID: response.CID,

     

       105
       105
       +
       	}

     

       106
       106
       +
       

     

       107
       107
       +
       	w.Header().Set("Content-Type", "application/json")

     

       108
       108
       +
       	w.WriteHeader(http.StatusOK)

     

       109
       109
       +
       	if err := json.NewEncoder(w).Encode(output); err != nil {

     

       110
       110
       +
       		log.Printf("Failed to encode response: %v", err)

     

       111
       111
       +
       	}

     

       112
       112
       +
       }

+35

internal/api/routes/comment.go

···

       1
       1
       +
       package routes

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/handlers/comments"

     

       5
       5
       +
       	"Coves/internal/api/middleware"

     

       6
       6
       +
       	commentsCore "Coves/internal/core/comments"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/go-chi/chi/v5"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // RegisterCommentRoutes registers comment-related XRPC endpoints on the router

     

       12
       12
       +
       // Implements social.coves.community.comment.* lexicon endpoints

     

       13
       13
       +
       // All write operations (create, update, delete) require authentication

     

       14
       14
       +
       func RegisterCommentRoutes(r chi.Router, service commentsCore.Service, authMiddleware *middleware.OAuthAuthMiddleware) {

     

       15
       15
       +
       	// Initialize handlers

     

       16
       16
       +
       	createHandler := comments.NewCreateCommentHandler(service)

     

       17
       17
       +
       	updateHandler := comments.NewUpdateCommentHandler(service)

     

       18
       18
       +
       	deleteHandler := comments.NewDeleteCommentHandler(service)

     

       19
       19
       +
       

     

       20
       20
       +
       	// Procedure endpoints (POST) - require authentication

     

       21
       21
       +
       	// social.coves.community.comment.create - create a new comment on a post or another comment

     

       22
       22
       +
       	r.With(authMiddleware.RequireAuth).Post(

     

       23
       23
       +
       		"/xrpc/social.coves.community.comment.create",

     

       24
       24
       +
       		createHandler.HandleCreate)

     

       25
       25
       +
       

     

       26
       26
       +
       	// social.coves.community.comment.update - update an existing comment's content

     

       27
       27
       +
       	r.With(authMiddleware.RequireAuth).Post(

     

       28
       28
       +
       		"/xrpc/social.coves.community.comment.update",

     

       29
       29
       +
       		updateHandler.HandleUpdate)

     

       30
       30
       +
       

     

       31
       31
       +
       	// social.coves.community.comment.delete - soft delete a comment

     

       32
       32
       +
       	r.With(authMiddleware.RequireAuth).Post(

     

       33
       33
       +
       		"/xrpc/social.coves.community.comment.delete",

     

       34
       34
       +
       		deleteHandler.HandleDelete)

     

       35
       35
       +
       }

+4 -2

tests/integration/comment_query_test.go

···

       785
       785
        
       	postRepo := postgres.NewPostRepository(db)

     

       786
       786
        
       	userRepo := postgres.NewUserRepository(db)

     

       787
       787
        
       	communityRepo := postgres.NewCommunityRepository(db)

     

       788
       788
       -
       	return comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       788
       788
       +
       	// Use factory constructor with nil factory - these tests only use the read path (GetComments)

     

       789
       789
       +
       	return comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       789
       790
        
       }

     

       790
       791
        
       

     

       791
       792
        
       // Helper: createTestCommentWithScore creates a comment with specific vote counts

     
···

       871
       872
        
       	postRepo := postgres.NewPostRepository(db)

     

       872
       873
        
       	userRepo := postgres.NewUserRepository(db)

     

       873
       874
        
       	communityRepo := postgres.NewCommunityRepository(db)

     

       874
       874
       -
       	service := comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       875
       875
       +
       	// Use factory constructor with nil factory - these tests only use the read path (GetComments)

     

       876
       876
       +
       	service := comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       875
       877
        
       	return &testCommentServiceAdapter{service: service}

     

       876
       878
        
       }

     

       877
       879

+6 -3

tests/integration/comment_vote_test.go

···

       417
       417
        
       		}

     

       418
       418
        
       

     

       419
       419
        
       		// Query comments with viewer authentication

     

       420
       420
       -
       		commentService := comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       420
       420
       +
       		// Use factory constructor with nil factory - this test only uses the read path (GetComments)

     

       421
       421
       +
       		commentService := comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       421
       422
        
       		response, err := commentService.GetComments(ctx, &comments.GetCommentsRequest{

     

       422
       423
        
       			PostURI:   testPostURI,

     

       423
       424
        
       			Sort:      "new",

     
···

       499
       500
        
       		}

     

       500
       501
        
       

     

       501
       502
        
       		// Query with authentication but no vote

     

       502
       502
       -
       		commentService := comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       503
       503
       +
       		// Use factory constructor with nil factory - this test only uses the read path (GetComments)

     

       504
       504
       +
       		commentService := comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       503
       505
        
       		response, err := commentService.GetComments(ctx, &comments.GetCommentsRequest{

     

       504
       506
        
       			PostURI:   testPostURI,

     

       505
       507
        
       			Sort:      "new",

     
···

       542
       544
        
       

     

       543
       545
        
       	t.Run("Unauthenticated request has no viewer state", func(t *testing.T) {

     

       544
       546
        
       		// Query without authentication

     

       545
       545
       -
       		commentService := comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       547
       547
       +
       		// Use factory constructor with nil factory - this test only uses the read path (GetComments)

     

       548
       548
       +
       		commentService := comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       546
       549
        
       		response, err := commentService.GetComments(ctx, &comments.GetCommentsRequest{

     

       547
       550
        
       			PostURI:   testPostURI,

     

       548
       551
        
       			Sort:      "new",

+2 -1

tests/integration/concurrent_scenarios_test.go

···

       454
       454
        
       		}

     

       455
       455
        
       

     

       456
       456
        
       		// Verify all comments are retrievable via service

     

       457
       457
       -
       		commentService := comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       457
       457
       +
       		// Use factory constructor with nil factory - this test only uses the read path (GetComments)

     

       458
       458
       +
       		commentService := comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       458
       459
        
       		response, err := commentService.GetComments(ctx, &comments.GetCommentsRequest{

     

       459
       460
        
       			PostURI:   postURI,

     

       460
       461
        
       			Sort:      "new",

+66

internal/db/migrations/021_add_comment_deletion_metadata.sql

···

       1
       1
       +
       -- +goose Up

     

       2
       2
       +
       -- Add deletion reason tracking to preserve thread structure while respecting privacy

     

       3
       3
       +
       -- When comments are deleted, we blank content but keep the record for threading

     

       4
       4
       +
       

     

       5
       5
       +
       -- Create enum type for deletion reasons

     

       6
       6
       +
       CREATE TYPE deletion_reason AS ENUM ('author', 'moderator');

     

       7
       7
       +
       

     

       8
       8
       +
       -- Add new columns to comments table

     

       9
       9
       +
       ALTER TABLE comments ADD COLUMN deletion_reason deletion_reason;

     

       10
       10
       +
       ALTER TABLE comments ADD COLUMN deleted_by TEXT;

     

       11
       11
       +
       

     

       12
       12
       +
       -- Add comments for new columns

     

       13
       13
       +
       COMMENT ON COLUMN comments.deletion_reason IS 'Reason for deletion: author (user deleted), moderator (community mod removed)';

     

       14
       14
       +
       COMMENT ON COLUMN comments.deleted_by IS 'DID of the actor who performed the deletion';

     

       15
       15
       +
       

     

       16
       16
       +
       -- Backfill existing deleted comments as author-deleted

     

       17
       17
       +
       -- This handles existing soft-deleted comments gracefully

     

       18
       18
       +
       UPDATE comments

     

       19
       19
       +
       SET deletion_reason = 'author',

     

       20
       20
       +
           deleted_by = commenter_did

     

       21
       21
       +
       WHERE deleted_at IS NOT NULL AND deletion_reason IS NULL;

     

       22
       22
       +
       

     

       23
       23
       +
       -- Modify existing indexes to NOT filter deleted_at IS NULL

     

       24
       24
       +
       -- This allows deleted comments to appear in thread queries for structure preservation

     

       25
       25
       +
       -- Note: We drop and recreate to change the partial index condition

     

       26
       26
       +
       

     

       27
       27
       +
       -- Drop old partial indexes that exclude deleted comments

     

       28
       28
       +
       DROP INDEX IF EXISTS idx_comments_root;

     

       29
       29
       +
       DROP INDEX IF EXISTS idx_comments_parent;

     

       30
       30
       +
       DROP INDEX IF EXISTS idx_comments_parent_score;

     

       31
       31
       +
       DROP INDEX IF EXISTS idx_comments_uri_active;

     

       32
       32
       +
       

     

       33
       33
       +
       -- Recreate indexes without the deleted_at filter (include all comments for threading)

     

       34
       34
       +
       CREATE INDEX idx_comments_root ON comments(root_uri, created_at DESC);

     

       35
       35
       +
       CREATE INDEX idx_comments_parent ON comments(parent_uri, created_at DESC);

     

       36
       36
       +
       CREATE INDEX idx_comments_parent_score ON comments(parent_uri, score DESC, created_at DESC);

     

       37
       37
       +
       CREATE INDEX idx_comments_uri_lookup ON comments(uri);

     

       38
       38
       +
       

     

       39
       39
       +
       -- Add index for querying by deletion_reason (for moderation dashboard)

     

       40
       40
       +
       CREATE INDEX idx_comments_deleted_reason ON comments(deletion_reason, deleted_at DESC)

     

       41
       41
       +
       WHERE deleted_at IS NOT NULL;

     

       42
       42
       +
       

     

       43
       43
       +
       -- Add index for querying by deleted_by (for moderation audit/filtering)

     

       44
       44
       +
       CREATE INDEX idx_comments_deleted_by ON comments(deleted_by, deleted_at DESC)

     

       45
       45
       +
       WHERE deleted_at IS NOT NULL;

     

       46
       46
       +
       

     

       47
       47
       +
       -- +goose Down

     

       48
       48
       +
       -- Remove deletion metadata columns and restore original indexes

     

       49
       49
       +
       

     

       50
       50
       +
       DROP INDEX IF EXISTS idx_comments_deleted_by;

     

       51
       51
       +
       DROP INDEX IF EXISTS idx_comments_deleted_reason;

     

       52
       52
       +
       DROP INDEX IF EXISTS idx_comments_uri_lookup;

     

       53
       53
       +
       DROP INDEX IF EXISTS idx_comments_parent_score;

     

       54
       54
       +
       DROP INDEX IF EXISTS idx_comments_parent;

     

       55
       55
       +
       DROP INDEX IF EXISTS idx_comments_root;

     

       56
       56
       +
       

     

       57
       57
       +
       -- Restore original partial indexes (excluding deleted comments)

     

       58
       58
       +
       CREATE INDEX idx_comments_root ON comments(root_uri, created_at DESC) WHERE deleted_at IS NULL;

     

       59
       59
       +
       CREATE INDEX idx_comments_parent ON comments(parent_uri, created_at DESC) WHERE deleted_at IS NULL;

     

       60
       60
       +
       CREATE INDEX idx_comments_parent_score ON comments(parent_uri, score DESC, created_at DESC) WHERE deleted_at IS NULL;

     

       61
       61
       +
       CREATE INDEX idx_comments_uri_active ON comments(uri) WHERE deleted_at IS NULL;

     

       62
       62
       +
       

     

       63
       63
       +
       ALTER TABLE comments DROP COLUMN IF EXISTS deleted_by;

     

       64
       64
       +
       ALTER TABLE comments DROP COLUMN IF EXISTS deletion_reason;

     

       65
       65
       +
       

     

       66
       66
       +
       DROP TYPE IF EXISTS deletion_reason;

+17 -13

internal/core/comments/view_models.go

···

       7
       7
        
       // CommentView represents the full view of a comment with all metadata

     

       8
       8
        
       // Matches social.coves.community.comment.getComments#commentView lexicon

     

       9
       9
        
       // Used in thread views and get endpoints

     

       10
       10
       +
       // For deleted comments, IsDeleted=true and content-related fields are empty/nil

     

       10
       11
        
       type CommentView struct {

     

       11
       11
       -
       	Embed         interface{}         `json:"embed,omitempty"`

     

       12
       12
       -
       	Record        interface{}         `json:"record"`

     

       13
       13
       -
       	Viewer        *CommentViewerState `json:"viewer,omitempty"`

     

       14
       14
       -
       	Author        *posts.AuthorView   `json:"author"`

     

       15
       15
       -
       	Post          *CommentRef         `json:"post"`

     

       16
       16
       -
       	Parent        *CommentRef         `json:"parent,omitempty"`

     

       17
       17
       -
       	Stats         *CommentStats       `json:"stats"`

     

       18
       18
       -
       	Content       string              `json:"content"`

     

       19
       19
       -
       	CreatedAt     string              `json:"createdAt"`

     

       20
       20
       -
       	IndexedAt     string              `json:"indexedAt"`

     

       21
       21
       -
       	URI           string              `json:"uri"`

     

       22
       22
       -
       	CID           string              `json:"cid"`

     

       23
       23
       -
       	ContentFacets []interface{}       `json:"contentFacets,omitempty"`

     

       12
       12
       +
       	Embed          interface{}         `json:"embed,omitempty"`

     

       13
       13
       +
       	Record         interface{}         `json:"record"`

     

       14
       14
       +
       	Viewer         *CommentViewerState `json:"viewer,omitempty"`

     

       15
       15
       +
       	Author         *posts.AuthorView   `json:"author"`

     

       16
       16
       +
       	Post           *CommentRef         `json:"post"`

     

       17
       17
       +
       	Parent         *CommentRef         `json:"parent,omitempty"`

     

       18
       18
       +
       	Stats          *CommentStats       `json:"stats"`

     

       19
       19
       +
       	Content        string              `json:"content"`

     

       20
       20
       +
       	CreatedAt      string              `json:"createdAt"`

     

       21
       21
       +
       	IndexedAt      string              `json:"indexedAt"`

     

       22
       22
       +
       	URI            string              `json:"uri"`

     

       23
       23
       +
       	CID            string              `json:"cid"`

     

       24
       24
       +
       	ContentFacets  []interface{}       `json:"contentFacets,omitempty"`

     

       25
       25
       +
       	IsDeleted      bool                `json:"isDeleted,omitempty"`

     

       26
       26
       +
       	DeletionReason *string             `json:"deletionReason,omitempty"`

     

       27
       27
       +
       	DeletedAt      *string             `json:"deletedAt,omitempty"`

     

       24
       28
        
       }

     

       25
       29
        
       

     

       26
       30
        
       // ThreadViewComment represents a comment with its nested replies

+23 -1

internal/core/comments/interfaces.go

···

       1
       1
        
       package comments

     

       2
       2
        
       

     

       3
       3
       -
       import "context"

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"database/sql"

     

       6
       6
       +
       )

     

       4
       7
        
       

     

       5
       8
        
       // Repository defines the data access interface for comments

     

       6
       9
        
       // Used by Jetstream consumer to index comments from firehose

     
···

       25
       28
        
       

     

       26
       29
        
       	// Delete soft-deletes a comment (sets deleted_at)

     

       27
       30
        
       	// Called by Jetstream consumer after comment is deleted from PDS

     

       31
       31
       +
       	// Deprecated: Use SoftDeleteWithReason for new code to preserve thread structure

     

       28
       32
        
       	Delete(ctx context.Context, uri string) error

     

       29
       33
        
       

     

       34
       34
       +
       	// SoftDeleteWithReason performs a soft delete that blanks content but preserves thread structure

     

       35
       35
       +
       	// This allows deleted comments to appear as "[deleted]" placeholders in thread views

     

       36
       36
       +
       	// reason: "author" (user deleted) or "moderator" (mod removed)

     

       37
       37
       +
       	// deletedByDID: DID of the actor who performed the deletion

     

       38
       38
       +
       	SoftDeleteWithReason(ctx context.Context, uri, reason, deletedByDID string) error

     

       39
       39
       +
       

     

       30
       40
        
       	// ListByRoot retrieves all comments in a thread (flat)

     

       31
       41
        
       	// Used for fetching entire comment threads on posts

     

       32
       42
        
       	ListByRoot(ctx context.Context, rootURI string, limit, offset int) ([]*Comment, error)

     
···

       76
       86
        
       		limitPerParent int,

     

       77
       87
        
       	) (map[string][]*Comment, error)

     

       78
       88
        
       }

     

       89
       89
       +
       

     

       90
       90
       +
       // RepositoryTx provides transaction-aware operations for consumers that need atomicity

     

       91
       91
       +
       // Used by Jetstream consumer to perform atomic delete + count updates

     

       92
       92
       +
       // Implementations that support transactions should also implement this interface

     

       93
       93
       +
       type RepositoryTx interface {

     

       94
       94
       +
       	// SoftDeleteWithReasonTx performs a soft delete within a transaction

     

       95
       95
       +
       	// If tx is nil, executes directly against the database

     

       96
       96
       +
       	// Returns rows affected count for callers that need to check idempotency

     

       97
       97
       +
       	// reason: must be DeletionReasonAuthor or DeletionReasonModerator

     

       98
       98
       +
       	// deletedByDID: DID of the actor who performed the deletion

     

       99
       99
       +
       	SoftDeleteWithReasonTx(ctx context.Context, tx *sql.Tx, uri, reason, deletedByDID string) (int64, error)

     

       100
       100
       +
       }

+87 -27

internal/db/postgres/comment_repo.go

···

       120
       120
        
       			id, uri, cid, rkey, commenter_did,

     

       121
       121
        
       			root_uri, root_cid, parent_uri, parent_cid,

     

       122
       122
        
       			content, content_facets, embed, content_labels, langs,

     

       123
       123
       -
       			created_at, indexed_at, deleted_at,

     

       123
       123
       +
       			created_at, indexed_at, deleted_at, deletion_reason, deleted_by,

     

       124
       124
        
       			upvote_count, downvote_count, score, reply_count

     

       125
       125
        
       		FROM comments

     

       126
       126
        
       		WHERE uri = $1

     
···

       133
       133
        
       		&comment.ID, &comment.URI, &comment.CID, &comment.RKey, &comment.CommenterDID,

     

       134
       134
        
       		&comment.RootURI, &comment.RootCID, &comment.ParentURI, &comment.ParentCID,

     

       135
       135
        
       		&comment.Content, &comment.ContentFacets, &comment.Embed, &comment.ContentLabels, &langs,

     

       136
       136
       -
       		&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt,

     

       136
       136
       +
       		&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt, &comment.DeletionReason, &comment.DeletedBy,

     

       137
       137
        
       		&comment.UpvoteCount, &comment.DownvoteCount, &comment.Score, &comment.ReplyCount,

     

       138
       138
        
       	)

     

       139
       139
        
       

     
···

       152
       152
        
       // Delete soft-deletes a comment (sets deleted_at)

     

       153
       153
        
       // Called by Jetstream consumer after comment is deleted from PDS

     

       154
       154
        
       // Idempotent: Returns success if comment already deleted

     

       155
       155
       +
       // Deprecated: Use SoftDeleteWithReason for new code to preserve thread structure

     

       155
       156
        
       func (r *postgresCommentRepo) Delete(ctx context.Context, uri string) error {

     

       156
       157
        
       	query := `

     

       157
       158
        
       		UPDATE comments

     
···

       177
       178
        
       	return nil

     

       178
       179
        
       }

     

       179
       180
        
       

     

       180
       180
       -
       // ListByRoot retrieves all active comments in a thread (flat)

     

       181
       181
       +
       // SoftDeleteWithReason performs a soft delete that blanks content but preserves thread structure

     

       182
       182
       +
       // This allows deleted comments to appear as "[deleted]" placeholders in thread views

     

       183
       183
       +
       // Idempotent: Returns success if comment already deleted

     

       184
       184
       +
       // Validates that reason is a known deletion reason constant

     

       185
       185
       +
       func (r *postgresCommentRepo) SoftDeleteWithReason(ctx context.Context, uri, reason, deletedByDID string) error {

     

       186
       186
       +
       	// Validate deletion reason

     

       187
       187
       +
       	if reason != comments.DeletionReasonAuthor && reason != comments.DeletionReasonModerator {

     

       188
       188
       +
       		return fmt.Errorf("invalid deletion reason: %s", reason)

     

       189
       189
       +
       	}

     

       190
       190
       +
       

     

       191
       191
       +
       	_, err := r.SoftDeleteWithReasonTx(ctx, nil, uri, reason, deletedByDID)

     

       192
       192
       +
       	return err

     

       193
       193
       +
       }

     

       194
       194
       +
       

     

       195
       195
       +
       // SoftDeleteWithReasonTx performs a soft delete within an optional transaction

     

       196
       196
       +
       // If tx is nil, executes directly against the database

     

       197
       197
       +
       // Returns rows affected count for callers that need to check idempotency

     

       198
       198
       +
       // This method is used by both the repository and the Jetstream consumer

     

       199
       199
       +
       func (r *postgresCommentRepo) SoftDeleteWithReasonTx(ctx context.Context, tx *sql.Tx, uri, reason, deletedByDID string) (int64, error) {

     

       200
       200
       +
       	query := `

     

       201
       201
       +
       		UPDATE comments

     

       202
       202
       +
       		SET

     

       203
       203
       +
       			content = '',

     

       204
       204
       +
       			content_facets = NULL,

     

       205
       205
       +
       			embed = NULL,

     

       206
       206
       +
       			content_labels = NULL,

     

       207
       207
       +
       			deleted_at = NOW(),

     

       208
       208
       +
       			deletion_reason = $2,

     

       209
       209
       +
       			deleted_by = $3

     

       210
       210
       +
       		WHERE uri = $1 AND deleted_at IS NULL

     

       211
       211
       +
       	`

     

       212
       212
       +
       

     

       213
       213
       +
       	var result sql.Result

     

       214
       214
       +
       	var err error

     

       215
       215
       +
       

     

       216
       216
       +
       	if tx != nil {

     

       217
       217
       +
       		result, err = tx.ExecContext(ctx, query, uri, reason, deletedByDID)

     

       218
       218
       +
       	} else {

     

       219
       219
       +
       		result, err = r.db.ExecContext(ctx, query, uri, reason, deletedByDID)

     

       220
       220
       +
       	}

     

       221
       221
       +
       

     

       222
       222
       +
       	if err != nil {

     

       223
       223
       +
       		return 0, fmt.Errorf("failed to soft delete comment: %w", err)

     

       224
       224
       +
       	}

     

       225
       225
       +
       

     

       226
       226
       +
       	rowsAffected, err := result.RowsAffected()

     

       227
       227
       +
       	if err != nil {

     

       228
       228
       +
       		return 0, fmt.Errorf("failed to check delete result: %w", err)

     

       229
       229
       +
       	}

     

       230
       230
       +
       

     

       231
       231
       +
       	return rowsAffected, nil

     

       232
       232
       +
       }

     

       233
       233
       +
       

     

       234
       234
       +
       // ListByRoot retrieves all comments in a thread (flat), including deleted ones

     

       181
       235
        
       // Used for fetching entire comment threads on posts

     

       236
       236
       +
       // Includes deleted comments to preserve thread structure (shown as "[deleted]" placeholders)

     

       182
       237
        
       func (r *postgresCommentRepo) ListByRoot(ctx context.Context, rootURI string, limit, offset int) ([]*comments.Comment, error) {

     

       183
       238
        
       	query := `

     

       184
       239
        
       		SELECT

     

       185
       240
        
       			id, uri, cid, rkey, commenter_did,

     

       186
       241
        
       			root_uri, root_cid, parent_uri, parent_cid,

     

       187
       242
        
       			content, content_facets, embed, content_labels, langs,

     

       188
       188
       -
       			created_at, indexed_at, deleted_at,

     

       243
       243
       +
       			created_at, indexed_at, deleted_at, deletion_reason, deleted_by,

     

       189
       244
        
       			upvote_count, downvote_count, score, reply_count

     

       190
       245
        
       		FROM comments

     

       191
       191
       -
       		WHERE root_uri = $1 AND deleted_at IS NULL

     

       246
       246
       +
       		WHERE root_uri = $1

     

       192
       247
        
       		ORDER BY created_at ASC

     

       193
       248
        
       		LIMIT $2 OFFSET $3

     

       194
       249
        
       	`

     
···

       212
       267
        
       			&comment.ID, &comment.URI, &comment.CID, &comment.RKey, &comment.CommenterDID,

     

       213
       268
        
       			&comment.RootURI, &comment.RootCID, &comment.ParentURI, &comment.ParentCID,

     

       214
       269
        
       			&comment.Content, &comment.ContentFacets, &comment.Embed, &comment.ContentLabels, &langs,

     

       215
       215
       -
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt,

     

       270
       270
       +
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt, &comment.DeletionReason, &comment.DeletedBy,

     

       216
       271
        
       			&comment.UpvoteCount, &comment.DownvoteCount, &comment.Score, &comment.ReplyCount,

     

       217
       272
        
       		)

     

       218
       273
        
       		if err != nil {

     
···

       230
       285
        
       	return result, nil

     

       231
       286
        
       }

     

       232
       287
        
       

     

       233
       233
       -
       // ListByParent retrieves direct replies to a post or comment

     

       288
       288
       +
       // ListByParent retrieves direct replies to a post or comment, including deleted ones

     

       234
       289
        
       // Used for building nested/threaded comment views

     

       290
       290
       +
       // Includes deleted comments to preserve thread structure (shown as "[deleted]" placeholders)

     

       235
       291
        
       func (r *postgresCommentRepo) ListByParent(ctx context.Context, parentURI string, limit, offset int) ([]*comments.Comment, error) {

     

       236
       292
        
       	query := `

     

       237
       293
        
       		SELECT

     

       238
       294
        
       			id, uri, cid, rkey, commenter_did,

     

       239
       295
        
       			root_uri, root_cid, parent_uri, parent_cid,

     

       240
       296
        
       			content, content_facets, embed, content_labels, langs,

     

       241
       241
       -
       			created_at, indexed_at, deleted_at,

     

       297
       297
       +
       			created_at, indexed_at, deleted_at, deletion_reason, deleted_by,

     

       242
       298
        
       			upvote_count, downvote_count, score, reply_count

     

       243
       299
        
       		FROM comments

     

       244
       244
       -
       		WHERE parent_uri = $1 AND deleted_at IS NULL

     

       300
       300
       +
       		WHERE parent_uri = $1

     

       245
       301
        
       		ORDER BY created_at ASC

     

       246
       302
        
       		LIMIT $2 OFFSET $3

     

       247
       303
        
       	`

     
···

       265
       321
        
       			&comment.ID, &comment.URI, &comment.CID, &comment.RKey, &comment.CommenterDID,

     

       266
       322
        
       			&comment.RootURI, &comment.RootCID, &comment.ParentURI, &comment.ParentCID,

     

       267
       323
        
       			&comment.Content, &comment.ContentFacets, &comment.Embed, &comment.ContentLabels, &langs,

     

       268
       268
       -
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt,

     

       324
       324
       +
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt, &comment.DeletionReason, &comment.DeletedBy,

     

       269
       325
        
       			&comment.UpvoteCount, &comment.DownvoteCount, &comment.Score, &comment.ReplyCount,

     

       270
       326
        
       		)

     

       271
       327
        
       		if err != nil {

     
···

       302
       358
        
       }

     

       303
       359
        
       

     

       304
       360
        
       // ListByCommenter retrieves all active comments by a specific user

     

       305
       305
       -
       // Future: Used for user comment history

     

       361
       361
       +
       // Used for user comment history - filters out deleted comments

     

       306
       362
        
       func (r *postgresCommentRepo) ListByCommenter(ctx context.Context, commenterDID string, limit, offset int) ([]*comments.Comment, error) {

     

       307
       363
        
       	query := `

     

       308
       364
        
       		SELECT

     

       309
       365
        
       			id, uri, cid, rkey, commenter_did,

     

       310
       366
        
       			root_uri, root_cid, parent_uri, parent_cid,

     

       311
       367
        
       			content, content_facets, embed, content_labels, langs,

     

       312
       312
       -
       			created_at, indexed_at, deleted_at,

     

       368
       368
       +
       			created_at, indexed_at, deleted_at, deletion_reason, deleted_by,

     

       313
       369
        
       			upvote_count, downvote_count, score, reply_count

     

       314
       370
        
       		FROM comments

     

       315
       371
        
       		WHERE commenter_did = $1 AND deleted_at IS NULL

     
···

       336
       392
        
       			&comment.ID, &comment.URI, &comment.CID, &comment.RKey, &comment.CommenterDID,

     

       337
       393
        
       			&comment.RootURI, &comment.RootCID, &comment.ParentURI, &comment.ParentCID,

     

       338
       394
        
       			&comment.Content, &comment.ContentFacets, &comment.Embed, &comment.ContentLabels, &langs,

     

       339
       339
       -
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt,

     

       395
       395
       +
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt, &comment.DeletionReason, &comment.DeletedBy,

     

       340
       396
        
       			&comment.UpvoteCount, &comment.DownvoteCount, &comment.Score, &comment.ReplyCount,

     

       341
       397
        
       		)

     

       342
       398
        
       		if err != nil {

     
···

       391
       447
        
       			c.id, c.uri, c.cid, c.rkey, c.commenter_did,

     

       392
       448
        
       			c.root_uri, c.root_cid, c.parent_uri, c.parent_cid,

     

       393
       449
        
       			c.content, c.content_facets, c.embed, c.content_labels, c.langs,

     

       394
       394
       -
       			c.created_at, c.indexed_at, c.deleted_at,

     

       450
       450
       +
       			c.created_at, c.indexed_at, c.deleted_at, c.deletion_reason, c.deleted_by,

     

       395
       451
        
       			c.upvote_count, c.downvote_count, c.score, c.reply_count,

     

       396
       452
        
       			log(greatest(2, c.score + 2)) / power(((EXTRACT(EPOCH FROM (NOW() - c.created_at)) / 3600) + 2), 1.8) as hot_rank,

     

       397
       453
        
       			COALESCE(u.handle, c.commenter_did) as author_handle

     
···

       402
       458
        
       			c.id, c.uri, c.cid, c.rkey, c.commenter_did,

     

       403
       459
        
       			c.root_uri, c.root_cid, c.parent_uri, c.parent_cid,

     

       404
       460
        
       			c.content, c.content_facets, c.embed, c.content_labels, c.langs,

     

       405
       405
       -
       			c.created_at, c.indexed_at, c.deleted_at,

     

       461
       461
       +
       			c.created_at, c.indexed_at, c.deleted_at, c.deletion_reason, c.deleted_by,

     

       406
       462
        
       			c.upvote_count, c.downvote_count, c.score, c.reply_count,

     

       407
       463
        
       			NULL::numeric as hot_rank,

     

       408
       464
        
       			COALESCE(u.handle, c.commenter_did) as author_handle

     
···

       411
       467
        
       

     

       412
       468
        
       	// Build complete query with JOINs and filters

     

       413
       469
        
       	// LEFT JOIN prevents data loss when user record hasn't been indexed yet (out-of-order Jetstream events)

     

       470
       470
       +
       	// Includes deleted comments to preserve thread structure (shown as "[deleted]" placeholders)

     

       414
       471
        
       	query := fmt.Sprintf(`

     

       415
       472
        
       		%s

     

       416
       473
        
       		LEFT JOIN users u ON c.commenter_did = u.did

     

       417
       417
       -
       		WHERE c.parent_uri = $1 AND c.deleted_at IS NULL

     

       474
       474
       +
       		WHERE c.parent_uri = $1

     

       418
       475
        
       			%s

     

       419
       476
        
       			%s

     

       420
       477
        
       		ORDER BY %s

     
···

       449
       506
        
       			&comment.ID, &comment.URI, &comment.CID, &comment.RKey, &comment.CommenterDID,

     

       450
       507
        
       			&comment.RootURI, &comment.RootCID, &comment.ParentURI, &comment.ParentCID,

     

       451
       508
        
       			&comment.Content, &comment.ContentFacets, &comment.Embed, &comment.ContentLabels, &langs,

     

       452
       452
       -
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt,

     

       509
       509
       +
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt, &comment.DeletionReason, &comment.DeletedBy,

     

       453
       510
        
       			&comment.UpvoteCount, &comment.DownvoteCount, &comment.Score, &comment.ReplyCount,

     

       454
       511
        
       			&hotRank, &authorHandle,

     

       455
       512
        
       		)

     
···

       687
       744
        
       

     

       688
       745
        
       // GetByURIsBatch retrieves multiple comments by their AT-URIs in a single query

     

       689
       746
        
       // Returns map[uri]*Comment for efficient lookups without N+1 queries

     

       747
       747
       +
       // Includes deleted comments to preserve thread structure

     

       690
       748
        
       func (r *postgresCommentRepo) GetByURIsBatch(ctx context.Context, uris []string) (map[string]*comments.Comment, error) {

     

       691
       749
        
       	if len(uris) == 0 {

     

       692
       750
        
       		return make(map[string]*comments.Comment), nil

     
···

       694
       752
        
       

     

       695
       753
        
       	// LEFT JOIN prevents data loss when user record hasn't been indexed yet (out-of-order Jetstream events)

     

       696
       754
        
       	// COALESCE falls back to DID when handle is NULL (user not yet in users table)

     

       755
       755
       +
       	// Includes deleted comments to preserve thread structure (shown as "[deleted]" placeholders)

     

       697
       756
        
       	query := `

     

       698
       757
        
       		SELECT

     

       699
       758
        
       			c.id, c.uri, c.cid, c.rkey, c.commenter_did,

     

       700
       759
        
       			c.root_uri, c.root_cid, c.parent_uri, c.parent_cid,

     

       701
       760
        
       			c.content, c.content_facets, c.embed, c.content_labels, c.langs,

     

       702
       702
       -
       			c.created_at, c.indexed_at, c.deleted_at,

     

       761
       761
       +
       			c.created_at, c.indexed_at, c.deleted_at, c.deletion_reason, c.deleted_by,

     

       703
       762
        
       			c.upvote_count, c.downvote_count, c.score, c.reply_count,

     

       704
       763
        
       			COALESCE(u.handle, c.commenter_did) as author_handle

     

       705
       764
        
       		FROM comments c

     

       706
       765
        
       		LEFT JOIN users u ON c.commenter_did = u.did

     

       707
       707
       -
       		WHERE c.uri = ANY($1) AND c.deleted_at IS NULL

     

       766
       766
       +
       		WHERE c.uri = ANY($1)

     

       708
       767
        
       	`

     

       709
       768
        
       

     

       710
       769
        
       	rows, err := r.db.QueryContext(ctx, query, pq.Array(uris))

     
···

       727
       786
        
       			&comment.ID, &comment.URI, &comment.CID, &comment.RKey, &comment.CommenterDID,

     

       728
       787
        
       			&comment.RootURI, &comment.RootCID, &comment.ParentURI, &comment.ParentCID,

     

       729
       788
        
       			&comment.Content, &comment.ContentFacets, &comment.Embed, &comment.ContentLabels, &langs,

     

       730
       730
       -
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt,

     

       789
       789
       +
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt, &comment.DeletionReason, &comment.DeletedBy,

     

       731
       790
        
       			&comment.UpvoteCount, &comment.DownvoteCount, &comment.Score, &comment.ReplyCount,

     

       732
       791
        
       			&authorHandle,

     

       733
       792
        
       		)

     
···

       769
       828
        
       			c.id, c.uri, c.cid, c.rkey, c.commenter_did,

     

       770
       829
        
       			c.root_uri, c.root_cid, c.parent_uri, c.parent_cid,

     

       771
       830
        
       			c.content, c.content_facets, c.embed, c.content_labels, c.langs,

     

       772
       772
       -
       			c.created_at, c.indexed_at, c.deleted_at,

     

       831
       831
       +
       			c.created_at, c.indexed_at, c.deleted_at, c.deletion_reason, c.deleted_by,

     

       773
       832
        
       			c.upvote_count, c.downvote_count, c.score, c.reply_count,

     

       774
       833
        
       			log(greatest(2, c.score + 2)) / power(((EXTRACT(EPOCH FROM (NOW() - c.created_at)) / 3600) + 2), 1.8) as hot_rank,

     

       775
       834
        
       			COALESCE(u.handle, c.commenter_did) as author_handle`

     
···

       780
       839
        
       			c.id, c.uri, c.cid, c.rkey, c.commenter_did,

     

       781
       840
        
       			c.root_uri, c.root_cid, c.parent_uri, c.parent_cid,

     

       782
       841
        
       			c.content, c.content_facets, c.embed, c.content_labels, c.langs,

     

       783
       783
       -
       			c.created_at, c.indexed_at, c.deleted_at,

     

       842
       842
       +
       			c.created_at, c.indexed_at, c.deleted_at, c.deletion_reason, c.deleted_by,

     

       784
       843
        
       			c.upvote_count, c.downvote_count, c.score, c.reply_count,

     

       785
       844
        
       			NULL::numeric as hot_rank,

     

       786
       845
        
       			COALESCE(u.handle, c.commenter_did) as author_handle`

     
···

       790
       849
        
       			c.id, c.uri, c.cid, c.rkey, c.commenter_did,

     

       791
       850
        
       			c.root_uri, c.root_cid, c.parent_uri, c.parent_cid,

     

       792
       851
        
       			c.content, c.content_facets, c.embed, c.content_labels, c.langs,

     

       793
       793
       -
       			c.created_at, c.indexed_at, c.deleted_at,

     

       852
       852
       +
       			c.created_at, c.indexed_at, c.deleted_at, c.deletion_reason, c.deleted_by,

     

       794
       853
        
       			c.upvote_count, c.downvote_count, c.score, c.reply_count,

     

       795
       854
        
       			NULL::numeric as hot_rank,

     

       796
       855
        
       			COALESCE(u.handle, c.commenter_did) as author_handle`

     
···

       801
       860
        
       			c.id, c.uri, c.cid, c.rkey, c.commenter_did,

     

       802
       861
        
       			c.root_uri, c.root_cid, c.parent_uri, c.parent_cid,

     

       803
       862
        
       			c.content, c.content_facets, c.embed, c.content_labels, c.langs,

     

       804
       804
       -
       			c.created_at, c.indexed_at, c.deleted_at,

     

       863
       863
       +
       			c.created_at, c.indexed_at, c.deleted_at, c.deletion_reason, c.deleted_by,

     

       805
       864
        
       			c.upvote_count, c.downvote_count, c.score, c.reply_count,

     

       806
       865
        
       			log(greatest(2, c.score + 2)) / power(((EXTRACT(EPOCH FROM (NOW() - c.created_at)) / 3600) + 2), 1.8) as hot_rank,

     

       807
       866
        
       			COALESCE(u.handle, c.commenter_did) as author_handle`

     
···

       812
       871
        
       	// Use window function to limit results per parent

     

       813
       872
        
       	// This is more efficient than LIMIT in a subquery per parent

     

       814
       873
        
       	// LEFT JOIN prevents data loss when user record hasn't been indexed yet (out-of-order Jetstream events)

     

       874
       874
       +
       	// Includes deleted comments to preserve thread structure (shown as "[deleted]" placeholders)

     

       815
       875
        
       	query := fmt.Sprintf(`

     

       816
       876
        
       		WITH ranked_comments AS (

     

       817
       877
        
       			SELECT

     
···

       822
       882
        
       				) as rn

     

       823
       883
        
       			FROM comments c

     

       824
       884
        
       			LEFT JOIN users u ON c.commenter_did = u.did

     

       825
       825
       -
       			WHERE c.parent_uri = ANY($1) AND c.deleted_at IS NULL

     

       885
       885
       +
       			WHERE c.parent_uri = ANY($1)

     

       826
       886
        
       		)

     

       827
       887
        
       		SELECT

     

       828
       888
        
       			id, uri, cid, rkey, commenter_did,

     

       829
       889
        
       			root_uri, root_cid, parent_uri, parent_cid,

     

       830
       890
        
       			content, content_facets, embed, content_labels, langs,

     

       831
       831
       -
       			created_at, indexed_at, deleted_at,

     

       891
       891
       +
       			created_at, indexed_at, deleted_at, deletion_reason, deleted_by,

     

       832
       892
        
       			upvote_count, downvote_count, score, reply_count,

     

       833
       893
        
       			hot_rank, author_handle

     

       834
       894
        
       		FROM ranked_comments

     
···

       858
       918
        
       			&comment.ID, &comment.URI, &comment.CID, &comment.RKey, &comment.CommenterDID,

     

       859
       919
        
       			&comment.RootURI, &comment.RootCID, &comment.ParentURI, &comment.ParentCID,

     

       860
       920
        
       			&comment.Content, &comment.ContentFacets, &comment.Embed, &comment.ContentLabels, &langs,

     

       861
       861
       -
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt,

     

       921
       921
       +
       			&comment.CreatedAt, &comment.IndexedAt, &comment.DeletedAt, &comment.DeletionReason, &comment.DeletedBy,

     

       862
       922
        
       			&comment.UpvoteCount, &comment.DownvoteCount, &comment.Score, &comment.ReplyCount,

     

       863
       923
        
       			&hotRank, &authorHandle,

     

       864
       924
        
       		)

+5 -6

internal/core/comments/comment_service.go

···

       750
       750
        
       		CreatedAt: createdAt, // Preserve original timestamp

     

       751
       751
        
       	}

     

       752
       752
        
       

     

       753
       753
       -
       	// Update the record on PDS (putRecord)

     

       754
       754
       -
       	// Note: This creates a new CID even though the URI stays the same

     

       755
       755
       -
       	// TODO: Use PutRecord instead of CreateRecord for proper update semantics with optimistic locking.

     

       756
       756
       -
       	// PutRecord should accept the existing CID (existingRecord.CID) to ensure concurrent updates are detected.

     

       757
       757
       -
       	// However, PutRecord is not yet implemented in internal/atproto/pds/client.go.

     

       758
       758
       -
       	uri, cid, err := pdsClient.CreateRecord(ctx, commentCollection, rkey, updatedRecord)

     

       753
       753
       +
       	// Update the record on PDS with optimistic locking via swapRecord CID

     

       754
       754
       +
       	uri, cid, err := pdsClient.PutRecord(ctx, commentCollection, rkey, updatedRecord, existingRecord.CID)

     

       759
       755
        
       	if err != nil {

     

       760
       756
        
       		s.logger.Error("failed to update comment on PDS",

     

       761
       757
        
       			"error", err,

     
···

       764
       760
        
       		if pds.IsAuthError(err) {

     

       765
       761
        
       			return nil, ErrNotAuthorized

     

       766
       762
        
       		}

     

       763
       763
       +
       		if errors.Is(err, pds.ErrConflict) {

     

       764
       764
       +
       			return nil, ErrConcurrentModification

     

       765
       765
       +
       		}

     

       767
       766
        
       		return nil, fmt.Errorf("failed to update comment: %w", err)

     

       768
       767
        
       	}

     

       769
       768

+73

internal/api/handlers/common/viewer_state.go

···

       1
       1
       +
       package common

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/posts"

     

       6
       6
       +
       	"Coves/internal/core/votes"

     

       7
       7
       +
       	"context"

     

       8
       8
       +
       	"log"

     

       9
       9
       +
       	"net/http"

     

       10
       10
       +
       )

     

       11
       11
       +
       

     

       12
       12
       +
       // FeedPostProvider is implemented by any feed post wrapper that contains a PostView.

     

       13
       13
       +
       // This allows the helper to work with different feed post types (discover, timeline, communityFeed).

     

       14
       14
       +
       type FeedPostProvider interface {

     

       15
       15
       +
       	GetPost() *posts.PostView

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       // PopulateViewerVoteState enriches feed posts with the authenticated user's vote state.

     

       19
       19
       +
       // This is a no-op if voteService is nil or the request is unauthenticated.

     

       20
       20
       +
       //

     

       21
       21
       +
       // Parameters:

     

       22
       22
       +
       //   - ctx: Request context for PDS calls

     

       23
       23
       +
       //   - r: HTTP request (used to extract OAuth session)

     

       24
       24
       +
       //   - voteService: Vote service for cache lookup (may be nil)

     

       25
       25
       +
       //   - feedPosts: Posts to enrich with viewer state (must implement FeedPostProvider)

     

       26
       26
       +
       //

     

       27
       27
       +
       // The function logs but does not fail on errors - viewer state is optional enrichment.

     

       28
       28
       +
       func PopulateViewerVoteState[T FeedPostProvider](

     

       29
       29
       +
       	ctx context.Context,

     

       30
       30
       +
       	r *http.Request,

     

       31
       31
       +
       	voteService votes.Service,

     

       32
       32
       +
       	feedPosts []T,

     

       33
       33
       +
       ) {

     

       34
       34
       +
       	if voteService == nil {

     

       35
       35
       +
       		return

     

       36
       36
       +
       	}

     

       37
       37
       +
       

     

       38
       38
       +
       	session := middleware.GetOAuthSession(r)

     

       39
       39
       +
       	if session == nil {

     

       40
       40
       +
       		return

     

       41
       41
       +
       	}

     

       42
       42
       +
       

     

       43
       43
       +
       	userDID := middleware.GetUserDID(r)

     

       44
       44
       +
       

     

       45
       45
       +
       	// Ensure vote cache is populated from PDS

     

       46
       46
       +
       	if err := voteService.EnsureCachePopulated(ctx, session); err != nil {

     

       47
       47
       +
       		log.Printf("Warning: failed to populate vote cache: %v", err)

     

       48
       48
       +
       		return

     

       49
       49
       +
       	}

     

       50
       50
       +
       

     

       51
       51
       +
       	// Collect post URIs to batch lookup

     

       52
       52
       +
       	postURIs := make([]string, 0, len(feedPosts))

     

       53
       53
       +
       	for _, feedPost := range feedPosts {

     

       54
       54
       +
       		if post := feedPost.GetPost(); post != nil {

     

       55
       55
       +
       			postURIs = append(postURIs, post.URI)

     

       56
       56
       +
       		}

     

       57
       57
       +
       	}

     

       58
       58
       +
       

     

       59
       59
       +
       	// Get viewer votes for all posts

     

       60
       60
       +
       	viewerVotes := voteService.GetViewerVotesForSubjects(userDID, postURIs)

     

       61
       61
       +
       

     

       62
       62
       +
       	// Populate viewer state on each post

     

       63
       63
       +
       	for _, feedPost := range feedPosts {

     

       64
       64
       +
       		if post := feedPost.GetPost(); post != nil {

     

       65
       65
       +
       			if vote, exists := viewerVotes[post.URI]; exists {

     

       66
       66
       +
       				post.Viewer = &posts.ViewerState{

     

       67
       67
       +
       					Vote:    &vote.Direction,

     

       68
       68
       +
       					VoteURI: &vote.URI,

     

       69
       69
       +
       				}

     

       70
       70
       +
       			}

     

       71
       71
       +
       		}

     

       72
       72
       +
       	}

     

       73
       73
       +
       }

+11 -4

internal/api/handlers/discover/get_discover.go

···

       1
       1
        
       package discover

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"Coves/internal/api/handlers/common"

     

       4
       5
        
       	"Coves/internal/core/discover"

     

       5
       6
        
       	"Coves/internal/core/posts"

     

       7
       7
       +
       	"Coves/internal/core/votes"

     

       6
       8
        
       	"encoding/json"

     

       7
       9
        
       	"log"

     

       8
       10
        
       	"net/http"

     
···

       11
       13
        
       

     

       12
       14
        
       // GetDiscoverHandler handles discover feed retrieval

     

       13
       15
        
       type GetDiscoverHandler struct {

     

       14
       14
       -
       	service discover.Service

     

       16
       16
       +
       	service     discover.Service

     

       17
       17
       +
       	voteService votes.Service

     

       15
       18
        
       }

     

       16
       19
        
       

     

       17
       20
        
       // NewGetDiscoverHandler creates a new discover handler

     

       18
       18
       -
       func NewGetDiscoverHandler(service discover.Service) *GetDiscoverHandler {

     

       21
       21
       +
       func NewGetDiscoverHandler(service discover.Service, voteService votes.Service) *GetDiscoverHandler {

     

       19
       22
        
       	return &GetDiscoverHandler{

     

       20
       20
       -
       		service: service,

     

       23
       23
       +
       		service:     service,

     

       24
       24
       +
       		voteService: voteService,

     

       21
       25
        
       	}

     

       22
       26
        
       }

     

       23
       27
        
       

     

       24
       28
        
       // HandleGetDiscover retrieves posts from all communities (public feed)

     

       25
       29
        
       // GET /xrpc/social.coves.feed.getDiscover?sort=hot&limit=15&cursor=...

     

       26
       26
       -
       // Public endpoint - no authentication required

     

       30
       30
       +
       // Public endpoint with optional auth - if authenticated, includes viewer vote state

     

       27
       31
        
       func (h *GetDiscoverHandler) HandleGetDiscover(w http.ResponseWriter, r *http.Request) {

     

       28
       32
        
       	if r.Method != http.MethodGet {

     

       29
       33
        
       		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

     
···

       40
       44
        
       		return

     

       41
       45
        
       	}

     

       42
       46
        
       

     

       47
       47
       +
       	// Populate viewer vote state if authenticated

     

       48
       48
       +
       	common.PopulateViewerVoteState(r.Context(), r, h.voteService, response.Feed)

     

       49
       49
       +
       

     

       43
       50
        
       	// Transform blob refs to URLs for all posts

     

       44
       51
        
       	for _, feedPost := range response.Feed {

     

       45
       52
        
       		if feedPost.Post != nil {

+9 -4

internal/api/routes/discover.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/api/handlers/discover"

     

       5
       5
       +
       	"Coves/internal/api/middleware"

     

       5
       6
        
       	discoverCore "Coves/internal/core/discover"

     

       7
       7
       +
       	"Coves/internal/core/votes"

     

       6
       8
        
       

     

       7
       9
        
       	"github.com/go-chi/chi/v5"

     

       8
       10
        
       )

     
···

       10
       12
        
       // RegisterDiscoverRoutes registers discover-related XRPC endpoints

     

       11
       13
        
       //

     

       12
       14
        
       // SECURITY & RATE LIMITING:

     

       13
       13
       -
       // - Discover feed is PUBLIC (no authentication required)

     

       15
       15
       +
       // - Discover feed is PUBLIC (works without authentication)

     

       16
       16
       +
       // - Optional auth: if authenticated, includes viewer vote state on posts

     

       14
       17
        
       // - Protected by global rate limiter: 100 requests/minute per IP (main.go:84)

     

       15
       18
        
       // - Query timeout enforced via context (prevents long-running queries)

     

       16
       19
        
       // - Result limit capped at 50 posts per request (validated in service layer)

     
···

       18
       21
        
       func RegisterDiscoverRoutes(

     

       19
       22
        
       	r chi.Router,

     

       20
       23
        
       	discoverService discoverCore.Service,

     

       24
       24
       +
       	voteService votes.Service,

     

       25
       25
       +
       	authMiddleware *middleware.OAuthAuthMiddleware,

     

       21
       26
        
       ) {

     

       22
       27
        
       	// Create handlers

     

       23
       23
       -
       	getDiscoverHandler := discover.NewGetDiscoverHandler(discoverService)

     

       28
       28
       +
       	getDiscoverHandler := discover.NewGetDiscoverHandler(discoverService, voteService)

     

       24
       29
        
       

     

       25
       30
        
       	// GET /xrpc/social.coves.feed.getDiscover

     

       26
       26
       -
       	// Public endpoint - no authentication required

     

       31
       31
       +
       	// Public endpoint with optional auth for viewer-specific state (vote state)

     

       27
       32
        
       	// Shows posts from ALL communities (not personalized)

     

       28
       33
        
       	// Rate limited: 100 req/min per IP via global middleware

     

       29
       29
       -
       	r.Get("/xrpc/social.coves.feed.getDiscover", getDiscoverHandler.HandleGetDiscover)

     

       34
       34
       +
       	r.With(authMiddleware.OptionalAuth).Get("/xrpc/social.coves.feed.getDiscover", getDiscoverHandler.HandleGetDiscover)

     

       30
       35
        
       }

internal/core/communityFeeds/types.go

···

       31
       31
        
       	Reply  *ReplyRef       `json:"reply,omitempty"`  // Reply context

     

       32
       32
        
       }

     

       33
       33
        
       

     

       34
       34
       +
       // GetPost returns the underlying PostView for viewer state enrichment

     

       35
       35
       +
       func (f *FeedViewPost) GetPost() *posts.PostView {

     

       36
       36
       +
       	return f.Post

     

       37
       37
       +
       }

     

       38
       38
       +
       

     

       34
       39
        
       // FeedReason is a union type for feed context

     

       35
       40
        
       // Can be reasonRepost or reasonPin

     

       36
       41
        
       type FeedReason struct {

internal/core/discover/types.go

···

       39
       39
        
       	Reply  *ReplyRef       `json:"reply,omitempty"`

     

       40
       40
        
       }

     

       41
       41
        
       

     

       42
       42
       +
       // GetPost returns the underlying PostView for viewer state enrichment

     

       43
       43
       +
       func (f *FeedViewPost) GetPost() *posts.PostView {

     

       44
       44
       +
       	return f.Post

     

       45
       45
       +
       }

     

       46
       46
       +
       

     

       42
       47
        
       // FeedReason is a union type for feed context

     

       43
       48
        
       type FeedReason struct {

     

       44
       49
        
       	Repost    *ReasonRepost    `json:"-"`

internal/core/timeline/types.go

···

       42
       42
        
       	Reply  *ReplyRef       `json:"reply,omitempty"`  // Reply context

     

       43
       43
        
       }

     

       44
       44
        
       

     

       45
       45
       +
       // GetPost returns the underlying PostView for viewer state enrichment

     

       46
       46
       +
       func (f *FeedViewPost) GetPost() *posts.PostView {

     

       47
       47
       +
       	return f.Post

     

       48
       48
       +
       }

     

       49
       49
       +
       

     

       45
       50
        
       // FeedReason is a union type for feed context

     

       46
       51
        
       // Future: Can be reasonRepost or reasonCommunity

     

       47
       52
        
       type FeedReason struct {

+193 -5

tests/integration/discover_test.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/api/handlers/discover"

     

       5
       5
       +
       	"Coves/internal/api/middleware"

     

       6
       6
       +
       	"Coves/internal/core/votes"

     

       5
       7
        
       	"Coves/internal/db/postgres"

     

       6
       8
        
       	"context"

     

       7
       9
        
       	"encoding/json"

     
···

       13
       15
        
       

     

       14
       16
        
       	discoverCore "Coves/internal/core/discover"

     

       15
       17
        
       

     

       18
       18
       +
       	oauthlib "github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       19
       19
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       16
       20
        
       	"github.com/stretchr/testify/assert"

     

       17
       21
        
       	"github.com/stretchr/testify/require"

     

       18
       22
        
       )

     

       19
       23
        
       

     

       24
       24
       +
       // mockVoteService implements votes.Service for testing viewer vote state

     

       25
       25
       +
       type mockVoteService struct {

     

       26
       26
       +
       	cachedVotes map[string]*votes.CachedVote // userDID:subjectURI -> vote

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       func newMockVoteService() *mockVoteService {

     

       30
       30
       +
       	return &mockVoteService{

     

       31
       31
       +
       		cachedVotes: make(map[string]*votes.CachedVote),

     

       32
       32
       +
       	}

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       func (m *mockVoteService) AddVote(userDID, subjectURI, direction, voteURI string) {

     

       36
       36
       +
       	key := userDID + ":" + subjectURI

     

       37
       37
       +
       	m.cachedVotes[key] = &votes.CachedVote{

     

       38
       38
       +
       		Direction: direction,

     

       39
       39
       +
       		URI:       voteURI,

     

       40
       40
       +
       	}

     

       41
       41
       +
       }

     

       42
       42
       +
       

     

       43
       43
       +
       func (m *mockVoteService) CreateVote(_ context.Context, _ *oauthlib.ClientSessionData, _ votes.CreateVoteRequest) (*votes.CreateVoteResponse, error) {

     

       44
       44
       +
       	return &votes.CreateVoteResponse{}, nil

     

       45
       45
       +
       }

     

       46
       46
       +
       

     

       47
       47
       +
       func (m *mockVoteService) DeleteVote(_ context.Context, _ *oauthlib.ClientSessionData, _ votes.DeleteVoteRequest) error {

     

       48
       48
       +
       	return nil

     

       49
       49
       +
       }

     

       50
       50
       +
       

     

       51
       51
       +
       func (m *mockVoteService) EnsureCachePopulated(_ context.Context, _ *oauthlib.ClientSessionData) error {

     

       52
       52
       +
       	return nil // Mock always succeeds - votes pre-populated via AddVote

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       func (m *mockVoteService) GetViewerVote(userDID, subjectURI string) *votes.CachedVote {

     

       56
       56
       +
       	key := userDID + ":" + subjectURI

     

       57
       57
       +
       	return m.cachedVotes[key]

     

       58
       58
       +
       }

     

       59
       59
       +
       

     

       60
       60
       +
       func (m *mockVoteService) GetViewerVotesForSubjects(userDID string, subjectURIs []string) map[string]*votes.CachedVote {

     

       61
       61
       +
       	result := make(map[string]*votes.CachedVote)

     

       62
       62
       +
       	for _, uri := range subjectURIs {

     

       63
       63
       +
       		key := userDID + ":" + uri

     

       64
       64
       +
       		if vote, exists := m.cachedVotes[key]; exists {

     

       65
       65
       +
       			result[uri] = vote

     

       66
       66
       +
       		}

     

       67
       67
       +
       	}

     

       68
       68
       +
       	return result

     

       69
       69
       +
       }

     

       70
       70
       +
       

     

       20
       71
        
       // TestGetDiscover_ShowsAllCommunities tests discover feed shows posts from ALL communities

     

       21
       72
        
       func TestGetDiscover_ShowsAllCommunities(t *testing.T) {

     

       22
       73
        
       	if testing.Short() {

     
···

       29
       80
        
       	// Setup services

     

       30
       81
        
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       31
       82
        
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       32
       32
       -
       	handler := discover.NewGetDiscoverHandler(discoverService)

     

       83
       83
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, nil) // nil vote service - tests don't need vote state

     

       33
       84
        
       

     

       34
       85
        
       	ctx := context.Background()

     

       35
       86
        
       	testID := time.Now().UnixNano()

     
···

       100
       151
        
       	// Setup services

     

       101
       152
        
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       102
       153
        
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       103
       103
       -
       	handler := discover.NewGetDiscoverHandler(discoverService)

     

       154
       154
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, nil) // nil vote service - tests don't need vote state

     

       104
       155
        
       

     

       105
       156
        
       	ctx := context.Background()

     

       106
       157
        
       	testID := time.Now().UnixNano()

     
···

       147
       198
        
       	// Setup services

     

       148
       199
        
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       149
       200
        
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       150
       150
       -
       	handler := discover.NewGetDiscoverHandler(discoverService)

     

       201
       201
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, nil)

     

       151
       202
        
       

     

       152
       203
        
       	ctx := context.Background()

     

       153
       204
        
       	testID := time.Now().UnixNano()

     
···

       197
       248
        
       	// Setup services

     

       198
       249
        
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       199
       250
        
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       200
       200
       -
       	handler := discover.NewGetDiscoverHandler(discoverService)

     

       251
       251
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, nil)

     

       201
       252
        
       

     

       202
       253
        
       	ctx := context.Background()

     

       203
       254
        
       	testID := time.Now().UnixNano()

     
···

       254
       305
        
       	// Setup services

     

       255
       306
        
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       256
       307
        
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       257
       257
       -
       	handler := discover.NewGetDiscoverHandler(discoverService)

     

       308
       308
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, nil)

     

       258
       309
        
       

     

       259
       310
        
       	t.Run("Limit exceeds maximum", func(t *testing.T) {

     

       260
       311
        
       		req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.feed.getDiscover?sort=new&limit=100", nil)

     
···

       271
       322
        
       		assert.Contains(t, errorResp["message"], "limit")

     

       272
       323
        
       	})

     

       273
       324
        
       }

     

       325
       325
       +
       

     

       326
       326
       +
       // TestGetDiscover_ViewerVoteState tests that authenticated users see their vote state on posts

     

       327
       327
       +
       func TestGetDiscover_ViewerVoteState(t *testing.T) {

     

       328
       328
       +
       	if testing.Short() {

     

       329
       329
       +
       		t.Skip("Skipping integration test in short mode")

     

       330
       330
       +
       	}

     

       331
       331
       +
       

     

       332
       332
       +
       	db := setupTestDB(t)

     

       333
       333
       +
       	t.Cleanup(func() { _ = db.Close() })

     

       334
       334
       +
       

     

       335
       335
       +
       	ctx := context.Background()

     

       336
       336
       +
       	testID := time.Now().UnixNano()

     

       337
       337
       +
       

     

       338
       338
       +
       	// Create community and posts

     

       339
       339
       +
       	communityDID, err := createFeedTestCommunity(db, ctx, fmt.Sprintf("votes-%d", testID), fmt.Sprintf("alice-%d.test", testID))

     

       340
       340
       +
       	require.NoError(t, err)

     

       341
       341
       +
       

     

       342
       342
       +
       	post1URI := createTestPost(t, db, communityDID, "did:plc:author1", "Post with upvote", 10, time.Now().Add(-1*time.Hour))

     

       343
       343
       +
       	post2URI := createTestPost(t, db, communityDID, "did:plc:author2", "Post with downvote", 5, time.Now().Add(-2*time.Hour))

     

       344
       344
       +
       	_ = createTestPost(t, db, communityDID, "did:plc:author3", "Post without vote", 3, time.Now().Add(-3*time.Hour))

     

       345
       345
       +
       

     

       346
       346
       +
       	// Setup mock vote service with pre-populated votes

     

       347
       347
       +
       	viewerDID := "did:plc:viewer123"

     

       348
       348
       +
       	mockVotes := newMockVoteService()

     

       349
       349
       +
       	mockVotes.AddVote(viewerDID, post1URI, "up", "at://"+viewerDID+"/social.coves.vote/vote1")

     

       350
       350
       +
       	mockVotes.AddVote(viewerDID, post2URI, "down", "at://"+viewerDID+"/social.coves.vote/vote2")

     

       351
       351
       +
       

     

       352
       352
       +
       	// Setup handler with mock vote service

     

       353
       353
       +
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       354
       354
       +
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       355
       355
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, mockVotes)

     

       356
       356
       +
       

     

       357
       357
       +
       	// Create request with authenticated user context

     

       358
       358
       +
       	req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.feed.getDiscover?sort=new&limit=50", nil)

     

       359
       359
       +
       

     

       360
       360
       +
       	// Inject OAuth session into context (simulates OptionalAuth middleware)

     

       361
       361
       +
       	did, _ := syntax.ParseDID(viewerDID)

     

       362
       362
       +
       	session := &oauthlib.ClientSessionData{

     

       363
       363
       +
       		AccountDID:  did,

     

       364
       364
       +
       		AccessToken: "test_token",

     

       365
       365
       +
       	}

     

       366
       366
       +
       	reqCtx := context.WithValue(req.Context(), middleware.UserDIDKey, viewerDID)

     

       367
       367
       +
       	reqCtx = context.WithValue(reqCtx, middleware.OAuthSessionKey, session)

     

       368
       368
       +
       	req = req.WithContext(reqCtx)

     

       369
       369
       +
       

     

       370
       370
       +
       	rec := httptest.NewRecorder()

     

       371
       371
       +
       	handler.HandleGetDiscover(rec, req)

     

       372
       372
       +
       

     

       373
       373
       +
       	// Assertions

     

       374
       374
       +
       	assert.Equal(t, http.StatusOK, rec.Code)

     

       375
       375
       +
       

     

       376
       376
       +
       	var response discoverCore.DiscoverResponse

     

       377
       377
       +
       	err = json.Unmarshal(rec.Body.Bytes(), &response)

     

       378
       378
       +
       	require.NoError(t, err)

     

       379
       379
       +
       

     

       380
       380
       +
       	// Find our test posts and verify vote state

     

       381
       381
       +
       	var foundPost1, foundPost2, foundPost3 bool

     

       382
       382
       +
       	for _, feedPost := range response.Feed {

     

       383
       383
       +
       		switch feedPost.Post.URI {

     

       384
       384
       +
       		case post1URI:

     

       385
       385
       +
       			foundPost1 = true

     

       386
       386
       +
       			require.NotNil(t, feedPost.Post.Viewer, "Post1 should have viewer state")

     

       387
       387
       +
       			require.NotNil(t, feedPost.Post.Viewer.Vote, "Post1 should have vote direction")

     

       388
       388
       +
       			assert.Equal(t, "up", *feedPost.Post.Viewer.Vote, "Post1 should show upvote")

     

       389
       389
       +
       			require.NotNil(t, feedPost.Post.Viewer.VoteURI, "Post1 should have vote URI")

     

       390
       390
       +
       			assert.Contains(t, *feedPost.Post.Viewer.VoteURI, "vote1", "Post1 should have correct vote URI")

     

       391
       391
       +
       

     

       392
       392
       +
       		case post2URI:

     

       393
       393
       +
       			foundPost2 = true

     

       394
       394
       +
       			require.NotNil(t, feedPost.Post.Viewer, "Post2 should have viewer state")

     

       395
       395
       +
       			require.NotNil(t, feedPost.Post.Viewer.Vote, "Post2 should have vote direction")

     

       396
       396
       +
       			assert.Equal(t, "down", *feedPost.Post.Viewer.Vote, "Post2 should show downvote")

     

       397
       397
       +
       			require.NotNil(t, feedPost.Post.Viewer.VoteURI, "Post2 should have vote URI")

     

       398
       398
       +
       

     

       399
       399
       +
       		default:

     

       400
       400
       +
       			// Posts without votes should have nil Viewer or nil Vote

     

       401
       401
       +
       			if feedPost.Post.Viewer != nil && feedPost.Post.Viewer.Vote != nil {

     

       402
       402
       +
       				// This post has a vote from our viewer - it's not post3

     

       403
       403
       +
       				continue

     

       404
       404
       +
       			}

     

       405
       405
       +
       			foundPost3 = true

     

       406
       406
       +
       		}

     

       407
       407
       +
       	}

     

       408
       408
       +
       

     

       409
       409
       +
       	assert.True(t, foundPost1, "Should find post1 with upvote")

     

       410
       410
       +
       	assert.True(t, foundPost2, "Should find post2 with downvote")

     

       411
       411
       +
       	assert.True(t, foundPost3, "Should find post3 without vote")

     

       412
       412
       +
       }

     

       413
       413
       +
       

     

       414
       414
       +
       // TestGetDiscover_NoViewerStateWithoutAuth tests that unauthenticated users don't get viewer state

     

       415
       415
       +
       func TestGetDiscover_NoViewerStateWithoutAuth(t *testing.T) {

     

       416
       416
       +
       	if testing.Short() {

     

       417
       417
       +
       		t.Skip("Skipping integration test in short mode")

     

       418
       418
       +
       	}

     

       419
       419
       +
       

     

       420
       420
       +
       	db := setupTestDB(t)

     

       421
       421
       +
       	t.Cleanup(func() { _ = db.Close() })

     

       422
       422
       +
       

     

       423
       423
       +
       	ctx := context.Background()

     

       424
       424
       +
       	testID := time.Now().UnixNano()

     

       425
       425
       +
       

     

       426
       426
       +
       	// Create community and post

     

       427
       427
       +
       	communityDID, err := createFeedTestCommunity(db, ctx, fmt.Sprintf("noauth-%d", testID), fmt.Sprintf("alice-%d.test", testID))

     

       428
       428
       +
       	require.NoError(t, err)

     

       429
       429
       +
       

     

       430
       430
       +
       	postURI := createTestPost(t, db, communityDID, "did:plc:author", "Some post", 10, time.Now())

     

       431
       431
       +
       

     

       432
       432
       +
       	// Setup mock vote service with a vote (but request will be unauthenticated)

     

       433
       433
       +
       	mockVotes := newMockVoteService()

     

       434
       434
       +
       	mockVotes.AddVote("did:plc:someuser", postURI, "up", "at://did:plc:someuser/social.coves.vote/vote1")

     

       435
       435
       +
       

     

       436
       436
       +
       	// Setup handler with mock vote service

     

       437
       437
       +
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       438
       438
       +
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       439
       439
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, mockVotes)

     

       440
       440
       +
       

     

       441
       441
       +
       	// Create request WITHOUT auth context

     

       442
       442
       +
       	req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.feed.getDiscover?sort=new&limit=50", nil)

     

       443
       443
       +
       	rec := httptest.NewRecorder()

     

       444
       444
       +
       	handler.HandleGetDiscover(rec, req)

     

       445
       445
       +
       

     

       446
       446
       +
       	// Should succeed

     

       447
       447
       +
       	assert.Equal(t, http.StatusOK, rec.Code)

     

       448
       448
       +
       

     

       449
       449
       +
       	var response discoverCore.DiscoverResponse

     

       450
       450
       +
       	err = json.Unmarshal(rec.Body.Bytes(), &response)

     

       451
       451
       +
       	require.NoError(t, err)

     

       452
       452
       +
       

     

       453
       453
       +
       	// Find our post and verify NO viewer state (unauthenticated)

     

       454
       454
       +
       	for _, feedPost := range response.Feed {

     

       455
       455
       +
       		if feedPost.Post.URI == postURI {

     

       456
       456
       +
       			assert.Nil(t, feedPost.Post.Viewer, "Unauthenticated request should not have viewer state")

     

       457
       457
       +
       			return

     

       458
       458
       +
       		}

     

       459
       459
       +
       	}

     

       460
       460
       +
       	t.Fatal("Test post not found in response")

     

       461
       461
       +
       }

+11 -11

tests/integration/feed_test.go

···

       37
       37
        
       		nil,

     

       38
       38
        
       	)

     

       39
       39
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       40
       40
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       40
       40
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       41
       41
        
       

     

       42
       42
        
       	// Setup test data: community, users, and posts

     

       43
       43
        
       	ctx := context.Background()

     
···

       114
       114
        
       		nil,

     

       115
       115
        
       	)

     

       116
       116
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       117
       117
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       117
       117
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       118
       118
        
       

     

       119
       119
        
       	// Setup test data

     

       120
       120
        
       	ctx := context.Background()

     
···

       190
       190
        
       		nil,

     

       191
       191
        
       	)

     

       192
       192
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       193
       193
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       193
       193
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       194
       194
        
       

     

       195
       195
        
       	// Setup test data

     

       196
       196
        
       	ctx := context.Background()

     
···

       246
       246
        
       		nil,

     

       247
       247
        
       	)

     

       248
       248
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       249
       249
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       249
       249
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       250
       250
        
       

     

       251
       251
        
       	// Setup test data with many posts

     

       252
       252
        
       	ctx := context.Background()

     
···

       337
       337
        
       		nil,

     

       338
       338
        
       	)

     

       339
       339
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       340
       340
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       340
       340
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       341
       341
        
       

     

       342
       342
        
       	// Request feed for non-existent community

     

       343
       343
        
       	req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.communityFeed.getCommunity?community=did:plc:nonexistent&sort=hot&limit=10", nil)

     
···

       373
       373
        
       		nil,

     

       374
       374
        
       	)

     

       375
       375
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       376
       376
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       376
       376
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       377
       377
        
       

     

       378
       378
        
       	// Setup test community

     

       379
       379
        
       	ctx := context.Background()

     
···

       429
       429
        
       		nil,

     

       430
       430
        
       	)

     

       431
       431
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       432
       432
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       432
       432
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       433
       433
        
       

     

       434
       434
        
       	// Create community with no posts

     

       435
       435
        
       	ctx := context.Background()

     
···

       473
       473
        
       		nil,

     

       474
       474
        
       	)

     

       475
       475
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       476
       476
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       476
       476
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       477
       477
        
       

     

       478
       478
        
       	// Setup test community

     

       479
       479
        
       	ctx := context.Background()

     
···

       526
       526
        
       		nil,

     

       527
       527
        
       	)

     

       528
       528
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       529
       529
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       529
       529
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       530
       530
        
       

     

       531
       531
        
       	// Setup test data

     

       532
       532
        
       	ctx := context.Background()

     
···

       627
       627
        
       		nil,

     

       628
       628
        
       	)

     

       629
       629
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       630
       630
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       630
       630
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       631
       631
        
       

     

       632
       632
        
       	// Setup test data

     

       633
       633
        
       	ctx := context.Background()

     
···

       720
       720
        
       		nil,

     

       721
       721
        
       	)

     

       722
       722
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       723
       723
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       723
       723
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       724
       724
        
       

     

       725
       725
        
       	// Setup test data

     

       726
       726
        
       	ctx := context.Background()

+7 -7

tests/integration/timeline_test.go

···

       30
       30
        
       	// Setup services

     

       31
       31
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       32
       32
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       33
       33
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       33
       33
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       34
       34
        
       

     

       35
       35
        
       	ctx := context.Background()

     

       36
       36
        
       	testID := time.Now().UnixNano()

     
···

       119
       119
        
       	// Setup services

     

       120
       120
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       121
       121
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       122
       122
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       122
       122
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       123
       123
        
       

     

       124
       124
        
       	ctx := context.Background()

     

       125
       125
        
       	testID := time.Now().UnixNano()

     
···

       190
       190
        
       	// Setup services

     

       191
       191
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       192
       192
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       193
       193
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       193
       193
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       194
       194
        
       

     

       195
       195
        
       	ctx := context.Background()

     

       196
       196
        
       	testID := time.Now().UnixNano()

     
···

       266
       266
        
       	// Setup services

     

       267
       267
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       268
       268
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       269
       269
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       269
       269
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       270
       270
        
       

     

       271
       271
        
       	ctx := context.Background()

     

       272
       272
        
       	testID := time.Now().UnixNano()

     
···

       308
       308
        
       	// Setup services

     

       309
       309
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       310
       310
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       311
       311
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       311
       311
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       312
       312
        
       

     

       313
       313
        
       	// Request timeline WITHOUT auth context

     

       314
       314
        
       	req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.feed.getTimeline?sort=new&limit=10", nil)

     
···

       337
       337
        
       	// Setup services

     

       338
       338
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       339
       339
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       340
       340
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       340
       340
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       341
       341
        
       

     

       342
       342
        
       	ctx := context.Background()

     

       343
       343
        
       	testID := time.Now().UnixNano()

     
···

       388
       388
        
       	// Setup services

     

       389
       389
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       390
       390
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       391
       391
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       391
       391
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       392
       392
        
       

     

       393
       393
        
       	ctx := context.Background()

     

       394
       394
        
       	testID := time.Now().UnixNano()

+1 -1

tests/integration/user_journey_e2e_test.go

···

       143
       143
        
       	r := chi.NewRouter()

     

       144
       144
        
       	routes.RegisterCommunityRoutes(r, communityService, e2eAuth.OAuthAuthMiddleware, nil) // nil = allow all community creators

     

       145
       145
        
       	routes.RegisterPostRoutes(r, postService, e2eAuth.OAuthAuthMiddleware)

     

       146
       146
       -
       	routes.RegisterTimelineRoutes(r, timelineService, e2eAuth.OAuthAuthMiddleware)

     

       146
       146
       +
       	routes.RegisterTimelineRoutes(r, timelineService, nil, e2eAuth.OAuthAuthMiddleware)

     

       147
       147
        
       	httpServer := httptest.NewServer(r)

     

       148
       148
        
       	defer httpServer.Close()

     

       149
       149

Compare changes