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

fix: go version not properly identified in binary (#1384)

Browse Source
This commit is contained in:
Keith Zantow 2022-12-02 13:24:36 -05:00 committed by GitHub
parent 247b054ab5
commit 614ea00905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/spdxlicense/license_list.go
View File

@ -1,9 +1,9 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at 2022-10-14 11:46:16.097525 -0400 EDT m=+0.276930979 // This file was generated by robots at 2022-12-02 12:51:33.814385 -0500 EST m=+1.688731869
// using data from https://spdx.org/licenses/licenses.json // using data from https://spdx.org/licenses/licenses.json
package spdxlicense package spdxlicense
const Version = "3.18" const Version = "3.19"
var licenseIDs = map[string]string{ var licenseIDs = map[string]string{
"0bsd": "0BSD", "0bsd": "0BSD",
@ -372,6 +372,7 @@ var licenseIDs = map[string]string{
"cern-ohl-w-2": "CERN-OHL-W-2.0", "cern-ohl-w-2": "CERN-OHL-W-2.0",
"cern-ohl-w-2.0": "CERN-OHL-W-2.0", "cern-ohl-w-2.0": "CERN-OHL-W-2.0",
"cern-ohl-w-2.0.0": "CERN-OHL-W-2.0", "cern-ohl-w-2.0.0": "CERN-OHL-W-2.0",
"checkmk": "checkmk",
"clartistic": "ClArtistic", "clartistic": "ClArtistic",
"cnri-jython": "CNRI-Jython", "cnri-jython": "CNRI-Jython",
"cnri-python": "CNRI-Python", "cnri-python": "CNRI-Python",
@ -470,6 +471,7 @@ var licenseIDs = map[string]string{
"fsfap": "FSFAP", "fsfap": "FSFAP",
"fsful": "FSFUL", "fsful": "FSFUL",
"fsfullr": "FSFULLR", "fsfullr": "FSFULLR",
"fsfullrwd": "FSFULLRWD",
"ftl": "FTL", "ftl": "FTL",
"gd": "GD", "gd": "GD",
"gfdl-1": "GFDL-1.1-only", "gfdl-1": "GFDL-1.1-only",
@ -617,6 +619,7 @@ var licenseIDs = map[string]string{
"jasper-2.0.0": "JasPer-2.0", "jasper-2.0.0": "JasPer-2.0",
"jpnic": "JPNIC", "jpnic": "JPNIC",
"json": "JSON", "json": "JSON",
"knuth-ctan": "Knuth-CTAN",
"lal-1": "LAL-1.2", "lal-1": "LAL-1.2",
"lal-1.2": "LAL-1.2", "lal-1.2": "LAL-1.2",
"lal-1.2.0": "LAL-1.2", "lal-1.2.0": "LAL-1.2",
@ -665,6 +668,7 @@ var licenseIDs = map[string]string{
"libselinux-1.0": "libselinux-1.0", "libselinux-1.0": "libselinux-1.0",
"libselinux-1.0.0": "libselinux-1.0", "libselinux-1.0.0": "libselinux-1.0",
"libtiff": "libtiff", "libtiff": "libtiff",
"libutil-david-nugent": "libutil-David-Nugent",
"liliq-p-1": "LiLiQ-P-1.1", "liliq-p-1": "LiLiQ-P-1.1",
"liliq-p-1.1": "LiLiQ-P-1.1", "liliq-p-1.1": "LiLiQ-P-1.1",
"liliq-p-1.1.0": "LiLiQ-P-1.1", "liliq-p-1.1.0": "LiLiQ-P-1.1",
@ -984,7 +988,7 @@ var licenseIDs = map[string]string{
"sspl-1": "SSPL-1.0", "sspl-1": "SSPL-1.0",
"sspl-1.0": "SSPL-1.0", "sspl-1.0": "SSPL-1.0",
"sspl-1.0.0": "SSPL-1.0", "sspl-1.0.0": "SSPL-1.0",
"standardml-nj": "StandardML-NJ", "standardml-nj": "SMLNJ",
"sugarcrm-1": "SugarCRM-1.1.3", "sugarcrm-1": "SugarCRM-1.1.3",
"sugarcrm-1.1": "SugarCRM-1.1.3", "sugarcrm-1.1": "SugarCRM-1.1.3",
"sugarcrm-1.1.3": "SugarCRM-1.1.3", "sugarcrm-1.1.3": "SugarCRM-1.1.3",

7
syft/pkg/cataloger/binary/classifier.go
View File

@ -91,6 +91,12 @@ func fileNameTemplateVersionMatcher(fileNamePattern string, contentTemplate stri
} }
} }
func patternEndingWithNull(pattern string) string {
bytes := []byte(pattern)
bytes = append(bytes, 0)
return string(bytes)
}
func fileContentsVersionMatcher(pattern string) evidenceMatcher { func fileContentsVersionMatcher(pattern string) evidenceMatcher {
pat := regexp.MustCompile(pattern) pat := regexp.MustCompile(pattern)
return func(classifier classifier, reader source.LocationReadCloser) ([]pkg.Package, error) { return func(classifier classifier, reader source.LocationReadCloser) ([]pkg.Package, error) {
@ -130,6 +136,7 @@ func singlePackage(classifier classifier, reader source.LocationReadCloser, vers
Locations: source.NewLocationSet(reader.Location), Locations: source.NewLocationSet(reader.Location),
Type: pkg.BinaryPkg, Type: pkg.BinaryPkg,
CPEs: cpes, CPEs: cpes,
FoundBy: catalogerName,
MetadataType: pkg.BinaryMetadataType, MetadataType: pkg.BinaryMetadataType,
Metadata: pkg.BinaryMetadata{ Metadata: pkg.BinaryMetadata{
Classifier: classifier.Class, Classifier: classifier.Class,

5
syft/pkg/cataloger/binary/default_classifiers.go
View File

@ -29,9 +29,10 @@ var defaultClassifiers = []classifier{
{ {
Class: "go-binary", Class: "go-binary",
FileGlob: "**/go", FileGlob: "**/go",
EvidenceMatcher: fileContentsVersionMatcher( EvidenceMatcher: fileContentsVersionMatcher(patternEndingWithNull(
`(?m)go(?P<version>[0-9]+\.[0-9]+(\.[0-9]+|beta[0-9]+|alpha[0-9]+|rc[0-9]+)?)`), `(?m)go(?P<version>[0-9]+\.[0-9]+(\.[0-9]+|beta[0-9]+|alpha[0-9]+|rc[0-9]+)?)`)),
Package: "go", Package: "go",
CPEs: singleCPE("cpe:2.3:a:golang:go:*:*:*:*:*:*:*:*"),
}, },
{ {
Class: "nodejs-binary", Class: "nodejs-binary",

BIN
syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/go
View File

Binary file not shown.