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

Fix RPM DB license handling (#1184)

Browse Source
This commit is contained in:
Keith Zantow 2022-08-30 14:38:12 -04:00 committed by GitHub
parent ccc5a89226
commit a17ff7b555
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/formats/common/spdxhelpers/to_syft_model.go
View File

@ -322,13 +322,17 @@ func extractMetadata(p *spdx.Package2_2, info pkgInfo) (pkg.MetadataType, interf
} else {
epoch = &converted
}
license := p.PackageLicenseDeclared
if license == "" {
license = p.PackageLicenseConcluded
}
return pkg.RpmdbMetadataType, pkg.RpmdbMetadata{
Name: p.PackageName,
Version: p.PackageVersion,
Epoch: epoch,
Arch: arch,
SourceRpm: upstreamValue,
License: p.PackageLicenseConcluded,
License: license,
Vendor: p.PackageOriginatorOrganization,
}
case pkg.DebPkg:

4
syft/pkg/cataloger/rpmdb/parse_rpmdb.go
View File

@ -92,6 +92,10 @@ func newPkg(resolver source.FilePathResolver, dbLocation source.Location, entry
Metadata: metadata,
}
if entry.License != "" {
p.Licenses = append(p.Licenses, entry.License)
}
p.SetID()
return &p, nil
}

2
syft/pkg/cataloger/rpmdb/parse_rpmdb_test.go
View File

@ -75,6 +75,7 @@ func TestParseRpmDB(t *testing.T) {
FoundBy: catalogerName,
Type: pkg.RpmPkg,
MetadataType: pkg.RpmdbMetadataType,
Licenses: []string{"MIT"},
Metadata: pkg.RpmdbMetadata{
Name: "dive",
Epoch: nil,
@ -102,6 +103,7 @@ func TestParseRpmDB(t *testing.T) {
FoundBy: catalogerName,
Type: pkg.RpmPkg,
MetadataType: pkg.RpmdbMetadataType,
Licenses: []string{"MIT"},
Metadata: pkg.RpmdbMetadata{
Name: "dive",
Epoch: nil,