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: update cataloger to check for expressions before split (#1819)

Browse Source 
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
This commit is contained in:
Christopher Angelo Phillips 2023-05-16 12:04:28 -04:00 committed by GitHub
parent 42fa9e4965
commit 1a2a49840b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syft/pkg/cataloger/apkdb/package.go
View File

@ -4,13 +4,20 @@ import (
"strings" "strings"
"github.com/anchore/packageurl-go" "github.com/anchore/packageurl-go"
"github.com/anchore/syft/syft/license"
"github.com/anchore/syft/syft/linux" "github.com/anchore/syft/syft/linux"
"github.com/anchore/syft/syft/pkg" "github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/source" "github.com/anchore/syft/syft/source"
) )
func newPackage(d parsedData, release *linux.Release, dbLocation source.Location) pkg.Package { func newPackage(d parsedData, release *linux.Release, dbLocation source.Location) pkg.Package {
licenseStrings := strings.Split(d.License, " ") // check if license is a valid spdx expression before splitting
licenseStrings := []string{d.License}
_, err := license.ParseExpression(d.License)
if err != nil {
// invalid so update to split on space
licenseStrings = strings.Split(d.License, " ")
}
p := pkg.Package{ p := pkg.Package{
Name: d.Package, Name: d.Package,

2
syft/pkg/cataloger/apkdb/parse_apk_db_test.go
View File

@ -701,7 +701,7 @@ func TestMultiplePackages(t *testing.T) {
Name: "libc-utils", Name: "libc-utils",
Version: "0.7.2-r0", Version: "0.7.2-r0",
Licenses: pkg.NewLicenseSet( Licenses: pkg.NewLicenseSet(
pkg.NewLicenseFromLocations("BSD", location), pkg.NewLicenseFromLocations("MPL-2.0 AND MIT", location),
), ),
Type: pkg.ApkPkg, Type: pkg.ApkPkg,
PURL: "pkg:apk/alpine/libc-utils@0.7.2-r0?arch=x86_64&upstream=libc-dev&distro=alpine-3.12", PURL: "pkg:apk/alpine/libc-utils@0.7.2-r0?arch=x86_64&upstream=libc-dev&distro=alpine-3.12",

2
syft/pkg/cataloger/apkdb/test-fixtures/multiple
View File

@ -6,7 +6,7 @@ S:1175
I:4096 I:4096
T:Meta package to pull in correct libc T:Meta package to pull in correct libc
U:http://alpinelinux.org U:http://alpinelinux.org
L:BSD L:MPL-2.0 AND MIT
o:libc-dev o:libc-dev
m:Natanael Copa <ncopa@alpinelinux.org> m:Natanael Copa <ncopa@alpinelinux.org>
t:1575749004 t:1575749004