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

Native Image SBOM: Add Support for Locations Data (#4186)

Browse Source 
Signed-off-by: Joel Rudsberg <joel.rudsberg@oracle.com>
This commit is contained in:
Joel Rudsberg 2025-09-11 20:16:09 +02:00 committed by GitHub
parent c6cd66357a
commit 7bc15e3d82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syft/pkg/cataloger/java/graalvm_native_image_cataloger.go
View File

@ -508,7 +508,7 @@ func (ni nativeImagePE) fetchPkgs() (pkgs []pkg.Package, relationships []artifac
} }
// fetchPkgs provides the packages available in a UnionReader. // fetchPkgs provides the packages available in a UnionReader.
func fetchPkgs(reader unionreader.UnionReader, filename string) ([]pkg.Package, []artifact.Relationship) { func fetchPkgs(reader unionreader.UnionReader, location file.Location) ([]pkg.Package, []artifact.Relationship) {
var pkgs []pkg.Package var pkgs []pkg.Package
var relationships []artifact.Relationship var relationships []artifact.Relationship
imageFormats := []func(string, io.ReaderAt) (nativeImage, error){newElf, newMachO, newPE} imageFormats := []func(string, io.ReaderAt) (nativeImage, error){newElf, newMachO, newPE}
@ -520,6 +520,7 @@ func fetchPkgs(reader unionreader.UnionReader, filename string) ([]pkg.Package,
log.Debugf("failed to open the java native-image binary: %v", err) log.Debugf("failed to open the java native-image binary: %v", err)
return nil, nil return nil, nil
} }
filename := location.RealPath
for _, r := range readers { for _, r := range readers {
for _, makeNativeImage := range imageFormats { for _, makeNativeImage := range imageFormats {
ni, err := makeNativeImage(filename, r) ni, err := makeNativeImage(filename, r)
@ -534,6 +535,10 @@ func fetchPkgs(reader unionreader.UnionReader, filename string) ([]pkg.Package,
log.Tracef("unable to extract SBOM from possible java native-image %s: %v", filename, err) log.Tracef("unable to extract SBOM from possible java native-image %s: %v", filename, err)
continue continue
} }
// Associate extracted packages with the native image location
for i := range newPkgs {
newPkgs[i].Locations.Add(location)
}
pkgs = append(pkgs, newPkgs...) pkgs = append(pkgs, newPkgs...)
relationships = append(relationships, newRelationships...) relationships = append(relationships, newRelationships...)
} }
@ -574,6 +579,6 @@ func processLocation(location file.Location, resolver file.Resolver) ([]pkg.Pack
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
pkgs, relationships := fetchPkgs(reader, location.RealPath) pkgs, relationships := fetchPkgs(reader, location)
return pkgs, relationships, nil return pkgs, relationships, nil
} }