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

fix: revert incorrect graalvm unknown behavior (#3944)

Browse Source 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
This commit is contained in:
Keith Zantow 2025-05-30 11:36:57 -04:00 committed by GitHub
parent b3e8926025
commit 576e729c84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@ import (
"github.com/anchore/syft/internal" "github.com/anchore/syft/internal"
"github.com/anchore/syft/internal/log" "github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/mimetype" "github.com/anchore/syft/internal/mimetype"
"github.com/anchore/syft/internal/unknown"
"github.com/anchore/syft/syft/artifact" "github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/file" "github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/format/cyclonedxjson" "github.com/anchore/syft/syft/format/cyclonedxjson"
@ -509,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, error) { func fetchPkgs(reader unionreader.UnionReader, filename string) ([]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}
@ -519,9 +518,8 @@ func fetchPkgs(reader unionreader.UnionReader, filename string) ([]pkg.Package,
readers, err := unionreader.GetReaders(reader) readers, err := unionreader.GetReaders(reader)
if err != nil { if err != nil {
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, nil return nil, nil
} }
var unknowns error
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,14 +532,13 @@ func fetchPkgs(reader unionreader.UnionReader, filename string) ([]pkg.Package,
newPkgs, newRelationships, err := ni.fetchPkgs() newPkgs, newRelationships, err := ni.fetchPkgs()
if err != nil { if err != nil {
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)
unknowns = unknown.Join(unknowns, fmt.Errorf("unable to extract SBOM from possible java native-image %s: %w", filename, err))
continue continue
} }
pkgs = append(pkgs, newPkgs...) pkgs = append(pkgs, newPkgs...)
relationships = append(relationships, newRelationships...) relationships = append(relationships, newRelationships...)
} }
} }
return pkgs, relationships, unknowns return pkgs, relationships
} }
// Catalog attempts to find any native image executables reachable from a resolver. // Catalog attempts to find any native image executables reachable from a resolver.
@ -552,18 +549,17 @@ func (c *nativeImageCataloger) Catalog(_ context.Context, resolver file.Resolver
if err != nil { if err != nil {
return pkgs, nil, fmt.Errorf("failed to find binaries by mime types: %w", err) return pkgs, nil, fmt.Errorf("failed to find binaries by mime types: %w", err)
} }
var errs error
for _, location := range fileMatches { for _, location := range fileMatches {
newPkgs, newRelationships, err := processLocation(location, resolver) newPkgs, newRelationships, err := processLocation(location, resolver)
if err != nil { if err != nil {
errs = unknown.Append(errs, location, err) return nil, nil, err
continue
} }
pkgs = append(pkgs, newPkgs...) pkgs = append(pkgs, newPkgs...)
relationships = append(relationships, newRelationships...) relationships = append(relationships, newRelationships...)
} }
return pkgs, relationships, errs return pkgs, relationships, nil
} }
func processLocation(location file.Location, resolver file.Resolver) ([]pkg.Package, []artifact.Relationship, error) { func processLocation(location file.Location, resolver file.Resolver) ([]pkg.Package, []artifact.Relationship, error) {
@ -578,6 +574,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, err := fetchPkgs(reader, location.RealPath) pkgs, relationships := fetchPkgs(reader, location.RealPath)
return pkgs, relationships, err return pkgs, relationships, nil
} }