opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-08-06 19:44:01 +08:00
Code Issues Projects Releases Wiki Activity

Unixfs: enforce refs on files when using nocopy

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2019-01-14 22:00:57 +01:00
committed by Steven Allen
parent 19ca1a819f
commit b2a5168468
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/commands/urlstore.go
View File

@ -116,7 +116,11 @@ time.
layout = trickle.Layout
}
root, err := layout(dbp.New(chk))
db, err := dbp.New(chk)
if err != nil {
return err
}
root, err := layout(db)
if err != nil {
return err
}

8
core/coreapi/interface/tests/unixfs.go
View File

@ -16,6 +16,7 @@ import (
"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
"gx/ipfs/QmQXze9tG878pa4Euya4rrDpyTNX3kQe4dhCaBzBozGgpe/go-unixfs"
"gx/ipfs/QmQXze9tG878pa4Euya4rrDpyTNX3kQe4dhCaBzBozGgpe/go-unixfs/importer/helpers"
"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
cbor "gx/ipfs/QmRoARq3nkUb13HSKZGepCZSWe5GrVPwx7xURJGZ7KWv9V/go-ipld-cbor"
mdag "gx/ipfs/QmTQdH4848iTVCJmKXYyRiK72HufWTLYQQ8iN3JaQ8K1Hq/go-merkledag"
@ -365,6 +366,13 @@ func (tp *provider) TestAdd(t *testing.T) {
opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true), options.Unixfs.RawLeaves(false)},
err: "nocopy option requires '--raw-leaves' to be enabled as well",
},
{
name: "noCopyNoPath",
data: strFile(helloStr),
path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true)},
err: helpers.ErrMissingFsRef.Error(),
},
// Events / Progress
{
name: "simpleAddEvent",

8
core/coreunix/add.go
View File

@ -123,11 +123,15 @@ func (adder *Adder) add(reader io.Reader) (ipld.Node, error) {
CidBuilder: adder.CidBuilder,
}
db, err := params.New(chnk)
if err != nil {
return nil, err
}
if adder.Trickle {
return trickle.Layout(params.New(chnk))
return trickle.Layout(db)
}
return balanced.Layout(params.New(chnk))
return balanced.Layout(db)
}
// RootNode returns the root node of the Added.