Revert "Untar: Fixing symlink untarring in memfs (#288)" (#293)

This reverts commit c28fc3a.
uber-archive · Dec 5, 2019 · 13ff85b · 13ff85b
1 parent d419d01
commit 13ff85b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/snapshot/mem_fs.go b/lib/snapshot/mem_fs.go
@@ -659,6 +659,9 @@ func (fs *MemFS) untarDirectory(path string, header *tar.Header) error {
 // untarSymlink creates the symlink specified by header at path.
 func (fs *MemFS) untarSymlink(path string, header *tar.Header) error {
 	target := header.Linkname
+	if filepath.IsAbs(header.Linkname) {
+		target = filepath.Join(fs.tree.src, target)
+	}
 	if err := os.Symlink(target, path); err != nil {
 		return fmt.Errorf("create symlink %s => %s: %s", path, target, err)
 	}

diff --git a/lib/snapshot/mem_fs_test.go b/lib/snapshot/mem_fs_test.go
@@ -89,9 +89,9 @@ func TestUntarFromPath(t *testing.T) {
 	require.NoError(err)
 	require.False(fi.IsDir())
 
-	target, err := os.Readlink(filepath.Join(tmpRoot, "mydir"))
+	contents, err = ioutil.ReadFile(filepath.Join(tmpRoot, "mydir"))
 	require.NoError(err)
-	require.Equal("/target.txt", target)
+	require.Equal([]byte("TARGET"), contents)
 
 	require.Equal(7, fs.layers[len(fs.layers)-1].count())