Unixfs: enforce refs on files when using nocopy

.gx/lastpubver

@@ -1 +1 @@
-1.2.12: QmQXze9tG878pa4Euya4rrDpyTNX3kQe4dhCaBzBozGgpe
+1.2.13: QmQReF8uaPBw6uKbDZQzaWyxCL4NuMMotcztXv1fKTSzkg

importer/balanced/balanced_test.go

@@ -27,7 +27,12 @@ func buildTestDag(ds ipld.DAGService, spl chunker.Splitter) (*dag.ProtoNode, err
 		Maxlinks: h.DefaultLinksPerBlock,
 	}
 
-	nd, err := Layout(dbp.New(spl))
+	db, err := dbp.New(spl)
+	if err != nil {
+		return nil, err
+	}
+
+	nd, err := Layout(db)
 	if err != nil {
 		return nil, err
 	}

importer/helpers/dagbuilder.go

@@ -2,6 +2,7 @@ package helpers
 
 import (
 	"context"
+	"errors"
 	"io"
 	"os"
 
@@ -17,6 +18,8 @@ import (
 	ipld "github.com/ipfs/go-ipld-format"
 )
 
+var ErrMissingFsRef = errors.New("missing file path or URL, can't create filestore reference")
+
 // DagBuilderHelper wraps together a bunch of objects needed to
 // efficiently create unixfs dag trees
 type DagBuilderHelper struct {
@@ -71,7 +74,7 @@ type DagBuilderParams struct {
 
 // New generates a new DagBuilderHelper from the given params and a given
 // chunker.Splitter as data source.
-func (dbp *DagBuilderParams) New(spl chunker.Splitter) *DagBuilderHelper {
+func (dbp *DagBuilderParams) New(spl chunker.Splitter) (*DagBuilderHelper, error) {
 	db := &DagBuilderHelper{
 		dserv:      dbp.Dagserv,
 		spl:        spl,
@@ -87,7 +90,12 @@ func (dbp *DagBuilderParams) New(spl chunker.Splitter) *DagBuilderHelper {
 	if dbp.URL != "" && dbp.NoCopy {
 		db.fullPath = dbp.URL
 	}
-	return db
+
+	if dbp.NoCopy && db.fullPath == "" { // Enforce NoCopy
+		return nil, ErrMissingFsRef
+	}
+
+	return db, nil
 }
 
 // prepareNext consumes the next item from the splitter and puts it

importer/importer.go

@@ -18,8 +18,11 @@ func BuildDagFromReader(ds ipld.DAGService, spl chunker.Splitter) (ipld.Node, er
 		Dagserv:  ds,
 		Maxlinks: h.DefaultLinksPerBlock,
 	}
-
-	return bal.Layout(dbp.New(spl))
+	db, err := dbp.New(spl)
+	if err != nil {
+		return nil, err
+	}
+	return bal.Layout(db)
 }
 
 // BuildTrickleDagFromReader creates a DAG given a DAGService and a Splitter
@@ -30,5 +33,9 @@ func BuildTrickleDagFromReader(ds ipld.DAGService, spl chunker.Splitter) (ipld.N
 		Maxlinks: h.DefaultLinksPerBlock,
 	}
 
-	return trickle.Layout(dbp.New(spl))
+	db, err := dbp.New(spl)
+	if err != nil {
+		return nil, err
+	}
+	return trickle.Layout(db)
 }

importer/trickle/trickle_test.go

@@ -39,7 +39,12 @@ func buildTestDag(ds ipld.DAGService, spl chunker.Splitter, rawLeaves UseRawLeav
 		RawLeaves: bool(rawLeaves),
 	}
 
-	nd, err := Layout(dbp.New(spl))
+	db, err := dbp.New(spl)
+	if err != nil {
+		return nil, err
+	}
+
+	nd, err := Layout(db)
 	if err != nil {
 		return nil, err
 	}
@@ -503,7 +508,13 @@ func testAppend(t *testing.T, rawLeaves UseRawLeaves) {
 	r := bytes.NewReader(should[nbytes/2:])
 
 	ctx := context.Background()
-	nnode, err := Append(ctx, nd, dbp.New(chunker.NewSizeSplitter(r, 500)))
+
+	db, err := dbp.New(chunker.NewSizeSplitter(r, 500))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	nnode, err := Append(ctx, nd, db)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -564,7 +575,12 @@ func testMultipleAppends(t *testing.T, rawLeaves UseRawLeaves) {
 	ctx := context.Background()
 	for i := 0; i < len(should); i++ {
 
-		nnode, err := Append(ctx, nd, dbp.New(spl(bytes.NewReader(should[i:i+1]))))
+		db, err := dbp.New(spl(bytes.NewReader(should[i : i+1])))
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		nnode, err := Append(ctx, nd, db)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -612,12 +628,23 @@ func TestAppendSingleBytesToEmpty(t *testing.T) {
 	spl := chunker.SizeSplitterGen(500)
 
 	ctx := context.Background()
-	nnode, err := Append(ctx, nd, dbp.New(spl(bytes.NewReader(data[:1]))))
+
+	db, err := dbp.New(spl(bytes.NewReader(data[:1])))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	nnode, err := Append(ctx, nd, db)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	db, err = dbp.New(spl(bytes.NewReader(data[1:])))
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	nnode, err = Append(ctx, nnode, dbp.New(spl(bytes.NewReader(data[1:]))))
+	nnode, err = Append(ctx, nnode, db)
 	if err != nil {
 		t.Fatal(err)
 	}

mod/dagmodifier.go

@@ -359,7 +359,11 @@ func (dm *DagModifier) appendData(nd ipld.Node, spl chunker.Splitter) (ipld.Node
 			CidBuilder: dm.Prefix,
 			RawLeaves:  dm.RawLeaves,
 		}
-		return trickle.Append(dm.ctx, nd, dbp.New(spl))
+		db, err := dbp.New(spl)
+		if err != nil {
+			return nil, err
+		}
+		return trickle.Append(dm.ctx, nd, db)
 	default:
 		return nil, ErrNotUnixfs
 	}

package.json

@@ -79,6 +79,6 @@
   "license": "",
   "name": "go-unixfs",
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
-  "version": "1.2.12"
+  "version": "1.2.13"
 }
 

test/utils.go

@@ -67,7 +67,11 @@ func GetNode(t testing.TB, dserv ipld.DAGService, data []byte, opts NodeOpts) ip
 		RawLeaves:  opts.RawLeavesUsed,
 	}
 
-	node, err := trickle.Layout(dbp.New(SizeSplitterGen(500)(in)))
+	db, err := dbp.New(SizeSplitterGen(500)(in))
+	if err != nil {
+		t.Fatal(err)
+	}
+	node, err := trickle.Layout(db)
 	if err != nil {
 		t.Fatal(err)
 	}