Merge branch 'main' into dependabot/npm_and_yarn/aegir-47.0.16

Author: achingbrain

packages/ipfs-unixfs-exporter/package.json

@@ -168,7 +168,7 @@
     "it-to-buffer": "^4.0.7",
     "merge-options": "^3.0.4",
     "readable-stream": "^4.5.2",
-    "sinon": "^19.0.2",
+    "sinon": "^21.0.0",
     "uint8arrays": "^5.1.0",
     "wherearewe": "^2.0.1"
   },

packages/ipfs-unixfs/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [ipfs-unixfs-v11.2.2](https://github.com/ipfs/js-ipfs-unixfs/compare/ipfs-unixfs-11.2.1...ipfs-unixfs-11.2.2) (2025-06-16)
+
+### Bug Fixes
+
+* limit incoming hamt width ([#433](https://github.com/ipfs/js-ipfs-unixfs/issues/433)) ([8ca0144](https://github.com/ipfs/js-ipfs-unixfs/commit/8ca014420094be90b8bb765bb3f703a9ce7260b1))
+
 ## [ipfs-unixfs-v11.2.1](https://github.com/ipfs/js-ipfs-unixfs/compare/ipfs-unixfs-11.2.0...ipfs-unixfs-11.2.1) (2025-03-06)
 
 ### Dependencies

packages/ipfs-unixfs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipfs-unixfs",
-  "version": "11.2.1",
+  "version": "11.2.2",
   "description": "JavaScript implementation of IPFS' unixfs (a Unix FileSystem representation on top of a MerkleDAG)",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/js-ipfs-unixfs/tree/main/packages/ipfs-unixfs#readme",

packages/ipfs-unixfs/src/errors.ts

@@ -8,3 +8,14 @@ export class InvalidTypeError extends Error {
     super(message)
   }
 }
+
+export class InvalidUnixFSMessageError extends Error {
+  static name = 'InvalidUnixFSMessageError'
+  static code = 'ERR_INVALID_MESSAGE'
+  name = InvalidUnixFSMessageError.name
+  code = InvalidUnixFSMessageError.code
+
+  constructor (message = 'Invalid message') {
+    super(message)
+  }
+}

packages/ipfs-unixfs/src/index.ts

@@ -90,7 +90,7 @@
  * ```
  */
 
-import { InvalidTypeError } from './errors.js'
+import { InvalidTypeError, InvalidUnixFSMessageError } from './errors.js'
 import { Data as PBData } from './unixfs.js'
 
 export interface Mtime {
@@ -117,6 +117,9 @@ const dirTypes = [
 const DEFAULT_FILE_MODE = parseInt('0644', 8)
 const DEFAULT_DIRECTORY_MODE = parseInt('0755', 8)
 
+// https://github.com/ipfs/boxo/blob/364c5040ec91ec8e2a61446e9921e9225704c34d/ipld/unixfs/hamt/hamt.go#L778
+const MAX_FANOUT = BigInt(1 << 10)
+
 export interface UnixFSOptions {
   type?: string
   data?: Uint8Array
@@ -134,6 +137,10 @@ class UnixFS {
   static unmarshal (marshaled: Uint8Array): UnixFS {
     const message = PBData.decode(marshaled)
 
+    if (message.fanout != null && message.fanout > MAX_FANOUT) {
+      throw new InvalidUnixFSMessageError(`Fanout size was too large - ${message.fanout} > ${MAX_FANOUT}`)
+    }
+
     const data = new UnixFS({
       type: types[message.Type != null ? message.Type.toString() : 'File'],
       data: message.Data,

packages/ipfs-unixfs/test/unixfs-format.spec.ts

@@ -431,4 +431,17 @@ describe('unixfs-format', () => {
 
     expect(marshaled).to.deep.equal(Uint8Array.from([0x08, 0x02, 0x18, 0x00]))
   })
+
+  it('should limit maximum fanout size', () => {
+    const data = new UnixFS({
+      type: 'hamt-sharded-directory',
+      fanout: 1025n
+    })
+    const marshaled = data.marshal()
+
+    expect(() => {
+      UnixFS.unmarshal(marshaled)
+    }).to.throw()
+      .with.property('name', 'InvalidUnixFSMessageError')
+  })
 })