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

unixfs: clean path in DagArchive
ipfs · Mar 23, 2018 · c44191e · c44191e
2 parents b8e7b63 + f710b31
commit c44191e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/test/sharness/t0090-get.sh b/test/sharness/t0090-get.sh
@@ -104,6 +104,14 @@ test_get_cmd() {
     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)" '
     ipfs get "$HASH2" -a -C >actual
   '

diff --git a/unixfs/archive/archive.go b/unixfs/archive/archive.go
@@ -33,7 +33,8 @@ func (i *identityWriteCloser) Close() error {
 // 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) {
 
-	_, filename := path.Split(name)
+	cleaned := path.Clean(name)
+	_, filename := path.Split(cleaned)
 
 	// need to connect a writer to a reader
 	piper, pipew := io.Pipe()