Skip to content

fix: select fixes based on constraints instead of any fix version #3287

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

Draft
kzantow wants to merge 2 commits into
base: main
Choose a base branch
from
+16 −18
Draft

fix: select fixes based on constraints instead of any fix version #3287

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
dcf3a90
fix: select fixes based on constraints instead of any fix version
kzantow Mar 16, 2026
cd7d9b1
Merge remote-tracking branch 'upstream/main' into fix/search-by-fix-v…
kzantow Apr 8, 2026
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
18 changes: 8 additions & 10 deletions grype/search/version_constraint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,16 @@ func ByFixedVersion(v version.Version) vulnerability.Criteria {
return &funcCriteria{
func(vuln vulnerability.Vulnerability) (bool, string, error) {
var err error
if vuln.Fix.State != vulnerability.FixStateFixed {
if vuln.Fix.State != vulnerability.FixStateFixed || vuln.Constraint == nil {
return false, "", nil
}
for _, fixVersion := range vuln.Fix.Versions {
cmp, e := version.New(fixVersion, v.Format).Compare(&v)
if e != nil {
err = e
}
if cmp <= 0 {
// fix version is less than or equal to the provided version, so is considered fixed
return true, fmt.Sprintf("fix version %v is less than %v", v, fixVersion), err
}
constraintSatisified, err := vuln.Constraint.Satisfied(&v)
if err != nil {
return false, "", err
}
if !constraintSatisified {
// v does not fall within the vulnerable constraints
return true, "is fixed", err
}
return false, "", err
},
Expand Down
16 changes: 8 additions & 8 deletions grype/search/version_constraint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ func Test_ByFixedVersion(t *testing.T) {
name: "fixed version is lower",
version: "1.1.0",
input: vulnerability.Vulnerability{
Constraint: version.MustGetConstraint("< 1.0.0", version.SemanticFormat),
Fix: vulnerability.Fix{
Versions: []string{"1.0.0"},
State: vulnerability.FixStateFixed,
State: vulnerability.FixStateFixed,
},
},
matches: true,
Expand All @@ -123,9 +123,9 @@ func Test_ByFixedVersion(t *testing.T) {
name: "fixed version is equal",
version: "1.1.0",
input: vulnerability.Vulnerability{
Constraint: version.MustGetConstraint("< 1.1.0", version.SemanticFormat),
Fix: vulnerability.Fix{
Versions: []string{"1.1.0"},
State: vulnerability.FixStateFixed,
State: vulnerability.FixStateFixed,
},
},
matches: true,
Expand All @@ -134,9 +134,9 @@ func Test_ByFixedVersion(t *testing.T) {
name: "one of multiple fix versions matches",
version: "1.1.0",
input: vulnerability.Vulnerability{
Constraint: version.MustGetConstraint(" < 1.0.0 || > 1.1.0, < 1.2.0", version.SemanticFormat),
Fix: vulnerability.Fix{
Versions: []string{"1.0.0", "1.2.0"},
State: vulnerability.FixStateFixed,
State: vulnerability.FixStateFixed,
},
},
matches: true,
Expand All @@ -145,9 +145,9 @@ func Test_ByFixedVersion(t *testing.T) {
name: "fixed version is higher",
version: "1.1.0",
input: vulnerability.Vulnerability{
Constraint: version.MustGetConstraint("< 1.2.0", version.SemanticFormat),
Fix: vulnerability.Fix{
Versions: []string{"1.2.0"},
State: vulnerability.FixStateFixed,
State: vulnerability.FixStateFixed,
},
},
matches: false,
Expand Down
Loading