Mirrors/grype
2
0
Fork 0
mirror of https://github.com/anchore/grype synced 2024-11-10 06:34:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove jvm matcher

Browse source 
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
This commit is contained in:
Alex Goodman 2024-09-18 09:48:13 -04:00
parent 8f38ac0528
commit d997b31f77
7 changed files with 5 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/grype/cli/commands/root.go
View file

@ -22,7 +22,6 @@ import (
"github.com/anchore/grype/grype/matcher/golang"
"github.com/anchore/grype/grype/matcher/java"
"github.com/anchore/grype/grype/matcher/javascript"
"github.com/anchore/grype/grype/matcher/jvm"
"github.com/anchore/grype/grype/matcher/python"
"github.com/anchore/grype/grype/matcher/ruby"
"github.com/anchore/grype/grype/matcher/stock"
@ -286,9 +285,6 @@ func getMatchers(opts *options.Grype) []matcher.Matcher {
ExternalSearchConfig: opts.ExternalSources.ToJavaMatcherConfig(),
UseCPEs: opts.Match.Java.UseCPEs,
},
JVM: jvm.MatcherConfig{
UseCPEs: opts.Match.JVM.UseCPEs,
},
Ruby: ruby.MatcherConfig(opts.Match.Ruby),
Python: python.MatcherConfig(opts.Match.Python),
Dotnet: dotnet.MatcherConfig(opts.Match.Dotnet),

2
grype/match/matcher_type.go
View file

@ -16,7 +16,6 @@ const (
GoModuleMatcher MatcherType = "go-module-matcher"
OpenVexMatcher MatcherType = "openvex-matcher"
RustMatcher MatcherType = "rust-matcher"
JVMMatcher MatcherType = "jvm-matcher"
)
var AllMatcherTypes = []MatcherType{
@ -33,7 +32,6 @@ var AllMatcherTypes = []MatcherType{
GoModuleMatcher,
OpenVexMatcher,
RustMatcher,
JVMMatcher,
}
type MatcherType string

51
grype/matcher/jvm/matcher.go
View file

@ -1,51 +0,0 @@
package jvm
import (
"fmt"
"github.com/anchore/grype/grype/distro"
"github.com/anchore/grype/grype/match"
"github.com/anchore/grype/grype/pkg"
"github.com/anchore/grype/grype/search"
"github.com/anchore/grype/grype/vulnerability"
syftPkg "github.com/anchore/syft/syft/pkg"
)
type MatcherConfig struct {
UseCPEs bool
}
type Matcher struct {
cfg MatcherConfig
}
func NewJVMMatcher(cfg MatcherConfig) *Matcher {
return &Matcher{
cfg: cfg,
}
}
func (m *Matcher) PackageTypes() []syftPkg.Type {
return []syftPkg.Type{syftPkg.BinaryPkg}
}
func (m *Matcher) Type() match.MatcherType {
return match.JVMMatcher
}
func (m *Matcher) Match(store vulnerability.Provider, d *distro.Distro, p pkg.Package) ([]match.Match, error) {
if !pkg.IsJvmPackage(p) {
return nil, nil
}
criteria := search.CommonCriteria
if m.cfg.UseCPEs {
criteria = append(criteria, search.ByCPE)
}
matches, err := search.ByCriteria(store, d, p, m.Type(), criteria...)
if err != nil {
return nil, fmt.Errorf("failed to match by exact package: %w", err)
}
return matches, nil
}

3
grype/matcher/matchers.go
View file

@ -7,7 +7,6 @@ import (
"github.com/anchore/grype/grype/matcher/golang"
"github.com/anchore/grype/grype/matcher/java"
"github.com/anchore/grype/grype/matcher/javascript"
"github.com/anchore/grype/grype/matcher/jvm"
"github.com/anchore/grype/grype/matcher/msrc"
"github.com/anchore/grype/grype/matcher/portage"
"github.com/anchore/grype/grype/matcher/python"
@ -20,7 +19,6 @@ import (
// Config contains values used by individual matcher structs for advanced configuration
type Config struct {
Java java.MatcherConfig
JVM jvm.MatcherConfig
Ruby ruby.MatcherConfig
Python python.MatcherConfig
Dotnet dotnet.MatcherConfig
@ -38,7 +36,6 @@ func NewDefaultMatchers(mc Config) []Matcher {
dotnet.NewDotnetMatcher(mc.Dotnet),
&rpm.Matcher{},
java.NewJavaMatcher(mc.Java),
jvm.NewJVMMatcher(mc.JVM),
javascript.NewJavascriptMatcher(mc.Javascript),
&apk.Matcher{},
golang.NewGolangMatcher(mc.Golang),

8
grype/matcher/stock/matcher.go
View file

@ -32,17 +32,9 @@ func (m *Matcher) Type() match.MatcherType {
}
func (m *Matcher) Match(store vulnerability.Provider, d *distro.Distro, p pkg.Package) ([]match.Match, error) {
if !inboundsForMatcher(p) {
return nil, nil
}
criteria := search.CommonCriteria
if m.cfg.UseCPEs {
criteria = append(criteria, search.ByCPE)
}
return search.ByCriteria(store, d, p, m.Type(), criteria...)
}
func inboundsForMatcher(p pkg.Package) bool {
return !pkg.IsJvmPackage(p)
}

7
grype/matcher/jvm/matcher_test.go → grype/matcher/stock/matcher_test.go
View file

@ -1,4 +1,4 @@
package jvm
package stock
import (
"testing"
@ -17,7 +17,7 @@ import (
syftPkg "github.com/anchore/syft/syft/pkg"
)
func TestMatcher(t *testing.T) {
func TestMatcher_JVMPackage(t *testing.T) {
p := pkg.Package{
ID: pkg.ID(uuid.NewString()),
Name: "java_se",
@ -33,7 +33,8 @@ func TestMatcher(t *testing.T) {
},
}
store := newMockProvider()
actual, _ := matcher.Match(store, nil, p)
actual, err := matcher.Match(store, nil, p)
require.NoError(t, err)
foundCVEs := strset.New()
for _, v := range actual {

6
test/integration/match_by_image_test.go
View file

@ -18,7 +18,6 @@ import (
"github.com/anchore/grype/grype/matcher/golang"
"github.com/anchore/grype/grype/matcher/java"
"github.com/anchore/grype/grype/matcher/javascript"
"github.com/anchore/grype/grype/matcher/jvm"
"github.com/anchore/grype/grype/matcher/python"
"github.com/anchore/grype/grype/matcher/ruby"
"github.com/anchore/grype/grype/matcher/rust"
@ -588,7 +587,7 @@ func addJvmMatches(t *testing.T, theSource source.Source, catalog *syftPkg.Colle
"cpe:2.3:a:oracle:jdk:*:*:*:*:*:*:*:*",
},
},
Matcher: match.JVMMatcher,
Matcher: match.StockMatcher,
},
},
})
@ -738,9 +737,6 @@ func TestMatchByImage(t *testing.T) {
Java: java.MatcherConfig{
UseCPEs: true,
},
JVM: jvm.MatcherConfig{
UseCPEs: true,
},
Ruby: ruby.MatcherConfig{
UseCPEs: true,
},