commit dc8ae9d93fc32f61d3fe36b470dbcf7bbe68b129 · edouard.paris/did-method-plc

+1 -3

packages/lib/src/data.ts

···

       70
       70
        
         )

     

       71
       71
        
       

     

       72
       72
        
         const indexOfSigner = lastOpNormalized.rotationKeys.indexOf(disputedSigner)

     

       73
       73
       -
         const morePowerfulKeys = lastOpNormalized.rotationKeys.slice(

     

       74
       74
       -
           indexOfSigner + 1,

     

       75
       75
       -
         )

     

       73
       73
       +
         const morePowerfulKeys = lastOpNormalized.rotationKeys.slice(0, indexOfSigner)

     

       76
       74
        
       

     

       77
       75
        
         await assureValidSig(morePowerfulKeys, proposed)

     

       78
       76

+47 -32

packages/lib/tests/data.test.ts

···

       1
       1
        
       import { check, cidForCbor } from '@atproto/common'

     

       2
       2
       +
       import { EcdsaKeypair, Keypair, Secp256k1Keypair } from '@atproto/crypto'

     

       2
       3
        
       import {

     

       3
       3
       -
         EcdsaKeypair,

     

       4
       4
       -
         Keypair,

     

       5
       5
       -
         parseDidKey,

     

       6
       6
       -
         Secp256k1Keypair,

     

       7
       7
       -
       } from '@atproto/crypto'

     

       8
       8
       -
       import * as uint8arrays from 'uint8arrays'

     

       9
       9
       -
       import { InvalidSignatureError } from '../src'

     

       4
       4
       +
         GenesisHashError,

     

       5
       5
       +
         ImproperOperationError,

     

       6
       6
       +
         InvalidSignatureError,

     

       7
       7
       +
         MisorderedOperationError,

     

       8
       8
       +
       } from '../src'

     

       10
       9
        
       import * as data from '../src/data'

     

       11
       11
       -
       import * as document from '../src/document'

     

       12
       10
        
       import * as operations from '../src/operations'

     

       13
       11
        
       import * as t from '../src/types'

     

       14
       12
        
       

     
···

       22
       20
        
         let handle = 'alice.example.com'

     

       23
       21
        
         let atpPds = 'https://example.com'

     

       24
       22
        
       

     

       25
       25
       -
         let oldSigningKey: Secp256k1Keypair

     

       26
       23
        
         let oldRotationKey1: Secp256k1Keypair

     

       27
       24
        
       

     

       28
       25
        
         beforeAll(async () => {

     
···

       125
       122
        
           )

     

       126
       123
        
           ops.push(op)

     

       127
       124
        
       

     

       128
       128
       -
           oldSigningKey = signingKey

     

       129
       125
        
           signingKey = newSigningKey

     

       130
       126
        
       

     

       131
       127
        
           const doc = await data.validateOperationLog(did, ops)

     
···

       189
       185
        
             },

     

       190
       186
        
             rotationKey2,

     

       191
       187
        
           )

     

       188
       188
       +
           ops.push(op)

     

       189
       189
       +
           handle = newHandle

     

       192
       190
        
           const doc = await data.validateOperationLog(did, ops)

     

       193
       191
        
           expect(doc.did).toEqual(did)

     

       194
       192
        
           expect(doc.signingKey).toEqual(signingKey.did())

     
