fix getting union reader for sif images (#2631)

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
anchore · Feb 13, 2024 · 25ae7bf · 25ae7bf
1 parent e72dec8
commit 25ae7bf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/syft/file/cataloger/executable/cataloger.go b/syft/file/cataloger/executable/cataloger.go
@@ -66,7 +66,15 @@ func (i *Cataloger) Catalog(resolver file.Resolver) (map[file.Coordinates]file.E
 			log.WithFields("error", err).Warnf("unable to get file contents for %q", loc.RealPath)
 			continue
 		}
-		exec, err := processExecutable(loc, reader.(unionreader.UnionReader))
+
+		uReader, err := unionreader.GetUnionReader(reader)
+		if err != nil {
+			// TODO: known-unknowns
+			log.WithFields("error", err).Warnf("unable to get union reader for %q", loc.RealPath)
+			continue
+		}
+
+		exec, err := processExecutable(loc, uReader)
 		if err != nil {
 			log.WithFields("error", err).Warnf("unable to process executable %q", loc.RealPath)
 		}

diff --git a/syft/internal/unionreader/union_reader.go b/syft/internal/unionreader/union_reader.go
@@ -9,7 +9,7 @@ import (
 	"github.com/anchore/syft/internal/log"
 )
 
-// unionReader is a single interface with all reading functions needed by multi-arch binary catalogers
+// UnionReader is a single interface with all reading functions needed by multi-arch binary catalogers
 // cataloger.
 type UnionReader interface {
 	io.Reader
@@ -18,7 +18,7 @@ type UnionReader interface {
 	io.Closer
 }
 
-// getReaders extracts one or more io.ReaderAt objects representing binaries that can be processed (multiple binaries in the case for multi-architecture binaries).
+// GetReaders extracts one or more io.ReaderAt objects representing binaries that can be processed (multiple binaries in the case for multi-architecture binaries).
 func GetReaders(f UnionReader) ([]io.ReaderAt, error) {
 	if macho.IsUniversalMachoBinary(f) {
 		machoReaders, err := macho.ExtractReaders(f)