commit 03bdc8b109275be2f16d0f555798b6b4f549f400 · gmstn.systems/shard

+9 -3

src/lib/types/atproto.ts

···

       51
       51
        
           id: z.string(),

     

       52
       52
        
           type: z.string(),

     

       53
       53
        
           controller: z.string(),

     

       54
       54
       -
           publicKeyMultibase: z.string(),

     

       54
       54
       +
           publicKeyMultibase: z.optional(z.string()),

     

       55
       55
        
       });

     

       56
       56
        
       export type VerificationMethod = z.infer<typeof verificationMethodSchema>;

     

       57
       57
        
       

     
···

       64
       64
        
               z.array(

     

       65
       65
        
                   z.object({

     

       66
       66
        
                       id: z.string(),

     

       67
       67
       -
                       type: z.string(),

     

       68
       68
       -
                       serviceEndpoint: z.string(),

     

       67
       67
       +
                       type: z.union([z.string(), z.array(z.string())]),

     

       68
       68
       +
                       serviceEndpoint: z.union([

     

       69
       69
       +
                           z.string(),

     

       70
       70
       +
                           z.record(z.string(), z.string()),

     

       71
       71
       +
                           z.array(

     

       72
       72
       +
                               z.union([z.string(), z.record(z.string(), z.string())]),

     

       73
       73
       +
                           ),

     

       74
       74
       +
                       ]),

     

       69
       75
        
                   }),

     

       70
       76
        
               ),

     

       71
       77
        
           ),

+8 -7

src/lib/types/constellation.ts

···

       1
       1
        
       import { z } from "zod";

     

       2
       2
        
       

     

       3
       3
       +
       export const constellationBacklinkSchema = z.object({

     

       4
       4
       +
           did: z.string(),

     

       5
       5
       +
           collection: z.string(),

     

       6
       6
       +
           rkey: z.string(),

     

       7
       7
       +
       });

     

       8
       8
       +
       export type ConstellationBacklink = z.infer<typeof constellationBacklinkSchema>;

     

       9
       9
       +
       

     

       3
       10
        
       export const constellationBacklinkResponseSchema = z.object({

     

       4
       11
        
           total: z.number(),

     

       5
       5
       -
           records: z.array(

     

       6
       6
       -
               z.object({

     

       7
       7
       -
                   did: z.string(),

     

       8
       8
       -
                   collection: z.string(),

     

       9
       9
       -
                   rkey: z.string(),

     

       10
       10
       -
               }),

     

       11
       11
       -
           ),

     

       12
       12
       +
           records: z.array(constellationBacklinkSchema),

     

       12
       13
        
           cursor: z.optional(z.string()),

     

       13
       14
        
       });

     

       14
       15
        
       export type ConstellationBacklinkResponse = z.infer<

+14

src/lib/types/lexicon/com.atproto.repo.getRecord.ts

···

       1
       1
       +
       import { z } from "zod";

     

       2
       2
       +
       

     

       3
       3
       +
       export const comAtprotoRepoGetRecordResponseSchema = z.object({

     

       4
       4
       +
           uri: z.string(),

     

       5
       5
       +
           cid: z.optional(z.string()),

     

       6
       6
       +
           value: z

     

       7
       7
       +
               .object({

     

       8
       8
       +
                   $type: z.string(),

     

       9
       9
       +
               })

     

       10
       10
       +
               .catchall(z.unknown()),

     

       11
       11
       +
       });

     

       12
       12
       +
       export type ComAtprotoRepoGetRecordResponse = z.infer<

     

       13
       13
       +
           typeof comAtprotoRepoGetRecordResponseSchema

     

       14
       14
       +
       >;

+115

src/lib/utils/atproto.ts

