hypercore 10.0.0-alpha.8 → 10.0.0-alpha.9

package/index.js

@@ -394,12 +394,13 @@ module.exports = class Hypercore extends EventEmitter {
 
     if (this.core.bitfield.get(index)) {
       block = await this.core.blocks.get(index)
+      if (this.encryption) this.encryption.decrypt(index, block)
     } else {
       if (opts && opts.onwait) opts.onwait(index)
+      // Note that the _oncoreupdate handler decrypts inplace so we should not decrypt here
       block = await this.replicator.requestBlock(index)
     }
 
-    if (this.encryption) this.encryption.decrypt(index, block)
     return this._decode(encoding, block)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.0.0-alpha.8",
+  "version": "10.0.0-alpha.9",
   "description": "Hypercore 10",
   "main": "index.js",
   "scripts": {

package/test/encryption.js

@@ -1,4 +1,6 @@
 const test = require('brittle')
+const RAM = require('random-access-memory')
+const Hypercore = require('..')
 const { create, replicate } = require('./helpers')
 
 const encryptionKey = Buffer.alloc(32, 'hello world')
@@ -14,10 +16,10 @@ test('encrypted append and get', async function (t) {
   t.is(a.core.tree.byteLength, 5 + a.padding)
 
   const unencrypted = await a.get(0)
-  const encrypted = await a.core.blocks.get(0)
-
   t.alike(unencrypted, Buffer.from('hello'))
-  t.unlike(unencrypted, encrypted)
+
+  const encrypted = await a.core.blocks.get(0)
+  t.absent(encrypted.includes('hello'))
 })
 
 test('encrypted seek', async function (t) {
@@ -74,12 +76,46 @@ test('encrypted replication', async function (t) {
   })
 })
 
-test('encrypted sessions', async function (t) {
+test('encrypted session', async function (t) {
   const a = await create({ encryptionKey })
 
   await a.append(['hello'])
 
-  const session = a.session()
+  const s = a.session()
+
+  t.alike(a.encryptionKey, s.encryptionKey)
+  t.alike(await s.get(0), Buffer.from('hello'))
+
+  await s.append(['world'])
+
+  const unencrypted = await s.get(1)
+  t.alike(unencrypted, Buffer.from('world'))
+  t.alike(await a.get(1), unencrypted)
+
+  const encrypted = await s.core.blocks.get(1)
+  t.absent(encrypted.includes('world'))
+  t.alike(await a.core.blocks.get(1), encrypted)
+})
+
+test('encrypted session before ready core', async function (t) {
+  const a = new Hypercore(RAM, { encryptionKey })
+  const s = a.session()
+
+  await a.ready()
+
+  t.alike(a.encryptionKey, s.encryptionKey)
+
+  await a.append(['hello'])
+  t.alike(await s.get(0), Buffer.from('hello'))
+})
+
+test('replicating encrypted block returns expected data', async function (t) {
+  const a = await create({ encryptionKey })
+  const b = await create(a.key, { encryptionKey })
+
+  replicate(a, b, t)
 
-  t.alike(await session.get(0), Buffer.from('hello'))
+  await a.append('hej')
+  const blk = await b.get(0)
+  t.alike(blk, Buffer.from('hej'), 'freshly replicated block is decrypted')
 })