diff --git a/.snyk b/.snyk index ea229954a9..a252168fcc 100644 --- a/.snyk +++ b/.snyk @@ -8,3 +8,4 @@ exclude: # Ignore vendor/ directory since we're not (yet) concerned with scanning # our dependencies on each CI run. - 'vendor/**' + - 'tools/vendor/**' diff --git a/pkg/extract/extract.go b/pkg/extract/extract.go index af5f016f47..e7cc65e4ea 100644 --- a/pkg/extract/extract.go +++ b/pkg/extract/extract.go @@ -205,7 +205,7 @@ func unzip(archive, target string, fileFilter func(string) bool, showProgress bo continue } - if err := unzipFile(file, path, showProgress); err != nil { + if err := unzipFile(file, filepath.Clean(path), showProgress); err != nil { return nil, err } extractedFiles = append(extractedFiles, path) diff --git a/test/extended/util/prepare.go b/test/extended/util/prepare.go index 91c27cd2cd..855a295895 100644 --- a/test/extended/util/prepare.go +++ b/test/extended/util/prepare.go @@ -97,7 +97,7 @@ func CleanTestRunDir() error { } for _, file := range files { - err := os.RemoveAll(filepath.Join(TestRunDir, file.Name())) + err := os.RemoveAll(filepath.Clean(filepath.Join(TestRunDir, file.Name()))) if err != nil { return err } diff --git a/test/extended/util/util.go b/test/extended/util/util.go index f251a7b932..3283fbc939 100644 --- a/test/extended/util/util.go +++ b/test/extended/util/util.go @@ -54,7 +54,7 @@ func CopyResourcesFromPath(resourcesPath string) error { sFileName := filepath.Join(resourcesPath, file.Name()) fmt.Printf("Copying %s to %s\n", sFileName, destLoc) - sFile, err := os.Open(sFileName) + sFile, err := os.Open(filepath.Clean(sFileName)) if err != nil { fmt.Printf("Error occurred opening file: %s", err) return err