mirror of
https://github.com/ipfs/kubo.git
synced 2026-02-21 10:27:46 +08:00
Some checks are pending
CodeQL / codeql (push) Waiting to run
Docker Check / lint (push) Waiting to run
Docker Check / build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / unit-tests (push) Waiting to run
Go Test / cli-tests (push) Waiting to run
Go Test / example-tests (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Spell Check / spellcheck (push) Waiting to run
* feat(config): Import.* and unixfs-v1-2025 profile
implements IPIP-499: add config options for controlling UnixFS DAG
determinism and introduces `unixfs-v1-2025` and `unixfs-v0-2015`
profiles for cross-implementation CID reproducibility.
changes:
- add Import.* fields: HAMTDirectorySizeEstimation, SymlinkMode,
DAGLayout, IncludeEmptyDirectories, IncludeHidden
- add validation for all Import.* config values
- add unixfs-v1-2025 profile (recommended for new data)
- add unixfs-v0-2015 profile (alias: legacy-cid-v0)
- remove deprecated test-cid-v1 and test-cid-v1-wide profiles
- wire Import.HAMTSizeEstimationMode() to boxo globals
- update go.mod to use boxo with SizeEstimationMode support
ref: https://specs.ipfs.tech/ipips/ipip-0499/
* feat(add): add --dereference-symlinks, --empty-dirs, --hidden CLI flags
add CLI flags for controlling file collection behavior during ipfs add:
- `--dereference-symlinks`: recursively resolve symlinks to their target
content (replaces deprecated --dereference-args which only worked on
CLI arguments). wired through go-ipfs-cmds to boxo's SerialFileOptions.
- `--empty-dirs` / `-E`: include empty directories (default: true)
- `--hidden` / `-H`: include hidden files (default: false)
these flags are CLI-only and not wired to Import.* config options because
go-ipfs-cmds library handles input file filtering before the directory
tree is passed to kubo. removed unused Import.UnixFSSymlinkMode config
option that was defined but never actually read by the CLI.
also:
- wire --trickle to Import.UnixFSDAGLayout config default
- update go-ipfs-cmds to v0.15.1-0.20260117043932-17687e216294
- add SYMLINK HANDLING section to ipfs add help text
- add CLI tests for all three flags
ref: https://github.com/ipfs/specs/pull/499
* test(add): add CID profile tests and wire SizeEstimationMode
add comprehensive test suite for UnixFS CID determinism per IPIP-499:
- verify exact HAMT threshold boundary for both estimation modes:
- v0-2015 (links): sum(name_len + cid_len) == 262144
- v1-2025 (block): serialized block size == 262144
- verify HAMT triggers at threshold + 1 byte for both profiles
- add all deterministic CIDs for cross-implementation testing
also wires SizeEstimationMode through CLI/API, allowing
Import.UnixFSHAMTSizeEstimation config to take effect.
bumps boxo to ipfs/boxo@6707376 which aligns HAMT threshold with
JS implementation (uses > instead of >=), fixing CID determinism
at the exact 256 KiB boundary.
* feat(add): --dereference-symlinks now resolves all symlinks
Previously, resolving symlinks required two flags:
- --dereference-args: resolved symlinks passed as CLI arguments
- --dereference-symlinks: resolved symlinks inside directories
Now --dereference-symlinks handles both cases. Users only need one flag
to fully dereference symlinks when adding files to IPFS.
The deprecated --dereference-args still works for backwards compatibility
but is no longer necessary.
* chore: update boxo and improve changelog
- update boxo to ebdaf07c (nil filter fix, thread-safety docs)
- simplify changelog for IPIP-499 section
- shorten test names, move context to comments
* chore: update boxo to 5cf22196
* chore: apply suggestions from code review
Co-authored-by: Andrew Gillis <11790789+gammazero@users.noreply.github.com>
* test(add): verify balanced DAG layout produces uniform leaf depth
add test that confirms kubo uses balanced layout (all leaves at same
depth) rather than balanced-packed (varying depths). creates 45MiB file
to trigger multi-level DAG and walks it to verify leaf depth uniformity.
includes trickle subtest to validate test logic can detect varying depths.
supports CAR export via DAG_LAYOUT_CAR_OUTPUT env var for test vectors.
* chore(deps): update boxo to 6141039ad8ef
switches to 6141039ad8
changes since 5cf22196ad0b:
- refactor(unixfs): use arithmetic for exact block size calculation
- refactor(unixfs): unify size tracking and make SizeEstimationMode immutable
- feat(unixfs): optimize SizeEstimationBlock and add mode/mtime tests
also clarifies that directory sharding globals affect both `ipfs add` and MFS.
* test(cli): improve HAMT threshold tests with exact +1 byte verification
- add UnixFSDataType() helper to directly check UnixFS type via protobuf
- refactor threshold tests to use exact +1 byte calculations instead of +1 file
- verify directory type directly (ft.TDirectory vs ft.THAMTShard) instead of
inferring from link count
- clean up helper function signatures by removing unused cidLength parameter
* test(cli): consolidate profile tests into cid_profiles_test.go
remove duplicate profile threshold tests from add_test.go since they
are fully covered by the data-driven tests in cid_profiles_test.go.
changes:
- improve test names to describe what threshold is being tested
- add inline documentation explaining each test's purpose
- add byte-precise helper IPFSAddDeterministicBytes for threshold tests
- remove ~200 lines of duplicated test code from add_test.go
- keep non-profile tests (pinning, symlinks, hidden files) in add_test.go
* chore: update to rebased boxo and go-ipfs-cmds PRs
* docs: add HAMT threshold fix details to changelog
* feat(mfs): use Import config for CID version and hash function
make MFS commands (files cp, files write, files mkdir, files chcid)
respect Import.CidVersion and Import.HashFunction config settings
when CLI options are not explicitly provided.
also add tests for:
- files write respects Import.UnixFSRawLeaves=true
- single-block file: files write produces same CID as ipfs add
- updated comments clarifying CID parity with ipfs add
* feat(files): wire Import.UnixFSChunker and UnixFSDirectoryMaxLinks to MFS
`ipfs files` commands now respect these Import.* config options:
- UnixFSChunker: configures chunk size for `files write`
- UnixFSDirectoryMaxLinks: triggers HAMT sharding in `files mkdir`
- UnixFSHAMTDirectorySizeEstimation: controls size estimation mode
previously, MFS used hardcoded defaults ignoring user config.
changes:
- config/import.go: add UnixFSSplitterFunc() returning chunk.SplitterGen
- core/node/core.go: pass chunker, maxLinks, sizeEstimationMode to
mfs.NewRoot() via new boxo RootOption API
- core/commands/files.go: pass maxLinks and sizeEstimationMode to
mfs.Mkdir() and ensureContainingDirectoryExists(); document that
UnixFSFileMaxLinks doesn't apply to files write (trickle DAG limitation)
- test/cli/files_test.go: add tests for UnixFSDirectoryMaxLinks and
UnixFSChunker, including CID parity test with `ipfs add --trickle`
related: boxo@54e044f1b265
* feat(files): wire Import.UnixFSHAMTDirectoryMaxFanout and UnixFSHAMTDirectorySizeThreshold
wire remaining HAMT config options to MFS root:
- Import.UnixFSHAMTDirectoryMaxFanout via mfs.WithMaxHAMTFanout
- Import.UnixFSHAMTDirectorySizeThreshold via mfs.WithHAMTShardingSize
add CLI tests:
- files mkdir respects Import.UnixFSHAMTDirectoryMaxFanout
- files mkdir respects Import.UnixFSHAMTDirectorySizeThreshold
- config change takes effect after daemon restart
add UnixFSHAMTFanout() helper to test harness
update boxo to ac97424d99ab90e097fc7c36f285988b596b6f05
* fix(mfs): single-block files in CIDv1 dirs now produce raw CIDs
problem: `ipfs files write` in CIDv1 directories wrapped single-block
files in dag-pb even when raw-leaves was enabled, producing different
CIDs than `ipfs add --raw-leaves` for the same content.
fix: boxo now collapses single-block ProtoNode wrappers (with no
metadata) to RawNode in DagModifier.GetNode(). files with mtime/mode
stay as dag-pb since raw blocks cannot store UnixFS metadata.
also fixes sparse file writes where writing past EOF would lose data
because expandSparse didn't update the internal node pointer.
updates boxo to v0.36.1-0.20260203003133-7884ae23aaff
updates t0250-files-api.sh test hashes to match new behavior
* chore(test): use Go 1.22+ range-over-int syntax
* chore: update boxo to c6829fe26860
- fix typo in files write help text
- update boxo with CI fixes (gofumpt, race condition in test)
* chore: update go-ipfs-cmds to 192ec9d15c1f
includes binary content types fix: gzip, zip, vnd.ipld.car, vnd.ipld.raw,
vnd.ipfs.ipns-record
* chore: update boxo to 0a22cde9225c
includes refactor of maxLinks check in addLinkChild (review feedback).
* ci: fix helia-interop and improve caching
skip '@helia/mfs - should have the same CID after creating a file' test
until helia implements IPIP-499 (tracking: https://github.com/ipfs/helia/issues/941)
the test fails because kubo now collapses single-block files to raw CIDs
while helia explicitly uses reduceSingleLeafToSelf: false
changes:
- run aegir directly instead of helia-interop binary (binary ignores --grep flags)
- cache node_modules keyed by @helia/interop version from npm registry
- skip npm install on cache hit (matches ipfs-webui caching pattern)
* chore: update boxo to 1e30b954
includes latest upstream changes from boxo main
* chore: update go-ipfs-cmds to 1b2a641ed6f6
* chore: update boxo to f188f79fd412
switches to boxo@main after merging https://github.com/ipfs/boxo/pull/1088
* chore: update go-ipfs-cmds to af9bcbaf5709
switches to go-ipfs-cmds@master after merging https://github.com/ipfs/go-ipfs-cmds/pull/315
---------
Co-authored-by: Andrew Gillis <11790789+gammazero@users.noreply.github.com>
263 lines
9.0 KiB
Go
263 lines
9.0 KiB
Go
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"strconv"
|
|
"strings"
|
|
|
|
chunk "github.com/ipfs/boxo/chunker"
|
|
"github.com/ipfs/boxo/ipld/unixfs/importer/helpers"
|
|
uio "github.com/ipfs/boxo/ipld/unixfs/io"
|
|
"github.com/ipfs/boxo/verifcid"
|
|
mh "github.com/multiformats/go-multihash"
|
|
)
|
|
|
|
const (
|
|
DefaultCidVersion = 0
|
|
DefaultUnixFSRawLeaves = false
|
|
DefaultUnixFSChunker = "size-262144"
|
|
DefaultHashFunction = "sha2-256"
|
|
DefaultFastProvideRoot = true
|
|
DefaultFastProvideWait = false
|
|
|
|
DefaultUnixFSHAMTDirectorySizeThreshold = 262144 // 256KiB - https://github.com/ipfs/boxo/blob/6c5a07602aed248acc86598f30ab61923a54a83e/ipld/unixfs/io/directory.go#L26
|
|
|
|
// DefaultBatchMaxNodes controls the maximum number of nodes in a
|
|
// write-batch. The total size of the batch is limited by
|
|
// BatchMaxnodes and BatchMaxSize.
|
|
DefaultBatchMaxNodes = 128
|
|
// DefaultBatchMaxSize controls the maximum size of a single
|
|
// write-batch. The total size of the batch is limited by
|
|
// BatchMaxnodes and BatchMaxSize.
|
|
DefaultBatchMaxSize = 100 << 20 // 20MiB
|
|
|
|
// HAMTSizeEstimation values for Import.UnixFSHAMTDirectorySizeEstimation
|
|
HAMTSizeEstimationLinks = "links" // legacy: estimate using link names + CID byte lengths (default)
|
|
HAMTSizeEstimationBlock = "block" // full serialized dag-pb block size
|
|
HAMTSizeEstimationDisabled = "disabled" // disable HAMT sharding entirely
|
|
|
|
// DAGLayout values for Import.UnixFSDAGLayout
|
|
DAGLayoutBalanced = "balanced" // balanced DAG layout (default)
|
|
DAGLayoutTrickle = "trickle" // trickle DAG layout
|
|
|
|
DefaultUnixFSHAMTDirectorySizeEstimation = HAMTSizeEstimationLinks // legacy behavior
|
|
DefaultUnixFSDAGLayout = DAGLayoutBalanced // balanced DAG layout
|
|
DefaultUnixFSIncludeEmptyDirs = true // include empty directories
|
|
)
|
|
|
|
var (
|
|
DefaultUnixFSFileMaxLinks = int64(helpers.DefaultLinksPerBlock)
|
|
DefaultUnixFSDirectoryMaxLinks = int64(0)
|
|
DefaultUnixFSHAMTDirectoryMaxFanout = int64(uio.DefaultShardWidth)
|
|
)
|
|
|
|
// Import configures the default options for ingesting data. This affects commands
|
|
// that ingest data, such as 'ipfs add', 'ipfs dag put, 'ipfs block put', 'ipfs files write'.
|
|
type Import struct {
|
|
CidVersion OptionalInteger
|
|
UnixFSRawLeaves Flag
|
|
UnixFSChunker OptionalString
|
|
HashFunction OptionalString
|
|
UnixFSFileMaxLinks OptionalInteger
|
|
UnixFSDirectoryMaxLinks OptionalInteger
|
|
UnixFSHAMTDirectoryMaxFanout OptionalInteger
|
|
UnixFSHAMTDirectorySizeThreshold OptionalBytes
|
|
UnixFSHAMTDirectorySizeEstimation OptionalString // "links", "block", or "disabled"
|
|
UnixFSDAGLayout OptionalString // "balanced" or "trickle"
|
|
BatchMaxNodes OptionalInteger
|
|
BatchMaxSize OptionalInteger
|
|
FastProvideRoot Flag
|
|
FastProvideWait Flag
|
|
}
|
|
|
|
// ValidateImportConfig validates the Import configuration according to UnixFS spec requirements.
|
|
// See: https://specs.ipfs.tech/unixfs/#hamt-structure-and-parameters
|
|
func ValidateImportConfig(cfg *Import) error {
|
|
// Validate CidVersion
|
|
if !cfg.CidVersion.IsDefault() {
|
|
cidVer := cfg.CidVersion.WithDefault(DefaultCidVersion)
|
|
if cidVer != 0 && cidVer != 1 {
|
|
return fmt.Errorf("Import.CidVersion must be 0 or 1, got %d", cidVer)
|
|
}
|
|
}
|
|
|
|
// Validate UnixFSFileMaxLinks
|
|
if !cfg.UnixFSFileMaxLinks.IsDefault() {
|
|
maxLinks := cfg.UnixFSFileMaxLinks.WithDefault(DefaultUnixFSFileMaxLinks)
|
|
if maxLinks <= 0 {
|
|
return fmt.Errorf("Import.UnixFSFileMaxLinks must be positive, got %d", maxLinks)
|
|
}
|
|
}
|
|
|
|
// Validate UnixFSDirectoryMaxLinks
|
|
if !cfg.UnixFSDirectoryMaxLinks.IsDefault() {
|
|
maxLinks := cfg.UnixFSDirectoryMaxLinks.WithDefault(DefaultUnixFSDirectoryMaxLinks)
|
|
if maxLinks < 0 {
|
|
return fmt.Errorf("Import.UnixFSDirectoryMaxLinks must be non-negative, got %d", maxLinks)
|
|
}
|
|
}
|
|
|
|
// Validate UnixFSHAMTDirectoryMaxFanout if set
|
|
if !cfg.UnixFSHAMTDirectoryMaxFanout.IsDefault() {
|
|
fanout := cfg.UnixFSHAMTDirectoryMaxFanout.WithDefault(DefaultUnixFSHAMTDirectoryMaxFanout)
|
|
|
|
// Check all requirements: fanout < 8 covers both non-positive and non-multiple of 8
|
|
// Combined with power of 2 check and max limit, this ensures valid values: 8, 16, 32, 64, 128, 256, 512, 1024
|
|
if fanout < 8 || !isPowerOfTwo(fanout) || fanout > 1024 {
|
|
return fmt.Errorf("Import.UnixFSHAMTDirectoryMaxFanout must be a positive power of 2, multiple of 8, and not exceed 1024 (got %d)", fanout)
|
|
}
|
|
}
|
|
|
|
// Validate BatchMaxNodes
|
|
if !cfg.BatchMaxNodes.IsDefault() {
|
|
maxNodes := cfg.BatchMaxNodes.WithDefault(DefaultBatchMaxNodes)
|
|
if maxNodes <= 0 {
|
|
return fmt.Errorf("Import.BatchMaxNodes must be positive, got %d", maxNodes)
|
|
}
|
|
}
|
|
|
|
// Validate BatchMaxSize
|
|
if !cfg.BatchMaxSize.IsDefault() {
|
|
maxSize := cfg.BatchMaxSize.WithDefault(DefaultBatchMaxSize)
|
|
if maxSize <= 0 {
|
|
return fmt.Errorf("Import.BatchMaxSize must be positive, got %d", maxSize)
|
|
}
|
|
}
|
|
|
|
// Validate UnixFSChunker format
|
|
if !cfg.UnixFSChunker.IsDefault() {
|
|
chunker := cfg.UnixFSChunker.WithDefault(DefaultUnixFSChunker)
|
|
if !isValidChunker(chunker) {
|
|
return fmt.Errorf("Import.UnixFSChunker invalid format: %q (expected \"size-<bytes>\", \"rabin-<min>-<avg>-<max>\", or \"buzhash\")", chunker)
|
|
}
|
|
}
|
|
|
|
// Validate HashFunction
|
|
if !cfg.HashFunction.IsDefault() {
|
|
hashFunc := cfg.HashFunction.WithDefault(DefaultHashFunction)
|
|
hashCode, ok := mh.Names[strings.ToLower(hashFunc)]
|
|
if !ok {
|
|
return fmt.Errorf("Import.HashFunction unrecognized: %q", hashFunc)
|
|
}
|
|
// Check if the hash is allowed by verifcid
|
|
if !verifcid.DefaultAllowlist.IsAllowed(hashCode) {
|
|
return fmt.Errorf("Import.HashFunction %q is not allowed for use in IPFS", hashFunc)
|
|
}
|
|
}
|
|
|
|
// Validate UnixFSHAMTDirectorySizeEstimation
|
|
if !cfg.UnixFSHAMTDirectorySizeEstimation.IsDefault() {
|
|
est := cfg.UnixFSHAMTDirectorySizeEstimation.WithDefault(DefaultUnixFSHAMTDirectorySizeEstimation)
|
|
switch est {
|
|
case HAMTSizeEstimationLinks, HAMTSizeEstimationBlock, HAMTSizeEstimationDisabled:
|
|
// valid
|
|
default:
|
|
return fmt.Errorf("Import.UnixFSHAMTDirectorySizeEstimation must be %q, %q, or %q, got %q",
|
|
HAMTSizeEstimationLinks, HAMTSizeEstimationBlock, HAMTSizeEstimationDisabled, est)
|
|
}
|
|
}
|
|
|
|
// Validate UnixFSDAGLayout
|
|
if !cfg.UnixFSDAGLayout.IsDefault() {
|
|
layout := cfg.UnixFSDAGLayout.WithDefault(DefaultUnixFSDAGLayout)
|
|
switch layout {
|
|
case DAGLayoutBalanced, DAGLayoutTrickle:
|
|
// valid
|
|
default:
|
|
return fmt.Errorf("Import.UnixFSDAGLayout must be %q or %q, got %q",
|
|
DAGLayoutBalanced, DAGLayoutTrickle, layout)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// isPowerOfTwo checks if a number is a power of 2
|
|
func isPowerOfTwo(n int64) bool {
|
|
return n > 0 && (n&(n-1)) == 0
|
|
}
|
|
|
|
// isValidChunker validates chunker format
|
|
func isValidChunker(chunker string) bool {
|
|
if chunker == "buzhash" {
|
|
return true
|
|
}
|
|
|
|
// Check for size-<bytes> format
|
|
if sizeStr, ok := strings.CutPrefix(chunker, "size-"); ok {
|
|
if sizeStr == "" {
|
|
return false
|
|
}
|
|
// Check if it's a valid positive integer (no negative sign allowed)
|
|
if sizeStr[0] == '-' {
|
|
return false
|
|
}
|
|
size, err := strconv.Atoi(sizeStr)
|
|
// Size must be positive (not zero)
|
|
return err == nil && size > 0
|
|
}
|
|
|
|
// Check for rabin-<min>-<avg>-<max> format
|
|
if strings.HasPrefix(chunker, "rabin-") {
|
|
parts := strings.Split(chunker, "-")
|
|
if len(parts) != 4 {
|
|
return false
|
|
}
|
|
|
|
// Parse and validate min, avg, max values
|
|
values := make([]int, 3)
|
|
for i := range 3 {
|
|
val, err := strconv.Atoi(parts[i+1])
|
|
if err != nil {
|
|
return false
|
|
}
|
|
values[i] = val
|
|
}
|
|
|
|
// Validate ordering: min <= avg <= max
|
|
min, avg, max := values[0], values[1], values[2]
|
|
return min <= avg && avg <= max
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
// HAMTSizeEstimationMode returns the boxo SizeEstimationMode based on the config value.
|
|
func (i *Import) HAMTSizeEstimationMode() uio.SizeEstimationMode {
|
|
switch i.UnixFSHAMTDirectorySizeEstimation.WithDefault(DefaultUnixFSHAMTDirectorySizeEstimation) {
|
|
case HAMTSizeEstimationLinks:
|
|
return uio.SizeEstimationLinks
|
|
case HAMTSizeEstimationBlock:
|
|
return uio.SizeEstimationBlock
|
|
case HAMTSizeEstimationDisabled:
|
|
return uio.SizeEstimationDisabled
|
|
default:
|
|
return uio.SizeEstimationLinks
|
|
}
|
|
}
|
|
|
|
// UnixFSSplitterFunc returns a SplitterGen function based on Import.UnixFSChunker.
|
|
// The returned function creates a Splitter for the configured chunking strategy.
|
|
// The chunker string is parsed once when this method is called, not on each use.
|
|
func (i *Import) UnixFSSplitterFunc() chunk.SplitterGen {
|
|
chunkerStr := i.UnixFSChunker.WithDefault(DefaultUnixFSChunker)
|
|
|
|
// Parse size-based chunker (most common case) and return optimized generator
|
|
if sizeStr, ok := strings.CutPrefix(chunkerStr, "size-"); ok {
|
|
if size, err := strconv.ParseInt(sizeStr, 10, 64); err == nil && size > 0 {
|
|
return chunk.SizeSplitterGen(size)
|
|
}
|
|
}
|
|
|
|
// For other chunker types (rabin, buzhash) or invalid config,
|
|
// fall back to parsing per-use (these are rare cases)
|
|
return func(r io.Reader) chunk.Splitter {
|
|
s, err := chunk.FromString(r, chunkerStr)
|
|
if err != nil {
|
|
return chunk.DefaultSplitter(r)
|
|
}
|
|
return s
|
|
}
|
|
}
|