Merge branch 'dev' into stream

.github/workflows/test.yml

@@ -5,7 +5,7 @@ on:
       - "**"
     tags-ignore:
       - "**"
-  # pull_request:
+  pull_request:
 jobs:
   test:
     runs-on: ${{ matrix.os }}-latest

io/fileutils.go

@@ -240,7 +240,13 @@ func GetFileInfo(path string, followSymlink bool) (fileInfo os.FileInfo, err err
 
 // Close the reader/writer and append the error to the given error.
 func Close(closer io.Closer, err *error) {
-	if closeErr := closer.Close(); closeErr != nil {
-		*err = errors.Join(*err, fmt.Errorf("failed to close %T: %w", closer, closeErr))
+	var closeErr error
+	if closeErr = closer.Close(); closeErr == nil {
+		return
+	}
+
+	closeErr = fmt.Errorf("failed to close %T: %w", closer, closeErr)
+	if err != nil {
+		*err = errors.Join(*err, closeErr)
 	}
 }

io/fileutils_test.go

@@ -2,17 +2,17 @@ package io
 
 import (
 	"errors"
-	"github.com/stretchr/testify/assert"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestClose(t *testing.T) {
 	var err error
-	t.TempDir()
-	f, err := os.Create(path.Join(t.TempDir(), "test"))
+	f, err := os.Create(filepath.Join(t.TempDir(), "test"))
 	assert.NoError(t, err)
 
 	Close(f, &err)
@@ -26,4 +26,8 @@ func TestClose(t *testing.T) {
 	err = errors.New("original error")
 	Close(f, &err)
 	assert.Len(t, strings.Split(err.Error(), "\n"), 2)
+
+	nilErr := new(error)
+	Close(f, nilErr)
+	assert.NotNil(t, nilErr)
 }

unarchive/archive.go

@@ -3,12 +3,13 @@ package unarchive
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/jfrog/archiver/v3"
 	"io"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"github.com/jfrog/archiver/v3"
+
 	"github.com/jfrog/gofrog/datastructures"
 )
 
@@ -135,6 +136,10 @@ func (u *Unarchiver) byExtension(filename string) (interface{}, error) {
 
 // Make sure the archive is free from Zip Slip and Zip symlinks attacks
 func inspectArchive(archive interface{}, localArchivePath, destinationDir string) error {
+	// If the destination directory ends with a slash, delete it. 
+	// This is necessary to handle a situation where the entry path might be at the root of the destination directory, 
+	// but in such a case "<destination-dir>/" is not a prefix of "<destination-dir>".
+	destinationDir = strings.TrimSuffix(destinationDir, string(os.PathSeparator))
 	walker, ok := archive.(archiver.Walker)
 	if !ok {
 		return fmt.Errorf("couldn't inspect archive: " + localArchivePath)

unarchive/archive_test.go

@@ -14,8 +14,8 @@ func TestUnarchive(t *testing.T) {
 	for _, extension := range tests {
 		t.Run(extension, func(t *testing.T) {
 			// Create temp directory
-			tmpDir, createTempDirCallback := createTempDirWithCallbackAndAssert(t)
-			defer createTempDirCallback()
+			tmpDir := t.TempDir()
+
 			// Run unarchive on archive created on Unix
 			err := runUnarchive(t, uarchiver, "unix."+extension, "archives", filepath.Join(tmpDir, "unix"))
 			assert.NoError(t, err)
@@ -48,8 +48,7 @@ func TestUnarchiveSymlink(t *testing.T) {
 			for _, testCase := range unarchiveSymlinksCases {
 				t.Run(testCase.prefix, func(t *testing.T) {
 					// Create temp directory
-					tmpDir, createTempDirCallback := createTempDirWithCallbackAndAssert(t)
-					defer createTempDirCallback()
+					tmpDir := t.TempDir()
 
 					// Run unarchive
 					err := runUnarchive(t, uarchiver, testCase.prefix+"."+extension, "archives", tmpDir)
@@ -84,8 +83,8 @@ func TestUnarchiveZipSlip(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.testType, func(t *testing.T) {
 			// Create temp directory
-			tmpDir, createTempDirCallback := createTempDirWithCallbackAndAssert(t)
-			defer createTempDirCallback()
+			tmpDir := t.TempDir()
+
 			for _, archive := range test.archives {
 				// Unarchive and make sure an error returns
 				err := runUnarchive(t, uarchiver, test.testType+"."+archive, "zipslip", tmpDir)
@@ -103,8 +102,8 @@ func TestUnarchiveWithStripComponents(t *testing.T) {
 	for _, extension := range tests {
 		t.Run(extension, func(t *testing.T) {
 			// Create temp directory
-			tmpDir, createTempDirCallback := createTempDirWithCallbackAndAssert(t)
-			defer createTempDirCallback()
+			tmpDir := t.TempDir()
+
 			// Run unarchive on archive created on Unix
 			err := runUnarchive(t, uarchiver, "strip-components."+extension, "archives", filepath.Join(tmpDir, "unix"))
 			assert.NoError(t, err)
@@ -120,16 +119,19 @@ func TestUnarchiveWithStripComponents(t *testing.T) {
 	}
 }
 
+// Test unarchive file with a directory named "." in the root directory
+func TestUnarchiveDotDir(t *testing.T) {
+	// Create temp directory
+	tmpDir := t.TempDir()
+
+	// Run unarchive
+	err := runUnarchive(t, Unarchiver{}, "dot-dir.tar.gz", "archives", tmpDir+string(os.PathSeparator))
+	assert.NoError(t, err)
+	assert.DirExists(t, filepath.Join(tmpDir, "dir"))
+}
+
 func runUnarchive(t *testing.T, uarchiver Unarchiver, archiveFileName, sourceDir, targetDir string) error {
 	archivePath := filepath.Join("testdata", sourceDir, archiveFileName)
 	assert.True(t, uarchiver.IsSupportedArchive(archivePath))
 	return uarchiver.Unarchive(filepath.Join("testdata", sourceDir, archiveFileName), archiveFileName, targetDir)
 }
-
-func createTempDirWithCallbackAndAssert(t *testing.T) (string, func()) {
-	tempDirPath, err := os.MkdirTemp("", "archiver_test")
-	assert.NoError(t, err, "Couldn't create temp dir")
-	return tempDirPath, func() {
-		assert.NoError(t, os.RemoveAll(tempDirPath), "Couldn't remove temp dir")
-	}
-}