fix: cannot decompress tar file correctly (#453)

Signed-off-by: rick <LinuxSuRen@users.noreply.github.com>
Co-authored-by: rick <LinuxSuRen@users.noreply.github.com>

Author: LinuxSuRen

pkg/compress/gzip.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path"
 )
 
 // GZip implements a compress which based is based on gzip
@@ -43,7 +44,11 @@ func (c *GZip) ExtractFiles(sourceFile, targetName string) (err error) {
 		return
 	}
 
-	tarReader := tar.NewReader(gzf)
+	err = zipProcess(tar.NewReader(gzf), targetName, sourceFile, c.additionBinaries)
+	return
+}
+
+func zipProcess(tarReader *tar.Reader, targetName, sourceFile string, additionBinaries []string) (err error) {
 	var header *tar.Header
 	var found bool
 	for {
@@ -53,20 +58,26 @@ func (c *GZip) ExtractFiles(sourceFile, targetName string) (err error) {
 		} else if err != nil {
 			break
 		}
-		name := header.Name
+		name := path.Base(header.Name)
 
 		switch header.Typeflag {
 		case tar.TypeReg:
-			if err = extraFile(name, targetName, sourceFile, header, tarReader); err == nil {
-				found = true
+			if name == targetName {
+				if err = extraFile(name, targetName, sourceFile, header, tarReader); err == nil {
+					found = true
+				} else {
+					break
+				}
 			} else {
-				break
-			}
+				for i := range additionBinaries {
+					addition := additionBinaries[i]
+					if name != addition {
+						continue
+					}
 
-			for i := range c.additionBinaries {
-				addition := c.additionBinaries[i]
-				if err = extraFile(addition, addition, sourceFile, header, tarReader); err != nil {
-					return
+					if err = extraFile(addition, addition, sourceFile, header, tarReader); err != nil {
+						return
+					}
 				}
 			}
 		}

pkg/compress/testdata/simple.tar.gz

@@ -2,7 +2,6 @@ package compress
 
 import (
 	"archive/tar"
-	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -19,7 +18,7 @@ func extraFile(name, targetName, tarFile string, header *tar.Header, tarReader *
 		return
 	}
 	var targetFile *os.File
-	if targetFile, err = os.OpenFile(fmt.Sprintf("%s/%s", filepath.Dir(tarFile), targetName),
+	if targetFile, err = os.OpenFile(filepath.Join(filepath.Dir(tarFile), targetName),
 		os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode)); err != nil {
 		return
 	}

pkg/compress/types.go

@@ -85,6 +85,36 @@ func TestIsSupport(t *testing.T) {
 			extension: path.Ext("test.tar.gz"),
 		},
 		want: true,
+	}, {
+		name: "supported extension: .xz",
+		args: args{
+			extension: path.Ext("test.xz"),
+		},
+		want: true,
+	}, {
+		name: "supported extension: .zip",
+		args: args{
+			extension: path.Ext("test.zip"),
+		},
+		want: true,
+	}, {
+		name: "supported extension: .gz",
+		args: args{
+			extension: path.Ext("test.gz"),
+		},
+		want: true,
+	}, {
+		name: "supported extension: .tgz",
+		args: args{
+			extension: path.Ext("test.tgz"),
+		},
+		want: true,
+	}, {
+		name: "supported extension: .bz2",
+		args: args{
+			extension: path.Ext("test.bz2"),
+		},
+		want: true,
 	}, {
 		name: "not supported extension: .ab",
 		args: args{
@@ -148,9 +178,6 @@ func Test_extraFile(t *testing.T) {
 				file, err = os.CreateTemp(os.TempDir(), tt.args.tarFile)
 				assert.Nil(t, err)
 				assert.NotNil(t, file)
-				tt.args.tarFile = file.Name()
-				tt.args.targetName = path.Base(file.Name())
-				tt.args.name = tt.args.targetName
 			}
 
 			if err != nil || file == nil {
@@ -160,7 +187,31 @@ func Test_extraFile(t *testing.T) {
 			defer func() {
 				_ = os.RemoveAll(tt.args.tarFile)
 			}()
-			tt.wantErr(t, extraFile(tt.args.name, tt.args.targetName, tt.args.tarFile, tt.args.header, tt.args.tarReader), fmt.Sprintf("extraFile(%v, %v, %v, %v, %v)", tt.args.name, tt.args.targetName, tt.args.tarFile, tt.args.header, tt.args.tarReader))
+			err = extraFile(tt.args.name, tt.args.targetName, tt.args.tarFile, tt.args.header, tt.args.tarReader)
+			tt.wantErr(t, err, fmt.Sprintf("extraFile(%v, %v, %v, %v, %v)", tt.args.name, tt.args.targetName, tt.args.tarFile, tt.args.header, tt.args.tarReader))
 		})
 	}
 }
+
+func TestExtractFiles(t *testing.T) {
+	compressor := GetCompressor(".tar.gz", []string{"bb", "cc"})
+	assert.NotNil(t, compressor)
+
+	err := compressor.ExtractFiles("testdata/simple.tar.gz", "aa")
+	assert.NoError(t, err)
+
+	assertFileContentEqual(t, "testdata/aa", "aa\n")
+	assertFileContentEqual(t, "testdata/bb", "bb\n")
+	assertFileContentEqual(t, "testdata/cc", "cc\n")
+}
+
+func assertFileContentEqual(t *testing.T, filePath string, expectedContent string) {
+	defer func() {
+		_ = os.RemoveAll(filePath)
+	}()
+	if data, err := os.ReadFile(filePath); err == nil {
+		assert.Equal(t, expectedContent, string(data))
+	} else {
+		t.Fatalf("not found %q: %v", filePath, err)
+	}
+}

pkg/compress/types_test.go

@@ -3,9 +3,7 @@ package compress
 import (
 	"archive/tar"
 	"errors"
-	"fmt"
 	"github.com/xi2/xz"
-	"io"
 	"os"
 )
 
@@ -42,38 +40,6 @@ func (x *Xz) ExtractFiles(sourceFile, targetName string) (err error) {
 		return
 	}
 
-	var header *tar.Header
-	var found bool
-	// Create a tar Reader
-	tarReader := tar.NewReader(r)
-	for {
-		if header, err = tarReader.Next(); err == io.EOF {
-			err = nil
-			break
-		}
-		if err != nil {
-			return
-		}
-		name := header.Name
-
-		switch header.Typeflag {
-		case tar.TypeReg:
-			if err = extraFile(name, targetName, sourceFile, header, tarReader); err == nil {
-				found = true
-			} else {
-				break
-			}
-
-			for i := range x.additionBinaries {
-				addition := x.additionBinaries[i]
-				if err = extraFile(addition, addition, sourceFile, header, tarReader); err != nil {
-					return
-				}
-			}
-		}
-	}
-	if err == nil && !found {
-		err = fmt.Errorf("cannot find item '%s' from '%s'", targetName, sourceFile)
-	}
+	err = zipProcess(tar.NewReader(r), targetName, sourceFile, x.additionBinaries)
 	return
 }

pkg/compress/xz.go

@@ -2,8 +2,8 @@ package installer
 
 import (
 	"context"
-	"fmt"
 	"os/user"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -17,7 +17,7 @@ func TestGetConfigDir(t *testing.T) {
 	fetcher = &DefaultFetcher{}
 	dir, err := fetcher.GetConfigDir()
 	assert.Nil(t, err)
-	assert.Equal(t, fmt.Sprintf("%s/.config/hd-home", u.HomeDir), dir)
+	assert.Equal(t, filepath.Join(u.HomeDir, ".config", "hd-home"), dir)
 	fetcher.SetContext(context.TODO())
 
 	// test the fake fetcher