hypercore 10.20.0 → 10.20.2

package/index.js

@@ -840,6 +840,7 @@ module.exports = class Hypercore extends EventEmitter {
     const cleared = (opts && opts.diff) ? { blocks: 0 } : null
 
     if (start >= end) return cleared
+    if (start >= this.length) return cleared
 
     await this.core.clear(start, end, cleared)
 

package/lib/core.js

@@ -22,6 +22,7 @@ module.exports = class Core {
     this.bitfield = bitfield
     this.defaultAuth = auth
     this.truncating = 0
+    this.closed = false
 
     this._maxOplogSize = 65536
     this._autoFlush = 1
@@ -222,7 +223,7 @@ module.exports = class Core {
 
       this.tree.signature = signature || auth.sign(this.tree.signable())
 
-      if (signature && !this._signed(this.tree)) {
+      if (signature && !this._verifyBatch(this.tree)) {
         // TODO: how to handle signature failure?
         this.tree.signature = null
         throw INVALID_SIGNATURE('Clone was provided with an invalid signature')
@@ -335,8 +336,8 @@ module.exports = class Core {
       if (start >= end || start >= this.tree.length) return
 
       const offset = await this.tree.byteOffset(start * 2)
-      const [byteEnd, byteEndLength] = await this.tree.byteRange((end - 1) * 2)
-      const length = (byteEnd + byteEndLength) - offset
+      const endOffset = await this.tree.byteOffset(end * 2)
+      const length = endOffset - offset
 
       const before = cleared ? await Info.bytesUsed(this.blocks.storage) : null
 
@@ -422,17 +423,18 @@ module.exports = class Core {
     }
   }
 
-  _signed (batch, hash, auth = this.defaultAuth) {
+  _verifyBatch (batch) {
+    const hash = batch.hash()
     const signable = this._legacy ? batch.signableLegacy(hash) : batch.signable(hash)
-    return auth.verify(signable, batch.signature, batch)
-  }
+    const auth = this.defaultAuth
 
-  async _verifyExclusive ({ batch, bitfield, value, from }) {
-    // TODO: move this to tree.js
-    const hash = batch.hash()
-    if (!batch.signature || !this._signed(batch, hash)) {
+    if (!batch.signature || !auth.verify(signable, batch.signature, batch)) {
       throw INVALID_SIGNATURE('Proof contains an invalid signature')
     }
+  }
+
+  async _verifyExclusive ({ batch, bitfield, value, from }) {
+    this._verifyBatch(batch)
 
     await this._mutex.lock()
 
@@ -540,9 +542,7 @@ module.exports = class Core {
 
     const batch = this.tree.verifyFullyRemote(proof)
 
-    if (!batch.signature || !this._signed(batch, batch.hash())) {
-      throw INVALID_SIGNATURE('Proof contains an invalid signature with no input from us')
-    }
+    this._verifyBatch(batch)
 
     const remoteTreeHash = this.crypto.tree(proof.upgrade.nodes)
     const localTreeHash = this.crypto.tree(await this.tree.getRoots(proof.upgrade.length))
@@ -553,6 +553,14 @@ module.exports = class Core {
     return true
   }
 
+  async verifyReorg (proof) {
+    const batch = await this.tree.reorg(proof)
+
+    this._verifyBatch(batch)
+
+    return batch
+  }
+
   async verify (proof, from) {
     // We cannot apply "other forks" atm.
     // We should probably still try and they are likely super similar for non upgrades
@@ -639,6 +647,7 @@ module.exports = class Core {
   }
 
   async close () {
+    this.closed = true
     await this._mutex.destroy()
     await Promise.allSettled([
       this.oplog.close(),

package/lib/merkle-tree.js

@@ -714,6 +714,7 @@ module.exports = class MerkleTree {
   }
 
   async byteOffset (index) {
+    if (index === 2 * this.length) return this.byteLength
     if ((index & 1) === 1) index = flat.leftSpan(index)
 
     let head = 0

package/lib/oplog.js

@@ -1,7 +1,7 @@
 const cenc = require('compact-encoding')
 const b4a = require('b4a')
 const { crc32 } = require('crc-universal')
-const { OPLOG_CORRUPT } = require('hypercore-errors')
+const { OPLOG_CORRUPT, OPLOG_HEADER_OVERFLOW } = require('hypercore-errors')
 
 module.exports = class Oplog {
   constructor (storage, { pageSize = 4096, headerEncoding = cenc.raw, entryEncoding = cenc.raw, readonly = false } = {}) {
@@ -155,6 +155,7 @@ module.exports = class Oplog {
     const bit = (this._headers[i] + 1) & 1
 
     this.headerEncoding.preencode(state, header)
+    if (state.end > this._pageSize) throw OPLOG_HEADER_OVERFLOW()
     state.buffer = b4a.allocUnsafe(state.end)
     this.headerEncoding.encode(state, header)
     this._addHeader(state, state.end - 8, bit, 0)

package/lib/replicator.js

@@ -560,6 +560,7 @@ class Peer {
         proof = await this._getProof(msg)
       } catch (err) { // TODO: better error handling here, ie custom errors
         safetyCatch(err)
+        if (this.replicator.core.closed) throw err // just an extra safety check...
       }
     }
 
@@ -1004,6 +1005,7 @@ module.exports = class Replicator {
     this.onupload = onupload
     this.peers = []
     this.findingPeers = 0 // updateable from the outside
+    this.destroyed = false
 
     this._attached = new Set()
     this._inflight = new InflightTracker()
@@ -1524,6 +1526,7 @@ module.exports = class Replicator {
   }
 
   async _onreorgdata (peer, req, data) {
+    const newBatch = data.upgrade && await this.core.verifyReorg(data)
     const f = this._addReorg(data.fork, peer)
 
     if (f === null) {
@@ -1536,7 +1539,7 @@ module.exports = class Replicator {
     if (f.batch) {
       await f.batch.update(data)
     } else if (data.upgrade) {
-      f.batch = await this.core.tree.reorg(data)
+      f.batch = newBatch
 
       // Remove "older" reorgs in progress as we just verified this one.
       this._clearOldReorgs(f.fork)
@@ -1711,7 +1714,7 @@ module.exports = class Replicator {
     protomux.stream.opened.then((opened) => {
       this._ifAvailable--
 
-      if (opened) makePeer()
+      if (opened && !this.destroyed) makePeer()
       else if (session) session.close().catch(noop)
       this._checkUpgradeIfAvailable()
     })
@@ -1725,6 +1728,7 @@ module.exports = class Replicator {
   }
 
   destroy () {
+    this.destroyed = true
     for (const peer of this.peers) {
       this.detachFrom(peer.protomux)
       peer.channel.close()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.20.0",
+  "version": "10.20.2",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -44,7 +44,7 @@
     "fast-fifo": "^1.3.0",
     "flat-tree": "^1.9.0",
     "hypercore-crypto": "^3.2.1",
-    "hypercore-errors": "^1.0.0",
+    "hypercore-errors": "^1.1.0",
     "is-options": "^1.0.1",
     "protomux": "^3.5.0",
     "quickbit-universal": "^2.1.1",