ipfs: fix path resolution of alternate node formats

Author: djdv

go.mod

@@ -42,13 +42,15 @@ require (
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/ipfs/bbloom v0.0.4 // indirect
 	github.com/ipfs/go-bitfield v1.1.0 // indirect
-	github.com/ipfs/go-block-format v0.1.2 // indirect
+	github.com/ipfs/go-block-format v0.1.2
+	github.com/ipfs/go-blockservice v0.5.2 // indirect
 	github.com/ipfs/go-datastore v0.6.0 // indirect
 	github.com/ipfs/go-ipfs-util v0.0.3 // indirect
 	github.com/ipfs/go-ipld-legacy v0.2.1 // indirect
 	github.com/ipfs/go-log v1.0.5 // indirect
 	github.com/ipfs/go-log/v2 v2.5.1 // indirect
 	github.com/ipfs/go-metrics-interface v0.0.1 // indirect
+	github.com/ipfs/go-unixfsnode v1.7.3
 	github.com/ipld/go-codec-dagpb v1.6.0 // indirect
 	github.com/ipld/go-ipld-prime v0.20.0 // indirect
 	github.com/jbenet/goprocess v0.1.4 // indirect

go.sum

@@ -77,6 +77,8 @@ github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
 github.com/ipfs/go-block-format v0.1.2 h1:GAjkfhVx1f4YTODS6Esrj1wt2HhrtwTnhEr+DyPUaJo=
 github.com/ipfs/go-block-format v0.1.2/go.mod h1:mACVcrxarQKstUU3Yf/RdwbC4DzPV6++rO2a3d+a/KE=
+github.com/ipfs/go-blockservice v0.5.2 h1:in9Bc+QcXwd1apOVM7Un9t8tixPKdaHQFdLSUM1Xgk8=
+github.com/ipfs/go-blockservice v0.5.2/go.mod h1:VpMblFEqG67A/H2sHKAemeH9vlURVavlysbdUI632yk=
 github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
@@ -85,10 +87,15 @@ github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LK
 github.com/ipfs/go-datastore v0.6.0 h1:JKyz+Gvz1QEZw0LsX1IBn+JFCJQH4SJVFtM4uWU0Myk=
 github.com/ipfs/go-datastore v0.6.0/go.mod h1:rt5M3nNbSO/8q1t4LNkLyUwRs8HupMeN/8O4Vn9YAT8=
 github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk=
+github.com/ipfs/go-ipfs-blockstore v1.3.0 h1:m2EXaWgwTzAfsmt5UdJ7Is6l4gJcaM/A12XwJyvYvMM=
 github.com/ipfs/go-ipfs-blocksutil v0.0.1 h1:Eh/H4pc1hsvhzsQoMEP3Bke/aW5P5rVM1IWFJMcGIPQ=
+github.com/ipfs/go-ipfs-chunker v0.0.5 h1:ojCf7HV/m+uS2vhUGWcogIIxiO5ubl5O57Q7NapWLY8=
 github.com/ipfs/go-ipfs-cmds v0.9.0 h1:K0VcXg1l1k6aY6sHnoxYcyimyJQbcV1ueXuWgThmK9Q=
 github.com/ipfs/go-ipfs-cmds v0.9.0/go.mod h1:SBFHK8WNwC416QWH9Vz1Ql42SSMAOqKpaHUMBu3jpLo=
 github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ=
+github.com/ipfs/go-ipfs-ds-help v1.1.0 h1:yLE2w9RAsl31LtfMt91tRZcrx+e61O5mDxFRR994w4Q=
+github.com/ipfs/go-ipfs-exchange-interface v0.2.0 h1:8lMSJmKogZYNo2jjhUs0izT+dck05pqUw4mWNW9Pw6Y=
+github.com/ipfs/go-ipfs-exchange-offline v0.3.0 h1:c/Dg8GDPzixGd0MC8Jh6mjOwU57uYokgWRFidfvEkuA=
 github.com/ipfs/go-ipfs-pq v0.0.3 h1:YpoHVJB+jzK15mr/xsWC574tyDLkezVrDNeaalQBsTE=
 github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
 github.com/ipfs/go-ipfs-util v0.0.3 h1:2RFdGez6bu2ZlZdI+rWfIdbQb1KudQp3VGwPtdNCmE0=
@@ -105,11 +112,17 @@ github.com/ipfs/go-log v1.0.5/go.mod h1:j0b8ZoR+7+R99LD9jZ6+AJsrzkPbSXbZfGakb5JP
 github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g=
 github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY=
 github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI=
+github.com/ipfs/go-merkledag v0.10.0 h1:IUQhj/kzTZfam4e+LnaEpoiZ9vZF6ldimVlby+6OXL4=
 github.com/ipfs/go-metrics-interface v0.0.1 h1:j+cpbjYvu4R8zbleSs36gvB7jR+wsL2fGD6n0jO4kdg=
 github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j/b/tL7HTWtJ4VPgWY=
 github.com/ipfs/go-peertaskqueue v0.8.1 h1:YhxAs1+wxb5jk7RvS0LHdyiILpNmRIRnZVztekOF0pg=
+github.com/ipfs/go-unixfs v0.4.5 h1:wj8JhxvV1G6CD7swACwSKYa+NgtdWC1RUit+gFnymDU=
+github.com/ipfs/go-unixfsnode v1.7.3 h1:giAxFq7CxAm2Z8h8yFAD7TOQUpf5XG7a2xrR143ci4Y=
+github.com/ipfs/go-unixfsnode v1.7.3/go.mod h1:PVfoyZkX1B34qzT3vJO4nsLUpRCyhnMuHBznRcXirlk=
+github.com/ipfs/go-verifcid v0.0.2 h1:XPnUv0XmdH+ZIhLGKg6U2vaPaRDXb9urMyNVCE7uvTs=
 github.com/ipfs/kubo v0.21.0 h1:1+XKokeyatfI2Mri5iBn8Eplxf2F5ud0K5zLDg4tSSc=
 github.com/ipfs/kubo v0.21.0/go.mod h1:LuK5ANXz/UhHp8jdt4mRwE16AHhbRqY68g/uyc5/VqU=
+github.com/ipld/go-car/v2 v2.9.1-0.20230325062757-fff0e4397a3d h1:22g+x1tgWSXK34i25qjs+afr7basaneEkHaglBshd2g=
 github.com/ipld/go-codec-dagpb v1.6.0 h1:9nYazfyu9B1p3NAgfVdpRco3Fs2nFC72DqVsMj6rOcc=
 github.com/ipld/go-codec-dagpb v1.6.0/go.mod h1:ANzFhfP2uMJxRBr8CE+WQWs5UsNa0pYtmKZ+agnUw9s=
 github.com/ipld/go-ipld-prime v0.20.0 h1:Ud3VwE9ClxpO2LkCYP7vWPc0Fo+dYdYzgxUJZ3uRG4g=
@@ -223,6 +236,7 @@ github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
+github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 h1:1/WtZae0yGtPq+TI6+Tv1WTxkukpXeMlviSxvL7SRgk=
 github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -270,6 +284,7 @@ github.com/warpfork/go-testmark v0.11.0 h1:J6LnV8KpceDvo7spaNU4+DauH2n1x+6RaO2rJ
 github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
 github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSDJfjId/PEGEShv6ugrt4kYsC5UIDaQ=
 github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
+github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11 h1:5HZfQkwe0mIfyDmc1Em5GqlNRzcdtlv4HTNmdpt7XH0=
 github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158/go.mod h1:Xj/M2wWU+QdTdRbu/L/1dIZY8/Wb2K9pAhtroQuxJJI=
 github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa h1:EyA027ZAkuaCLoxVX4r1TZMPy1d31fM6hbfQ4OU4I5o=
 github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=

internal/filesystem/ipfs/ipfs.go

@@ -300,9 +300,11 @@ func (fsys *IPFS) nodeContext() (context.Context, context.CancelFunc) {
 }
 
 func (fsys *IPFS) walkLinks(root cid.Cid, names []string) (cid.Cid, error) {
-	return walkLinks(root, names, func(c cid.Cid) (ipld.Node, error) {
-		return fsys.getNode(c)
-	})
+	var (
+		ctx      = fsys.ctx
+		resolver = newPathResolver(fsys.core)
+	)
+	return walkLinks(ctx, root, names, resolver)
 }
 
 func (fsys *IPFS) Open(name string) (fs.File, error) {

internal/filesystem/ipfs/ipns.go

@@ -16,7 +16,6 @@ import (
 	coreiface "github.com/ipfs/boxo/coreiface"
 	corepath "github.com/ipfs/boxo/coreiface/path"
 	"github.com/ipfs/go-cid"
-	ipld "github.com/ipfs/go-ipld-format"
 )
 
 type (
@@ -196,11 +195,11 @@ func (fsys *IPNS) toCID(op, goPath string) (cid.Cid, error) {
 	if ipfs, ok := fsys.ipfs.(*IPFS); ok {
 		leafCid, err = ipfs.walkLinks(rootCID, names[1:])
 	} else {
-		leafCid, err = walkLinks(rootCID, names[1:], func(c cid.Cid) (ipld.Node, error) {
-			ctx, cancel := fsys.nodeContext()
-			defer cancel()
-			return fsys.core.Dag().Get(ctx, c)
-		})
+		var (
+			ctx      = fsys.ctx
+			resolver = newPathResolver(fsys.core)
+		)
+		leafCid, err = walkLinks(ctx, rootCID, names[1:], resolver)
 	}
 	if err != nil {
 		kind := resolveErrKind(err)

internal/filesystem/ipfs/resolve.go

@@ -0,0 +1,142 @@
+package ipfs
+
+import (
+	"context"
+	"io"
+
+	fserrors "github.com/djdv/go-filesystem-utils/internal/filesystem/errors"
+	"github.com/ipfs/boxo/blockservice"
+	coreiface "github.com/ipfs/boxo/coreiface"
+	ipath "github.com/ipfs/boxo/coreiface/path"
+	"github.com/ipfs/boxo/exchange"
+	bsfetcher "github.com/ipfs/boxo/fetcher/impl/blockservice"
+	"github.com/ipfs/boxo/path/resolver"
+	blocks "github.com/ipfs/go-block-format"
+	"github.com/ipfs/go-cid"
+	"github.com/ipfs/go-unixfsnode"
+)
+
+type (
+	coreBlockStore struct {
+		blocks   coreiface.BlockAPI
+		validate bool
+	}
+	blockFetcher struct {
+		coreiface.APIDagService
+	}
+)
+
+func newPathResolver(api coreiface.CoreAPI) resolver.Resolver {
+	var (
+		blockstore     = newCoreBlockStore(api.Block())
+		fetcher        = makeBlockFetcher(api.Dag())
+		service        = blockservice.New(blockstore, fetcher)
+		config         = bsfetcher.NewFetcherConfig(service)
+		fetcherFactory = config.WithReifier(unixfsnode.Reify)
+	)
+	return resolver.NewBasicResolver(fetcherFactory)
+}
+
+func newCoreBlockStore(blocks coreiface.BlockAPI) *coreBlockStore {
+	return &coreBlockStore{blocks: blocks}
+}
+
+func makeBlockFetcher(dag coreiface.APIDagService) exchange.Interface {
+	return blockFetcher{APIDagService: dag}
+}
+
+func (bs *coreBlockStore) fetch(ctx context.Context, c cid.Cid) (blocks.Block, error) {
+	blockReader, err := bs.blocks.Get(ctx, ipath.IpfsPath(c))
+	if err != nil {
+		return nil, err
+	}
+	blockData, err := io.ReadAll(blockReader)
+	if err != nil {
+		return nil, err
+	}
+	if bs.validate {
+		nc, err := c.Prefix().Sum(blockData)
+		if err != nil {
+			return nil, blocks.ErrWrongHash
+		}
+		if !nc.Equals(c) {
+			return nil, blocks.ErrWrongHash
+		}
+	}
+	return blocks.NewBlockWithCid(blockData, c)
+}
+
+func (bs *coreBlockStore) Has(ctx context.Context, c cid.Cid) (bool, error) {
+	blk, err := bs.fetch(ctx, c)
+	if err != nil {
+		return false, err
+	}
+	return blk != nil, nil
+}
+
+func (bs *coreBlockStore) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
+	blk, err := bs.fetch(ctx, c)
+	if err != nil {
+		return nil, err
+	}
+	return blk, nil
+}
+
+func (bs *coreBlockStore) GetSize(ctx context.Context, c cid.Cid) (int, error) {
+	blk, err := bs.fetch(ctx, c)
+	if err != nil {
+		return 0, err
+	}
+	return len(blk.RawData()), nil
+}
+
+func (bs *coreBlockStore) HashOnRead(enabled bool) {
+	bs.validate = enabled
+}
+
+func (*coreBlockStore) Put(context.Context, blocks.Block) error {
+	return fserrors.ErrUnsupported
+}
+
+func (*coreBlockStore) PutMany(context.Context, []blocks.Block) error {
+	return fserrors.ErrUnsupported
+}
+
+func (*coreBlockStore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
+	return nil, fserrors.ErrUnsupported
+}
+
+func (*coreBlockStore) DeleteBlock(context.Context, cid.Cid) error {
+	return fserrors.ErrUnsupported
+}
+
+func (bf blockFetcher) GetBlock(ctx context.Context, c cid.Cid) (blocks.Block, error) {
+	return bf.APIDagService.Get(ctx, c)
+}
+
+func (bf blockFetcher) GetBlocks(ctx context.Context, cids []cid.Cid) (<-chan blocks.Block, error) {
+	out := make(chan blocks.Block)
+	go func() {
+		defer close(out)
+		for _, c := range cids {
+			block, err := bf.GetBlock(ctx, c)
+			if err != nil {
+				return
+			}
+			select {
+			case out <- block:
+			case <-ctx.Done():
+				return
+			}
+		}
+	}()
+	return out, nil
+}
+
+func (blockFetcher) NotifyNewBlocks(ctx context.Context, blocks ...blocks.Block) error {
+	return nil
+}
+
+func (blockFetcher) Close() error {
+	return nil
+}

internal/filesystem/ipfs/shared.go

@@ -3,9 +3,9 @@ package ipfs
 import (
 	"context"
 	"errors"
-	"fmt"
 	"io"
 	"io/fs"
+	"path"
 	"strings"
 	"time"
 
@@ -16,6 +16,8 @@ import (
 	dag "github.com/ipfs/boxo/ipld/merkledag"
 	"github.com/ipfs/boxo/ipld/unixfs"
 	unixpb "github.com/ipfs/boxo/ipld/unixfs/pb"
+	ipath "github.com/ipfs/boxo/path"
+	"github.com/ipfs/boxo/path/resolver"
 	"github.com/ipfs/go-cid"
 	ipfscmds "github.com/ipfs/go-ipfs-cmds"
 	cbor "github.com/ipfs/go-ipld-cbor"
@@ -368,37 +370,20 @@ func drainThenSendErr(ch chan filesystem.StreamDirEntry, err error) {
 	ch <- newErrorEntry(err)
 }
 
-func walkLinks(root cid.Cid, names []string, getNodeFn getNodeFunc) (cid.Cid, error) {
-	node, err := getNodeFn(root)
-	if err != nil {
-		return cid.Cid{}, err
-	}
+func walkLinks(ctx context.Context,
+	root cid.Cid, names []string,
+	resolver resolver.Resolver,
+) (cid.Cid, error) {
 	var (
-		leafCid cid.Cid
-		end     = len(names) - 1
+		iPath      = ipath.FromCid(root)
+		components = append(
+			[]string{string(iPath)},
+			names...,
+		)
+		nodePath = ipath.FromString(path.Join(components...))
 	)
-	for i, name := range names {
-		object, _, err := node.Resolve([]string{name})
-		if err != nil {
-			return cid.Cid{}, err
-		}
-		link, ok := object.(*ipld.Link)
-		if !ok {
-			return cid.Cid{}, fmt.Errorf(
-				"expected: `%T` got: `%T`",
-				link, object,
-			)
-		}
-		leafCid = link.Cid
-		if i == end {
-			break
-		}
-		node, err = getNodeFn(leafCid)
-		if err != nil {
-			return cid.Cid{}, err
-		}
-	}
-	return leafCid, nil
+	leaf, _, err := resolver.ResolveToLastNode(ctx, nodePath)
+	return leaf, err
 }
 
 func fsTypeName(mode fs.FileMode) string {