From f4911bbdeab2c36421c7bbc10cfd7a9247b15e36 Mon Sep 17 00:00:00 2001
From: Joel Thorstensson <joel@3box.io>
Date: Thu, 8 Feb 2024 21:52:33 +0000
Subject: [PATCH] All varsig tests passing

---
 .../varsig/src/__tests__/__vectors__/jws.car  | Bin 10776 -> 10845 bytes
 ...p256k1.test.ts => eip712-fixtures.test.ts} |   0
 ...jws-es256.test.ts => jws-fixtures.test.ts} |  48 ++++++++++++++----
 3 files changed, 37 insertions(+), 11 deletions(-)
 rename packages/varsig/src/__tests__/{eip712-secp256k1.test.ts => eip712-fixtures.test.ts} (100%)
 rename packages/varsig/src/__tests__/{jws-es256.test.ts => jws-fixtures.test.ts} (85%)

diff --git a/packages/varsig/src/__tests__/__vectors__/jws.car b/packages/varsig/src/__tests__/__vectors__/jws.car
index ddde7a8197a79ea1fd525f5e94f3ee8222c2212f..c0c44219c1cfe54ab3ca95a34c6d769ee73fa849 100644
GIT binary patch
literal 10845
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

literal 10776
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

diff --git a/packages/varsig/src/__tests__/eip712-secp256k1.test.ts b/packages/varsig/src/__tests__/eip712-fixtures.test.ts
similarity index 100%
rename from packages/varsig/src/__tests__/eip712-secp256k1.test.ts
rename to packages/varsig/src/__tests__/eip712-fixtures.test.ts
diff --git a/packages/varsig/src/__tests__/jws-es256.test.ts b/packages/varsig/src/__tests__/jws-fixtures.test.ts
similarity index 85%
rename from packages/varsig/src/__tests__/jws-es256.test.ts
rename to packages/varsig/src/__tests__/jws-fixtures.test.ts
index e7bce6b..7afd786 100644
--- a/packages/varsig/src/__tests__/jws-es256.test.ts
+++ b/packages/varsig/src/__tests__/jws-fixtures.test.ts
@@ -22,7 +22,7 @@ describe('jws.car', () => {
     entries = root.entries as Array<CID>
   })
 
-  // test('GenerateVectors', async () => {
+  // test.skip('GenerateVectors', async () => {
   //   await createVectors()
   // })
 
@@ -77,7 +77,7 @@ describe('jws.car', () => {
     }
   })
 
-  test.skip('Recover original from ipld node', async () => {
+  test('Recover original from ipld node', async () => {
     for (const entryCID of entries) {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const entry = car.get(entryCID)
@@ -89,16 +89,22 @@ describe('jws.car', () => {
       const node = car.get(entry.node)
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const originalKlone = klona(originalExpected)
-      console.log('ori', originalKlone)
 
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-argument
       if (entry.valid) {
         const originalRecovered = await toOriginal(node)
-        console.log('rec', originalRecovered)
         expect(originalRecovered).toEqual(originalKlone)
       } else {
-        console.log(entry)
-        expect(toOriginal(node)).rejects.toThrow()
+        if (entry.error === 'Invalid hash code') {
+          expect(toOriginal(node)).rejects.toThrow(/Hash type missmatch/)
+        } else if (entry.error === 'Missing alg in protected header') {
+          expect(toOriginal(node)).rejects.toThrow('Missing alg in protected header')
+        } else if (entry.error === 'Invalid signature') {
+          const originalRecovered = await toOriginal(node)
+          expect(originalRecovered).toEqual(originalKlone)
+        } else {
+          throw new Error('Unknown error')
+        }
       }
     }
   })
@@ -132,14 +138,14 @@ describe('jws.car', () => {
 //     signature: ['es256', 'secp256k1', 'ed25519', 'ed448']
 //   }, { isRoot: true })
 //
-//   await pipeline(car, fs.createWriteStream("./jws.car"));
+//   await pipeline(car, fs.createWriteStream("./src/__tests__/__vectors__/jws.car"));
 //
 //   async function gen(name, opt, alg, crv) {
 //     const kp = generateKeyPairSync(name, opt)
 //     const {x, y } = kp.publicKey.export({ format: 'jwk' })
 //     const verificationKey = y ?
 //       uint8arrays.concat([
-//         [0x04],
+//         new Uint8Array([0x04]),
 //         uint8arrays.fromString(x, 'base64url'),
 //         uint8arrays.fromString(y, 'base64url')
 //       ]) :
@@ -162,17 +168,25 @@ describe('jws.car', () => {
 //     // await expect(verify(node, verificationKey)).resolves.toEqual(true)
 //     // console.log('passed one')
 //
+//     // contruct valid node
 //     const entry1 = car.put({
 //       valid: true,
 //       signer: { verificationKey },
 //       node: car.put(node),
 //       original: car.put(jwt)
 //     })
+//
+//     // contruct node with incorrect hash kind
 //     const nodeKeccak = klona(node)
 //     let tape = new BytesTape(nodeKeccak._sig)
-//     tape.read(1); tape.readVarint();
+//     tape.read(1);
+//     let sigKind = tape.readVarint();
+//     if (sigKind === MAGIC.SECP256K1) {
+//       // skip recovery bit for secp256k1
+//       tape.read(1)
+//     }
 //     const hashPosition = tape.position
-//     nodeKeccak._sig.set([MAGIC.KECCAK_256], hashPosition) // TODO - fix
+//     nodeKeccak._sig.set([MAGIC.KECCAK_256], hashPosition)
 //     const entry2 = car.put({
 //       valid: false,
 //       error: 'Invalid hash code',
@@ -180,6 +194,8 @@ describe('jws.car', () => {
 //       node: car.put(nodeKeccak),
 //       original: car.put(jwt)
 //     })
+//
+//     // contruct node with invalid signature
 //     const jwtInvalid = jwt.substring(0, jwt.length - 10) + 'abc' + jwt.substring(jwt.length - 7)
 //     const entry3 = car.put({
 //       valid: false,
@@ -188,13 +204,22 @@ describe('jws.car', () => {
 //       node: car.put(JWS.fromOriginal(jwtInvalid)),
 //       original: car.put(jwtInvalid)
 //     })
+//
+//     // construct node with missing alg
 //     const invalidProtectedBytes = uint8arrays.fromString(JSON.stringify({}))
 //     const invalidProtected = uint8arrays.toString(invalidProtectedBytes, 'base64url')
 //     const jwtMissingAlg = invalidProtected + jwt.substring(jwt.indexOf('.'))
 //     const nodeMissingAlg = klona(node)
 //     const protectedLength = varintes.encode(invalidProtectedBytes.length)[0]
 //     tape = new BytesTape(nodeKeccak._sig)
-//     tape.read(1); tape.readVarint(); tape.readVarint(); tape.readVarint();
+//     tape.read(1);
+//     sigKind = tape.readVarint();
+//     if (sigKind === MAGIC.SECP256K1) {
+//       // skip recovery bit for secp256k1
+//       tape.read(1)
+//     }
+//     // skip hash and canon sigils
+//     tape.readVarint(); tape.readVarint();
 //     const protLenPos = tape.position
 //     const klonLength = tape.readVarint()
 //     const signature = nodeMissingAlg._sig.slice(tape.position + klonLength)
@@ -204,6 +229,7 @@ describe('jws.car', () => {
 //       invalidProtectedBytes,
 //       signature
 //     ])
+//     console.log('nv', newVarsig)
 //     nodeMissingAlg._sig = newVarsig
 //     const entry4 = car.put({
 //       valid: false,