···

       1
       1
       +
       import {

     

       2
       2
       +
           atprotoHandleSchema,

     

       3
       3
       +
           type AtprotoHandle,

     

       4
       4
       +
           type AtUri,

     

       5
       5
       +
           type Did,

     

       6
       6
       +
           type DidDocument,

     

       7
       7
       +
       } from "@/lib/types/atproto";

     

       8
       8
       +
       import { comAtprotoRepoGetRecordResponseSchema } from "@/lib/types/lexicon/com.atproto.repo.getRecord";

     

       9
       9
       +
       import type { Result } from "@/lib/utils/result";

     

       10
       10
       +
       import type { DidDocumentResolver } from "@atcute/identity-resolver";

     

       11
       11
       +
       import {

     

       12
       12
       +
           CompositeDidDocumentResolver,

     

       13
       13
       +
           CompositeHandleResolver,

     

       14
       14
       +
           DohJsonHandleResolver,

     

       15
       15
       +
           PlcDidDocumentResolver,

     

       16
       16
       +
           WebDidDocumentResolver,

     

       17
       17
       +
           WellKnownHandleResolver,

     

       18
       18
       +
       } from "@atcute/identity-resolver";

     

       19
       19
       +
       

     

       20
       20
       +
       export const resolveRecordFromAtUri = async ({

     

       21
       21
       +
           authority,

     

       22
       22
       +
           collection,

     

       23
       23
       +
           rKey,

     

       24
       24
       +
       }: Required<AtUri>): Promise<Result<unknown, unknown>> => {

     

       25
       25
       +
           const didDocResult = await resolveDidDoc(authority);

     

       26
       26
       +
           if (!didDocResult.ok) return { ok: false, error: didDocResult.error };

     

       27
       27
       +
       

     

       28
       28
       +
           const { service: services } = didDocResult.data;

     

       29
       29
       +
           if (!services)

     

       30
       30
       +
               return {

     

       31
       31
       +
                   ok: false,

     

       32
       32
       +
                   error: { message: "Resolved DID document has no service field." },

     

       33
       33
       +
               };

     

       34
       34
       +
       

     

       35
       35
       +
           const pdsService = services.find(

     

       36
       36
       +
               (service) =>

     

       37
       37
       +
                   service.id === "#atproto_pds" &&

     

       38
       38
       +
                   service.type === "AtprotoPersonalDataServer",

     

       39
       39
       +
           );

     

       40
       40
       +
           if (!pdsService)

     

       41
       41
       +
               return {

     

       42
       42
       +
                   ok: false,

     

       43
       43
       +
                   error: {

     

       44
       44
       +
                       message:

     

       45
       45
       +
                           "Resolved DID document has no PDS service listed in the document.",

     

       46
       46
       +
                   },

     

       47
       47
       +
               };

     

       48
       48
       +
       

     

       49
       49
       +
           const pdsEndpointRecord = pdsService.serviceEndpoint;

     

       50
       50
       +
           let pdsEndpointUrl;

     

       51
       51
       +
           try {

     

       52
       52
       +
               // @ts-expect-error yes, we are coercing something that is explicitly not a string into a string, but in this case we want to be specific. only serviceEndpoints with valid atproto pds URLs should be allowed.

     

       53
       53
       +
               pdsEndpointUrl = new URL(pdsEndpointRecord);

     

       54
       54
       +
           } catch (err) {

     

       55
       55
       +
               return { ok: false, error: err };

     

       56
       56
       +
           }

     

       57
       57
       +
       

     

       58
       58
       +
           const req = new Request(

     

       59
       59
       +
               `${pdsEndpointUrl}/xrpc/com.atproto.repo.getRecord?did=${didDocResult.data.id}&collection=${collection}&rkey=${rKey}`,

     

       60
       60
       +
           );

     

       61
       61
       +
           const res = await fetch(req);

     

       62
       62
       +
           const data: unknown = await res.json();

     

       63
       63
       +
       

     

       64
       64
       +
           const {

     

       65
       65
       +
               success: responseParseSuccess,

     

       66
       66
       +
               error: responseParseError,

     

       67
       67
       +
               data: record,

     

       68
       68
       +
           } = comAtprotoRepoGetRecordResponseSchema.safeParse(data);

     

       69
       69
       +
           if (!responseParseSuccess) {

     

       70
       70
       +
               return { ok: false, error: responseParseError };

     

       71
       71
       +
           }

     

       72
       72
       +
       

     

       73
       73
       +
           return { ok: true, data: record.value };

     

       74
       74
       +
       };

     

       75
       75
       +
       

     

       76
       76
       +
       export const didDocResolver: DidDocumentResolver =

     

       77
       77
       +
           new CompositeDidDocumentResolver({

     

       78
       78
       +
               methods: {

     

       79
       79
       +
                   plc: new PlcDidDocumentResolver(),

     

       80
       80
       +
                   web: new WebDidDocumentResolver(),

     

       81
       81
       +
               },

     

       82
       82
       +
           });

     

       83
       83
       +
       

     

       84
       84
       +
       export const handleResolver = new CompositeHandleResolver({

     

       85
       85
       +
           strategy: "dns-first",

     

       86
       86
       +
           methods: {

     

       87
       87
       +
               dns: new DohJsonHandleResolver({

     

       88
       88
       +
                   dohUrl: "https://mozilla.cloudflare-dns.com/dns-query",

     

       89
       89
       +
               }),

     

       90
       90
       +
               http: new WellKnownHandleResolver(),

     

       91
       91
       +
           },

     

       92
       92
       +
       });

     

       93
       93
       +
       

     

       94
       94
       +
       export const resolveDidDoc = async (

     

       95
       95
       +
           authority: Did | AtprotoHandle,

     

       96
       96
       +
       ): Promise<Result<DidDocument, unknown>> => {

     

       97
       97
       +
           const { data: handle } = atprotoHandleSchema.safeParse(authority);

     

       98
       98
       +
           let did: Did;

     

       99
       99
       +
           if (handle) {

     

       100
       100
       +
               try {

     

       101
       101
       +
                   did = await handleResolver.resolve(handle);

     

       102
       102
       +
               } catch (err) {

     

       103
       103
       +
                   return { ok: false, error: err };

     

       104
       104
       +
               }

     

       105
       105
       +
           } else {

     

       106
       106
       +
               // @ts-expect-error if handle is undefined, then we know that authority must be a valid did:web or did:plc

     

       107
       107
       +
               did = authority;

     

       108
       108
       +
           }

     

       109
       109
       +
           try {

     

       110
       110
       +
               const doc: DidDocument = await didDocResolver.resolve(did);

     

       111
       111
       +
               return { ok: true, data: doc };

     

       112
       112
       +
           } catch (err) {

     

       113
       113
       +
               return { ok: false, error: err };

     

       114
       114
       +
           }

     

       115
       115
       +
       };

