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

Merge pull request #4743 from schomatis/fix/unixfs/dagarchive-path

Browse Source 
unixfs: clean path in DagArchive
This commit is contained in:
Whyrusleeping
2018-03-22 23:16:24 -07:00
committed by GitHub
parent b8e7b632c1 f710b31ff4
commit c44191e096
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/sharness/t0090-get.sh
View File

@ -104,6 +104,14 @@ test_get_cmd() {
rm -r "$HASH2" rm -r "$HASH2"
' '
# Test issue #4720: problems when path contains a trailing slash.
test_expect_success "ipfs get with slash (directory)" '
ipfs get "$HASH2/" &&
test_cmp dir/a "$HASH2"/a &&
test_cmp dir/b/c "$HASH2"/b/c &&
rm -r "$HASH2"
'
test_expect_success "ipfs get -a -C succeeds (directory)" ' test_expect_success "ipfs get -a -C succeeds (directory)" '
ipfs get "$HASH2" -a -C >actual ipfs get "$HASH2" -a -C >actual
' '

3
unixfs/archive/archive.go
View File

@ -33,7 +33,8 @@ func (i *identityWriteCloser) Close() error {
// DagArchive is equivalent to `ipfs getdag $hash | maybe_tar | maybe_gzip` // DagArchive is equivalent to `ipfs getdag $hash | maybe_tar | maybe_gzip`
func DagArchive(ctx context.Context, nd ipld.Node, name string, dag ipld.DAGService, archive bool, compression int) (io.Reader, error) { func DagArchive(ctx context.Context, nd ipld.Node, name string, dag ipld.DAGService, archive bool, compression int) (io.Reader, error) {
_, filename := path.Split(name) cleaned := path.Clean(name)
_, filename := path.Split(cleaned)
// need to connect a writer to a reader // need to connect a writer to a reader
piper, pipew := io.Pipe() piper, pipew := io.Pipe()