···

       197
       195
        
           expect(doc.services).toEqual({ atpPds })

     

       198
       196
        
         })

     

       199
       197
        
       

     

       200
       200
       -
         // it('requires operations to be in order', async () => {

     

       201
       201
       -
         //   const prev = await cidForCbor(ops[ops.length - 2])

     

       202
       202
       -
         //   const op = await operations.updateAtpPds(

     

       203
       203
       -
         //     'foobar.com',

     

       204
       204
       -
         //     prev.toString(),

     

       205
       205
       -
         //     signingKey,

     

       206
       206
       -
         //   )

     

       207
       207
       -
         //   expect(document.validateOperationLog(did, [...ops, op])).rejects.toThrow()

     

       208
       208
       -
         // })

     

       198
       198
       +
         it('requires operations to be in order', async () => {

     

       199
       199
       +
           const prev = await cidForCbor(ops[ops.length - 2])

     

       200
       200
       +
           const op = await makeNextOp(

     

       201
       201
       +
             {

     

       202
       202
       +
               handles: ['bob.test'],

     

       203
       203
       +
               prev: prev.toString(),

     

       204
       204
       +
             },

     

       205
       205
       +
             rotationKey1,

     

       206
       206
       +
           )

     

       207
       207
       +
           expect(data.validateOperationLog(did, [...ops, op])).rejects.toThrow(

     

       208
       208
       +
             MisorderedOperationError,

     

       209
       209
       +
           )

     

       210
       210
       +
         })

     

       211
       211
       +
       

     

       212
       212
       +
         it('does not allow a create operation in the middle of the log', async () => {

     

       213
       213
       +
           const op = await makeNextOp(

     

       214
       214
       +
             {

     

       215
       215
       +
               handles: ['bob.test'],

     

       216
       216
       +
               prev: null,

     

       217
       217
       +
             },

     

       218
       218
       +
             rotationKey1,

     

       219
       219
       +
           )

     

       220
       220
       +
           expect(data.validateOperationLog(did, [...ops, op])).rejects.toThrow(

     

       221
       221
       +
             MisorderedOperationError,

     

       222
       222
       +
           )

     

       223
       223
       +
         })

     

       209
       224
        
       

     

       210
       210
       -
         // it('does not allow a create operation in the middle of the log', async () => {

     

       211
       211
       -
         //   const op = await operations.create(

     

       212
       212
       -
         //     signingKey,

     

       213
       213
       -
         //     recoveryKey.did(),

     

       214
       214
       -
         //     handle,

     

       215
       215
       -
         //     atpPds,

     

       216
       216
       -
         //   )

     

       217
       217
       -
         //   expect(document.validateOperationLog(did, [...ops, op])).rejects.toThrow()

     

       218
       218
       -
         // })

     

       225
       225
       +
         it('requires that the did is the hash of the genesis op', async () => {

     

       226
       226
       +
           const rest = ops.slice(1)

     

       227
       227
       +
           expect(data.validateOperationLog(did, rest)).rejects.toThrow(

     

       228
       228
       +
             GenesisHashError,

     

       229
       229
       +
           )

     

       230
       230
       +
         })

     

       219
       231
        
       

     

       220
       220
       -
         // it('requires that the log start with a create operation', async () => {

     

       221
       221
       -
         //   const rest = ops.slice(1)

     

       222
       222
       -
         //   expect(document.validateOperationLog(did, rest)).rejects.toThrow()

     

       223
       223
       -
         // })

     

       232
       232
       +
         it('requires that the log starts with a create op (no prev)', async () => {

     

       233
       233
       +
           const rest = ops.slice(1)

     

       234
       234
       +
           const expectedDid = await operations.didForCreateOp(rest[0])

     

       235
       235
       +
           expect(data.validateOperationLog(expectedDid, rest)).rejects.toThrow(

     

       236
       236
       +
             ImproperOperationError,

     

       237
       237
       +
           )

     

       238
       238
       +
         })

     

       224
       239
        
       })

+123

packages/lib/tests/recovery.test.ts

