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

Merge pull request #263 from anchore/add-source-to-rpmdb-cataloger

Browse Source 
Add source to packages found by RPMdb cataloger
This commit is contained in:
Alex Goodman 2020-11-12 09:36:20 -05:00 committed by GitHub
commit dad1d9691c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
syft/cataloger/rpmdb/cataloger.go
View File

@ -35,15 +35,15 @@ func (c *Cataloger) Catalog(resolver scope.Resolver) ([]pkg.Package, error) {
} }
var pkgs []pkg.Package var pkgs []pkg.Package
for _, ref := range fileMatches { for _, dbRef := range fileMatches {
dbContents, err := resolver.FileContentsByRef(ref) dbContents, err := resolver.FileContentsByRef(dbRef)
if err != nil { if err != nil {
return nil, err return nil, err
} }
pkgs, err = parseRpmDB(resolver, strings.NewReader(dbContents)) pkgs, err = parseRpmDB(resolver, dbRef, strings.NewReader(dbContents))
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to catalog rpmdb package=%+v: %w", ref.Path, err) return nil, fmt.Errorf("unable to catalog rpmdb package=%+v: %w", dbRef.Path, err)
} }
} }
return pkgs, nil return pkgs, nil

3
syft/cataloger/rpmdb/parse_rpmdb.go
View File

@ -17,7 +17,7 @@ import (
) )
// parseApkDb parses an "Packages" RPM DB and returns the Packages listed within it. // parseApkDb parses an "Packages" RPM DB and returns the Packages listed within it.
func parseRpmDB(resolver scope.FileResolver, reader io.Reader) ([]pkg.Package, error) { func parseRpmDB(resolver scope.FileResolver, dbRef file.Reference, reader io.Reader) ([]pkg.Package, error) {
f, err := ioutil.TempFile("", internal.ApplicationName+"-rpmdb") f, err := ioutil.TempFile("", internal.ApplicationName+"-rpmdb")
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create temp rpmdb file: %w", err) return nil, fmt.Errorf("failed to create temp rpmdb file: %w", err)
@ -57,6 +57,7 @@ func parseRpmDB(resolver scope.FileResolver, reader io.Reader) ([]pkg.Package, e
Name: entry.Name, Name: entry.Name,
Version: fmt.Sprintf("%s-%s", entry.Version, entry.Release), // this is what engine does Version: fmt.Sprintf("%s-%s", entry.Version, entry.Release), // this is what engine does
//Version: fmt.Sprintf("%d:%s-%s.%s", entry.Epoch, entry.Version, entry.Release, entry.Arch), //Version: fmt.Sprintf("%d:%s-%s.%s", entry.Epoch, entry.Version, entry.Release, entry.Arch),
Source: []file.Reference{dbRef},
Type: pkg.RpmPkg, Type: pkg.RpmPkg,
MetadataType: pkg.RpmdbMetadataType, MetadataType: pkg.RpmdbMetadataType,
Metadata: pkg.RpmdbMetadata{ Metadata: pkg.RpmdbMetadata{

6
syft/cataloger/rpmdb/parse_rpmdb_test.go
View File

@ -41,6 +41,8 @@ func (r *rpmdbTestFileResolverMock) RelativeFileByPath(file.Reference, string) (
} }
func TestParseRpmDB(t *testing.T) { func TestParseRpmDB(t *testing.T) {
dbRef := file.NewFileReference("test-path")
tests := []struct { tests := []struct {
fixture string fixture string
expected map[string]pkg.Package expected map[string]pkg.Package
@ -54,6 +56,7 @@ func TestParseRpmDB(t *testing.T) {
"dive": { "dive": {
Name: "dive", Name: "dive",
Version: "0.9.2-1", Version: "0.9.2-1",
Source: []file.Reference{dbRef},
Type: pkg.RpmPkg, Type: pkg.RpmPkg,
MetadataType: pkg.RpmdbMetadataType, MetadataType: pkg.RpmdbMetadataType,
Metadata: pkg.RpmdbMetadata{ Metadata: pkg.RpmdbMetadata{
@ -79,6 +82,7 @@ func TestParseRpmDB(t *testing.T) {
"dive": { "dive": {
Name: "dive", Name: "dive",
Version: "0.9.2-1", Version: "0.9.2-1",
Source: []file.Reference{dbRef},
Type: pkg.RpmPkg, Type: pkg.RpmPkg,
MetadataType: pkg.RpmdbMetadataType, MetadataType: pkg.RpmdbMetadataType,
Metadata: pkg.RpmdbMetadata{ Metadata: pkg.RpmdbMetadata{
@ -114,7 +118,7 @@ func TestParseRpmDB(t *testing.T) {
fileResolver := newTestFileResolver(test.ignorePaths) fileResolver := newTestFileResolver(test.ignorePaths)
actual, err := parseRpmDB(fileResolver, fixture) actual, err := parseRpmDB(fileResolver, dbRef, fixture)
if err != nil { if err != nil {
t.Fatalf("failed to parse rpmdb: %+v", err) t.Fatalf("failed to parse rpmdb: %+v", err)
} }