fix: Preserve symlinks in untar. Fixes argoproj#9948 (argoproj#9949)

Signed-off-by: Steven White <[email protected]>
tfurmston · Nov 2, 2022 · 4f1451e · 4f1451e
1 parent a5b31b3
commit 4f1451e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/workflow/executor/executor.go b/workflow/executor/executor.go
@@ -892,6 +892,11 @@ func untar(tarPath string, destPath string) error {
 				return err
 			}
 			switch header.Typeflag {
+			case tar.TypeSymlink:
+				err := os.Symlink(header.Linkname, target)
+				if err != nil {
+					return err
+				}
 			case tar.TypeReg:
 				f, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
 				if err != nil {

diff --git a/workflow/executor/executor_test.go b/workflow/executor/executor_test.go
@@ -277,18 +277,30 @@ func TestUnzip(t *testing.T) {
 
 func TestUntar(t *testing.T) {
 	tarPath := "testdata/file.tar.gz"
-	destPath := "testdata/untarredFile"
+	destPath := "testdata/untarredDir"
+	filePath := "testdata/untarredDir/file"
+	linkPath := "testdata/untarredDir/link"
 
 	// test
 	err := untar(tarPath, destPath)
 	assert.NoError(t, err)
 
-	// check untarred file
+	// check untarred contents
 	fileInfo, err := os.Stat(destPath)
 	assert.NoError(t, err)
+	assert.True(t, fileInfo.Mode().IsDir())
+	fileInfo, err = os.Stat(filePath)
+	assert.NoError(t, err)
+	assert.True(t, fileInfo.Mode().IsRegular())
+	fileInfo, err = os.Stat(linkPath)
+	assert.NoError(t, err)
 	assert.True(t, fileInfo.Mode().IsRegular())
 
 	// cleanup
+	err = os.Remove(linkPath)
+	assert.NoError(t, err)
+	err = os.Remove(filePath)
+	assert.NoError(t, err)
 	err = os.Remove(destPath)
 	assert.NoError(t, err)
 }

diff --git a/workflow/executor/testdata/file.tar.gz b/workflow/executor/testdata/file.tar.gz
diff --git a/workflow/executor/testdata/link b/workflow/executor/testdata/link
@@ -0,0 +1 @@
+file