oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 08:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix Windows file paths in local go mod cache (#2654)

Browse Source 
Previously, the file resolver was created from incorrect calls
(path.Join instead of filepath.Join) which resulted Go license searches
always missing on Windows. Use filepath.* functions when initializing
the Go config, and when the unindexed file resolver is being created.

Signed-off-by: Will Murphy <will.murphy@anchore.com>
This commit is contained in:
William Murphy 2024-05-09 13:08:58 -04:00 committed by GitHub
parent 1892f24002
commit b2ca5fbf89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syft/internal/fileresolver/unindexed_directory.go
View File

@ -8,6 +8,7 @@ import (
"io/fs"
"os"
"path"
"path/filepath"
"slices"
"sort"
"strings"
@ -61,11 +62,11 @@ func NewFromUnindexedDirectoryFS(fs afero.Fs, dir string, base string) file.Writ
}
wd, err := os.Getwd()
if err == nil {
if !path.IsAbs(dir) {
dir = path.Clean(path.Join(wd, dir))
if !filepath.IsAbs(dir) {
dir = filepath.Clean(filepath.Join(wd, dir))
}
if base != "" && !path.IsAbs(base) {
base = path.Clean(path.Join(wd, base))
if base != "" && !filepath.IsAbs(base) {
base = filepath.Clean(filepath.Join(wd, base))
}
}
return UnindexedDirectory{

6
syft/pkg/cataloger/golang/config.go
View File

@ -2,7 +2,7 @@ package golang
import (
"os"
"path"
"path/filepath"
"strings"
"github.com/mitchellh/go-homedir"
@ -75,11 +75,11 @@ func DefaultCatalogerConfig() CatalogerConfig {
if err != nil {
log.Debug("unable to determine user home dir: %v", err)
} else {
goPath = path.Join(homeDir, "go")
goPath = filepath.Join(homeDir, "go")
}
}
if goPath != "" {
g.LocalModCacheDir = path.Join(goPath, "pkg", "mod")
g.LocalModCacheDir = filepath.Join(goPath, "pkg", "mod")
}
}
return g