oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-02-14 19:46:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #332 from westonsteimel/detect-distroless-packages

Browse Source 
allow ability to catalog packages from /var/lib/dpkg/status.d/
This commit is contained in:
Alex Goodman 2021-03-09 10:37:22 -05:00 committed by GitHub
commit 8c4370b7cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
syft/cataloger/deb/cataloger.go
View File

@ -38,6 +38,7 @@ func (c *Cataloger) Catalog(resolver source.Resolver) ([]pkg.Package, error) {
return nil, fmt.Errorf("failed to find dpkg status files's by glob: %w", err) return nil, fmt.Errorf("failed to find dpkg status files's by glob: %w", err)
} }
var results []pkg.Package
var pkgs []pkg.Package var pkgs []pkg.Package
for _, dbLocation := range dbFileMatches { for _, dbLocation := range dbFileMatches {
dbContents, err := resolver.FileContentsByLocation(dbLocation) dbContents, err := resolver.FileContentsByLocation(dbLocation)
@ -94,8 +95,10 @@ func (c *Cataloger) Catalog(resolver source.Resolver) ([]pkg.Package, error) {
} }
} }
} }
results = append(results, pkgs...)
} }
return pkgs, nil return results, nil
} }
func fetchMd5Contents(resolver source.Resolver, dbLocation source.Location, pkgs []pkg.Package) (map[string]io.Reader, map[string]source.Location, error) { func fetchMd5Contents(resolver source.Resolver, dbLocation source.Location, pkgs []pkg.Package) (map[string]io.Reader, map[string]source.Location, error) {

2
syft/pkg/dpkg_metadata.go
View File

@ -8,7 +8,7 @@ import (
"github.com/scylladb/go-set/strset" "github.com/scylladb/go-set/strset"
) )
const DpkgDbGlob = "**/var/lib/dpkg/status" const DpkgDbGlob = "**/var/lib/dpkg/{status,status.d/**}"
var _ fileOwner = (*DpkgMetadata)(nil) var _ fileOwner = (*DpkgMetadata)(nil)

2
test/integration/pkg_cases_test.go
View File

@ -145,6 +145,8 @@ var commonTestCases = []testCase{
pkgType: pkg.DebPkg, pkgType: pkg.DebPkg,
pkgInfo: map[string]string{ pkgInfo: map[string]string{
"apt": "1.8.2", "apt": "1.8.2",
"dash": "0.5.8-2.4",
"netbase": "5.4",
}, },
}, },
{ {

18
test/integration/test-fixtures/image-pkg-coverage/var/lib/dpkg/status.d/dash Normal file
View File

@ -0,0 +1,18 @@
Package: dash
Version: 0.5.8-2.4
Architecture: amd64
Essential: yes
Maintainer: Gerrit Pape <pape@smarden.org>
Installed-Size: 204
Pre-Depends: libc6 (>= 2.14)
Depends: debianutils (>= 2.15), dpkg (>= 1.15.0)
Section: shells
Priority: required
Homepage: http://gondor.apana.org.au/~herbert/dash/
Description: POSIX-compliant shell
The Debian Almquist Shell (dash) is a POSIX-compliant shell derived
from ash.
.
Since it executes scripts faster than bash, and has fewer library
dependencies (making it more robust against software or hardware
failures), it is used as the default system shell on Debian systems.

11
test/integration/test-fixtures/image-pkg-coverage/var/lib/dpkg/status.d/netbase Normal file
View File

@ -0,0 +1,11 @@
Package: netbase
Version: 5.4
Architecture: all
Maintainer: Marco d'Itri <md@linux.it>
Installed-Size: 44
Section: admin
Priority: important
Multi-Arch: foreign
Description: Basic TCP/IP networking system
This package provides the necessary infrastructure for basic TCP/IP based
networking.