fix: fix reference length bug in manifest unmarshalling (#1065)

* fix: fix reference length bug in manifest unmarshalling

* chore: make lint happy

Author: Cafe137

src/manifest/manifest.ts

@@ -107,9 +107,13 @@ export class Fork {
     const type = Binary.uint8ToNumber(reader.read(1))
     const prefixLength = Binary.uint8ToNumber(reader.read(1))
     const prefix = reader.read(prefixLength)
-    reader.read(30 - prefixLength)
+
+    if (prefixLength < 30) {
+      reader.read(30 - prefixLength)
+    }
     const selfAddress = reader.read(addressLength)
     debug('unmarshalling fork', {
+      type,
       prefixLength,
       prefix: DECODER.decode(prefix),
       addressLength,
@@ -304,12 +308,12 @@ export class MantarayNode {
       throw new Error('MantarayNode#unmarshal invalid version hash')
     }
     const targetAddressLength = Binary.uint8ToNumber(reader.read(1))
-    const targetAddress = targetAddressLength === 0 ? NULL_ADDRESS : reader.read(targetAddressLength)
+    const targetAddress = targetAddressLength ? reader.read(targetAddressLength) : NULL_ADDRESS
     const node = new MantarayNode({ selfAddress, targetAddress, obfuscationKey })
     const forkBitmap = reader.read(32)
     for (let i = 0; i < 256; i++) {
       if (Binary.getBit(forkBitmap, i, 'LE')) {
-        const newFork = Fork.unmarshal(reader, targetAddressLength)
+        const newFork = Fork.unmarshal(reader, selfAddress.length)
         node.forks.set(i, newFork)
         newFork.node.parent = node
       }

test/integration/manifest.spec.ts

@@ -114,3 +114,20 @@ test('Manifest no feed to resolve', async () => {
 
   expect(feedUpdate.value).toBeNull()
 })
+
+test('Manifest add fork with foreign path', async () => {
+  const bee = makeBee()
+
+  const manifest = new MantarayNode()
+  manifest.addFork('c/中文/index.xml', arbitraryReference())
+  manifest.addFork('c/中文/index.html', arbitraryReference())
+
+  const result = await manifest.saveRecursively(bee, batch())
+
+  const unmarshaled = await MantarayNode.unmarshal(bee, result.reference)
+  await unmarshaled.loadRecursively(bee)
+
+  const items = unmarshaled.collectAndMap()
+  expect(items['c/中文/index.xml']).toBeDefined()
+  expect(items['c/中文/index.html']).toBeDefined()
+})

test/regression/manifest-fork.spec.ts

@@ -0,0 +1,60 @@
+import { MantarayNode } from '../../src'
+import { arbitraryReference, batch, makeBee } from '../utils'
+
+test('should not throw Bytes#checkByteLength', async () => {
+  const bee = makeBee()
+
+  const paths = [
+    'c/grants/index.xml',
+    'c/grants/index.html',
+    'c/ecosystem/index.xml',
+    'c/ecosystem/index.html',
+    'c/development-updates/index.xml',
+    'c/development-updates/index.html',
+    'c/events/index.xml',
+    'c/events/index.html',
+    'c/tutorials/index.xml',
+    'c/tutorials/index.html',
+    'css/main.bundle.min.4e55be0357e7dec25cf1bea80877847773ee67f75d09281900b7bd8c8d07b4cded5555fb3b9c01a3826e021712d0fd63866586c0aa832ebb86de60c217a2f288.css',
+  ]
+
+  const manifest = new MantarayNode()
+  for (const path of paths) {
+    manifest.addFork(path, arbitraryReference())
+  }
+
+  const result = await manifest.saveRecursively(bee, batch())
+
+  const unmarshaled = await MantarayNode.unmarshal(bee, result.reference)
+  await unmarshaled.loadRecursively(bee)
+
+  const items = unmarshaled.collectAndMap()
+  expect(Object.keys(items).length).toBe(paths.length)
+})
+
+test('should not throw SyntaxError', async () => {
+  const bee = makeBee()
+
+  const paths = [
+    'c/ecosystem/index.xml',
+    'c/ecosystem/index.html',
+    'c/development-updates/index.xml',
+    'c/development-updates/index.html',
+    'c/events/index.xml',
+    'c/events/index.html',
+    'css/main.bundle.min.4e55be0357e7dec25cf1bea80877847773ee67f75d09281900b7bd8c8d07b4cded5555fb3b9c01a3826e021712d0fd63866586c0aa832ebb86de60c217a2f288.css',
+  ]
+
+  const manifest = new MantarayNode()
+  for (const path of paths) {
+    manifest.addFork(path, arbitraryReference())
+  }
+
+  const result = await manifest.saveRecursively(bee, batch())
+
+  const unmarshaled = await MantarayNode.unmarshal(bee, result.reference)
+  await unmarshaled.loadRecursively(bee)
+
+  const items = unmarshaled.collectAndMap()
+  expect(Object.keys(items).length).toBe(paths.length)
+})