Merge pull request #101 from open-component-model/phoban01/path-bug-fix

phoban01 · web-flow · commit 5fa49409a298 · 2023-12-12T10:24:28.000Z
Fix Path Bug
diff --git a/pkg/gogit/tar.go b/pkg/gogit/tar.go
@@ -23,13 +23,11 @@ func Untar(in io.Reader, dir string) error {
 			return err
 		}
 
-		fp, err := sanitizeArchivePath(dir, header.Name)
+		abs, err := sanitizeArchivePath(dir, header.Name)
 		if err != nil {
 			return fmt.Errorf("illegal file path: %s", header.Name)
 		}
 
-		abs := filepath.Join(dir, fp)
-
 		switch header.Typeflag {
 		case tar.TypeDir:
 			if err := os.MkdirAll(abs, os.FileMode(header.Mode)); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,11 @@ func Untar(in io.Reader, dir string) error {`
`23`	`23`	`return err`
`24`	`24`	`}`
`25`	`25`
`26`		`- fp, err := sanitizeArchivePath(dir, header.Name)`
	`26`	`+ abs, err := sanitizeArchivePath(dir, header.Name)`
`27`	`27`	`if err != nil {`
`28`	`28`	`return fmt.Errorf("illegal file path: %s", header.Name)`
`29`	`29`	`}`
`30`	`30`
`31`		`- abs := filepath.Join(dir, fp)`
`32`		`-`
`33`	`31`	`switch header.Typeflag {`
`34`	`32`	`case tar.TypeDir:`
`35`	`33`	`if err := os.MkdirAll(abs, os.FileMode(header.Mode)); err != nil {`