Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: break assumption that syft cpe.CPE is wfn.Attributes #1675

Merged
merged 2 commits into from
Jan 25, 2024
Merged

chore: break assumption that syft cpe.CPE is wfn.Attributes #1675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b484914
chore: break assumption that syft cpe.CPE is wfn.Attributes
willmurphyscode Jan 24, 2024
0ac58df
chore: fix linter
willmurphyscode Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions grype/cpe/cpe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package cpe

import (
"github.com/facebookincubator/nvdtools/wfn"

"github.com/anchore/grype/internal/log"
"github.com/anchore/syft/syft/cpe"
)
Expand All @@ -21,9 +23,10 @@ func NewSlice(cpeStrs ...string) ([]cpe.CPE, error) {

func MatchWithoutVersion(c cpe.CPE, candidates []cpe.CPE) []cpe.CPE {
matches := make([]cpe.CPE, 0)
a := wfn.Attributes(c) // nolint:unconvert // TODO: remove nolint when syft upgrade in grype
for _, candidate := range candidates {
canCopy := candidate
if c.MatchWithoutVersion(&canCopy) {
canCopy := wfn.Attributes(candidate) // nolint:unconvert // TODO: remove nolint when syft upgrade in grype
if a.MatchWithoutVersion(&canCopy) {
matches = append(matches, candidate)
}
}
Expand Down
3 changes: 1 addition & 2 deletions grype/pkg/purl_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"os"
"strings"

"github.com/facebookincubator/nvdtools/wfn"
"github.com/mitchellh/go-homedir"

"github.com/anchore/packageurl-go"
Expand Down Expand Up @@ -53,7 +52,7 @@ func decodePurlFile(reader io.Reader) ([]Package, error) {
return nil, fmt.Errorf("unable to decode purl %s: %w", rawLine, err)
}

cpes := []wfn.Attributes{}
cpes := []cpe.CPE{}
epoch := "0"
for _, qualifier := range purl.Qualifiers {
if qualifier.Key == cpesQualifierKey {
Expand Down
12 changes: 3 additions & 9 deletions test/integration/match_by_image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"strings"
"testing"

"github.com/facebookincubator/nvdtools/wfn"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/stretchr/testify/require"
Expand All @@ -23,6 +22,7 @@ import (
"github.com/anchore/stereoscope/pkg/imagetest"
"github.com/anchore/syft/syft"
"github.com/anchore/syft/syft/cataloging/pkgcataloging"
"github.com/anchore/syft/syft/cpe"
"github.com/anchore/syft/syft/linux"
syftPkg "github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/source"
Expand Down Expand Up @@ -142,7 +142,6 @@ func addPythonMatches(t *testing.T, theSource source.Source, catalog *syftPkg.Co
require.NoError(t, err)

theResult.Add(match.Match{

Vulnerability: *vulnObj,
Package: thePkg,
Details: []match.Detail{
Expand Down Expand Up @@ -183,7 +182,6 @@ func addDotnetMatches(t *testing.T, theSource source.Source, catalog *syftPkg.Co
require.NoError(t, err)

theResult.Add(match.Match{

Vulnerability: *vulnObj,
Package: thePkg,
Details: []match.Detail{
Expand Down Expand Up @@ -220,7 +218,6 @@ func addRubyMatches(t *testing.T, theSource source.Source, catalog *syftPkg.Coll
require.NoError(t, err)

theResult.Add(match.Match{

Vulnerability: *vulnObj,
Package: thePkg,
Details: []match.Detail{
Expand Down Expand Up @@ -363,7 +360,6 @@ func addDpkgMatches(t *testing.T, theSource source.Source, catalog *syftPkg.Coll
require.NoError(t, err)

theResult.Add(match.Match{

Vulnerability: *vulnObj,
Package: thePkg,
Details: []match.Detail{
Expand Down Expand Up @@ -442,7 +438,6 @@ func addRhelMatches(t *testing.T, theSource source.Source, catalog *syftPkg.Coll
require.NoError(t, err)

theResult.Add(match.Match{

Vulnerability: *vulnObj,
Package: thePkg,
Details: []match.Detail{
Expand Down Expand Up @@ -764,7 +759,6 @@ func TestMatchByImage(t *testing.T) {

t.Log(cmp.Diff(defs, obs))
}

}

// testIgnoredMatches returns an list of ignored matches to test the vex
Expand All @@ -783,7 +777,7 @@ func testIgnoredMatches() []match.IgnoredMatch {
Version: "0.9.9",
Licenses: []string{"GPL-2.0-or-later"},
Type: "apk",
CPEs: []wfn.Attributes{
CPEs: []cpe.CPE{
{
Part: "a",
Vendor: "libvncserver",
Expand Down Expand Up @@ -858,7 +852,7 @@ func vexMatches(t *testing.T, ignoredMatches []match.IgnoredMatch, vexStatus vex

func assertMatches(t *testing.T, expected, actual []match.Match) {
t.Helper()
var opts = []cmp.Option{
opts := []cmp.Option{
cmpopts.IgnoreFields(vulnerability.Vulnerability{}, "Constraint"),
cmpopts.IgnoreFields(pkg.Package{}, "Locations"),
cmpopts.SortSlices(func(a, b match.Match) bool {
Expand Down