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

fix: use filepath.EvalSymlinks if os.Readlink fails to evaluate the link (#1884)

Browse Source 
Signed-off-by: DD (Devdatta) Deshpande <dd@codewits.in>
Co-authored-by: Keith Zantow <kzantow@gmail.com>
This commit is contained in:
DD (Devdatta) Deshpande 2023-07-06 00:19:22 +05:30 committed by GitHub
parent cfbb9f703b
commit a00a3df10c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
syft/internal/fileresolver/directory_indexer.go
View File

@ -331,9 +331,21 @@ func (r directoryIndexer) addFileToIndex(p string, info os.FileInfo) error {
func (r directoryIndexer) addSymlinkToIndex(p string, info os.FileInfo) (string, error) { func (r directoryIndexer) addSymlinkToIndex(p string, info os.FileInfo) (string, error) {
linkTarget, err := os.Readlink(p) linkTarget, err := os.Readlink(p)
if err != nil {
if runtime.GOOS == WindowsOS {
p = posixToWindows(p)
}
linkTarget, err = filepath.EvalSymlinks(p)
if runtime.GOOS == WindowsOS {
p = windowsToPosix(p)
}
if err != nil { if err != nil {
return "", fmt.Errorf("unable to readlink for path=%q: %w", p, err) return "", fmt.Errorf("unable to readlink for path=%q: %w", p, err)
} }
}
if filepath.IsAbs(linkTarget) { if filepath.IsAbs(linkTarget) {
// if the link is absolute (e.g, /bin/ls -> /bin/busybox) we need to // if the link is absolute (e.g, /bin/ls -> /bin/busybox) we need to