···

       1
       1
       +
       import { check, cidForCbor, DAY, HOUR } from '@atproto/common'

     

       2
       2
       +
       import { EcdsaKeypair, Keypair, Secp256k1Keypair } from '@atproto/crypto'

     

       3
       3
       +
       import { create } from 'domain'

     

       4
       4
       +
       import { CID } from 'multiformats/cid'

     

       5
       5
       +
       import {

     

       6
       6
       +
         GenesisHashError,

     

       7
       7
       +
         ImproperOperationError,

     

       8
       8
       +
         InvalidSignatureError,

     

       9
       9
       +
         MisorderedOperationError,

     

       10
       10
       +
       } from '../src'

     

       11
       11
       +
       import * as data from '../src/data'

     

       12
       12
       +
       import * as operations from '../src/operations'

     

       13
       13
       +
       import * as t from '../src/types'

     

       14
       14
       +
       

     

       15
       15
       +
       describe('plc recovery', () => {

     

       16
       16
       +
         let signingKey: Secp256k1Keypair

     

       17
       17
       +
         let rotationKey1: Secp256k1Keypair

     

       18
       18
       +
         let rotationKey2: EcdsaKeypair

     

       19
       19
       +
         let rotationKey3: EcdsaKeypair

     

       20
       20
       +
         let did: string

     

       21
       21
       +
         let handle = 'alice.example.com'

     

       22
       22
       +
         let atpPds = 'https://example.com'

     

       23
       23
       +
       

     

       24
       24
       +
         let log: t.IndexedOperation[] = []

     

       25
       25
       +
       

     

       26
       26
       +
         let createCid: CID

     

       27
       27
       +
         const key3AttackCids: CID[] = []

     

       28
       28
       +
         const key2AttackCid: CID[] = []

     

       29
       29
       +
       

     

       30
       30
       +
         beforeAll(async () => {

     

       31
       31
       +
           signingKey = await Secp256k1Keypair.create()

     

       32
       32
       +
           rotationKey1 = await Secp256k1Keypair.create()

     

       33
       33
       +
           rotationKey2 = await EcdsaKeypair.create()

     

       34
       34
       +
           rotationKey3 = await EcdsaKeypair.create()

     

       35
       35
       +
         })

     

       36
       36
       +
       

     

       37
       37
       +
         const signOpForKeys = async (

     

       38
       38
       +
           keys: Keypair[],

     

       39
       39
       +
           prev: CID | null,

     

       40
       40
       +
           signer: Keypair,

     

       41
       41
       +
           otherChanges: Partial<t.Operation> = {},

     

       42
       42
       +
         ) => {

     

       43
       43
       +
           const op = await operations.signOperation(

     

       44
       44
       +
             {

     

       45
       45
       +
               signingKey: signingKey.did(),

     

       46
       46
       +
               rotationKeys: keys.map((k) => k.did()),

     

       47
       47
       +
               handles: [handle],

     

       48
       48
       +
               services: {

     

       49
       49
       +
                 atpPds,

     

       50
       50
       +
               },

     

       51
       51
       +
               prev: prev ? prev.toString() : null,

     

       52
       52
       +
               ...otherChanges,

     

       53
       53
       +
             },

     

       54
       54
       +
             signer,

     

       55
       55
       +
           )

     

       56
       56
       +
       

     

       57
       57
       +
           const cid = await cidForCbor(op)

     

       58
       58
       +
       

     

       59
       59
       +
           const indexed = {

     

       60
       60
       +
             did,

     

       61
       61
       +
             operation: op,

     

       62
       62
       +
             cid,

     

       63
       63
       +
             nullified: false,

     

       64
       64
       +
             createdAt: new Date(),

     

       65
       65
       +
           }

     

       66
       66
       +
           return { op, indexed }

     

       67
       67
       +
         }

     

       68
       68
       +
       

     

       69
       69
       +
         it('creates an op log with rotation', async () => {

     

       70
       70
       +
           const create = await signOpForKeys(

     

       71
       71
       +
             [rotationKey1, rotationKey2, rotationKey3],

     

       72
       72
       +
             null,

     

       73
       73
       +
             rotationKey1,

     

       74
       74
       +
           )

     

       75
       75
       +
           createCid = create.indexed.cid

     

       76
       76
       +
       

     

       77
       77
       +
           log.push({

     

       78
       78
       +
             ...create.indexed,

     

       79
       79
       +
             createdAt: new Date(Date.now() - 7 * DAY),

     

       80
       80
       +
           })

     

       81
       81
       +
       

     

       82
       82
       +
           // key 3 tries to usurp control

     

       83
       83
       +
           const rotate = await signOpForKeys([rotationKey3], createCid, rotationKey3)

     

       84
       84
       +
       

     

       85
       85
       +
           log.push({

     

       86
       86
       +
             ...rotate.indexed,

     

       87
       87
       +
             createdAt: new Date(Date.now() - DAY),

     

       88
       88
       +
           })

     

       89
       89
       +
       

     

       90
       90
       +
           // and does some additional ops

     

       91
       91
       +
           const another = await signOpForKeys(

     

       92
       92
       +
             [rotationKey3],

     

       93
       93
       +
             rotate.indexed.cid,

     

       94
       94
       +
             rotationKey3,

     

       95
       95
       +
             { handles: ['newhandle.test'] },

     

       96
       96
       +
           )

     

       97
       97
       +
       

     

       98
       98
       +
           log.push({

     

       99
       99
       +
             ...another.indexed,

     

       100
       100
       +
             createdAt: new Date(Date.now() - HOUR),

     

       101
       101
       +
           })

     

       102
       102
       +
         })

     

       103
       103
       +
       

     

       104
       104
       +
         it('allows a rotation key with higher authority to rewrite history', async () => {

     

       105
       105
       +
           // key 2 asserts control over key 3

     

       106
       106
       +
           const rotate = await signOpForKeys([rotationKey2], createCid, rotationKey2)

     

       107
       107
       +
       

     

       108
       108
       +
           const res = await data.assureValidNextOp(did, log, rotate.op)

     

       109
       109
       +
           expect(res.nullified.length).toBe(2)

     

       110
       110
       +
           expect(res.nullified[0].equals(log[1].cid))

     

       111
       111
       +
           expect(res.nullified[1].equals(log[2].cid))

     

       112
       112
       +
           expect(res.prev?.equals(createCid))

     

       113
       113
       +
       

     

       114
       114
       +
           log = [log[0], rotate.indexed]

     

       115
       115
       +
         })

     

       116
       116
       +
       

     

       117
       117
       +
         it('does not allow the lower authority key to take control back', async () => {

     

       118
       118
       +
           const rotate = await signOpForKeys([rotationKey3], createCid, rotationKey3)

     

       119
       119
       +
           await expect(data.assureValidNextOp(did, log, rotate.op)).rejects.toThrow(

     

       120
       120
       +
             InvalidSignatureError,

     

       121
       121
       +
           )

     

       122
       122
       +
         })

     

       123
       123
       +
       })

+1 -3

packages/server/tests/server.test.ts

···

       1
       1
        
       import { EcdsaKeypair } from '@atproto/crypto'

     

       2
       2
       -
       import { Client, document } from '@did-plc/lib'

     

       2
       2
       +
       import { Client } from '@did-plc/lib'

     

       3
       3
        
       import { CloseFn, runTestServer } from './_util'

     

       4
       4
        
       import { cidForCbor } from '@atproto/common'

     

       5
       5
        
       import { AxiosError } from 'axios'

     
···

       48
       48
        
           expect(doc.handle).toEqual(handle)

     

       49
       49
        
           expect(doc.atpPds).toEqual(atpPds)

     

       50
       50
        
         })

     

       51
       51
       -
       

     

       52
       52
       -
         return

     

       53
       51
        
       

     

       54
       52
        
         it('can perform some updates', async () => {

     

       55
       53
        
           const newSigningKey = await EcdsaKeypair.create()