+1 -13

src/lib/utils/verifyJwt.ts

···

       1
       1
        
       import { SERVICE_DID } from "@/lib/env";

     

       2
       2
       -
       import {

     

       3
       3
       -
           CompositeDidDocumentResolver,

     

       4
       4
       -
           PlcDidDocumentResolver,

     

       5
       5
       -
           WebDidDocumentResolver,

     

       6
       6
       -
           type DidDocumentResolver,

     

       7
       7
       -
       } from "@atcute/identity-resolver";

     

       2
       2
       +
       import { didDocResolver } from "@/lib/utils/atproto";

     

       8
       3
        
       import { ServiceJwtVerifier } from "@atcute/xrpc-server/auth";

     

       9
       9
       -
       

     

       10
       10
       -
       const didDocResolver: DidDocumentResolver = new CompositeDidDocumentResolver({

     

       11
       11
       -
           methods: {

     

       12
       12
       -
               plc: new PlcDidDocumentResolver(),

     

       13
       13
       -
               web: new WebDidDocumentResolver(),

     

       14
       14
       -
           },

     

       15
       15
       -
       });

     

       16
       4
        
       

     

       17
       5
        
       export const verifyServiceJwt = async (jwt: string) => {

     

       18
       6
        
           const verifier = new ServiceJwtVerifier({