Skip to content

fix(nodejs): don't use prerelease logic for compare npm constraints #9208

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

Merged
merged 3 commits into from
Jul 17, 2025
Merged

fix(nodejs): don't use prerelease logic for compare npm constraints #9208

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f75daa3
chore(deps): bump go-npm-version
DmitriyLewen Jul 16, 2025
c4f33ca
fix(npm): use WithPreRelease:
DmitriyLewen Jul 16, 2025
1fce1f3
chore(deps): bump go-npm-version to v0.0.2
DmitriyLewen Jul 17, 2025
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/apparentlymart/go-cidr v1.1.0
github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986
github.com/aquasecurity/go-gem-version v0.0.0-20201115065557-8eed6fe000ce
github.com/aquasecurity/go-npm-version v0.0.1
github.com/aquasecurity/go-npm-version v0.0.2-0.20250716070109-f686488af083
Copy link
Contributor Author

@DmitriyLewen DmitriyLewen Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we want to cut v0.0.2 version

Copy link
Collaborator

@knqyf263 knqyf263 Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done https://github.com/aquasecurity/go-npm-version/releases/tag/v0.0.2

github.com/aquasecurity/go-pep440-version v0.0.1
github.com/aquasecurity/go-version v0.0.1
github.com/aquasecurity/iamgo v0.0.10
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,8 @@ github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986 h1:2a30
github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986/go.mod h1:NT+jyeCzXk6vXR5MTkdn4z64TgGfE5HMLC8qfj5unl8=
github.com/aquasecurity/go-gem-version v0.0.0-20201115065557-8eed6fe000ce h1:QgBRgJvtEOBtUXilDb1MLi1p1MWoyFDXAu5DEUl5nwM=
github.com/aquasecurity/go-gem-version v0.0.0-20201115065557-8eed6fe000ce/go.mod h1:HXgVzOPvXhVGLJs4ZKO817idqr/xhwsTcj17CLYY74s=
github.com/aquasecurity/go-npm-version v0.0.1 h1:2i/MM+A4KI8AJrqJa/Cwsa4qyljA8S/qngPyQiIVHcA=
github.com/aquasecurity/go-npm-version v0.0.1/go.mod h1:hxbJZtKlO4P8sZ9nztizR6XLoE33O+BkPmuYQ4ACyz0=
github.com/aquasecurity/go-npm-version v0.0.2-0.20250716070109-f686488af083 h1:/x8/8BP79pW+8ZApxKuZjSXyWwSxxjbzuCh/599rexQ=
github.com/aquasecurity/go-npm-version v0.0.2-0.20250716070109-f686488af083/go.mod h1:DXyKqRe2yb83peANMjQr8dGDkHanEgoFv8BOQdWlSUQ=
github.com/aquasecurity/go-pep440-version v0.0.1 h1:8VKKQtH2aV61+0hovZS3T//rUF+6GDn18paFTVS0h0M=
github.com/aquasecurity/go-pep440-version v0.0.1/go.mod h1:3naPe+Bp6wi3n4l5iBFCZgS0JG8vY6FT0H4NGhFJ+i4=
github.com/aquasecurity/go-version v0.0.0-20201107203531-5e48ac5d022a/go.mod h1:9Beu8XsUNNfzml7WBf3QmyPToP1wm1Gj/Vc5UJKqTzU=
Expand Down
2 changes: 1 addition & 1 deletion pkg/detector/library/compare/npm/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (n Comparer) MatchVersion(currentVersion, constraint string) (bool, error)
return false, xerrors.Errorf("npm version error (%s): %s", currentVersion, err)
}

c, err := npm.NewConstraints(constraint)
c, err := npm.NewConstraints(constraint, npm.WithPreRelease(true))
if err != nil {
return false, xerrors.Errorf("npm constraint error (%s): %s", constraint, err)
}
Expand Down
19 changes: 17 additions & 2 deletions pkg/detector/library/compare/npm/compare_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@ func TestNpmComparer_IsVulnerable(t *testing.T) {
},
want: true,
},
{
name: "prerelease",
args: args{
currentVersion: "1.45.1-lts.1",
advisory: dbTypes.Advisory{
VulnerableVersions: []string{">=1.4.4-lts.1, <2.0.0"},
PatchedVersions: []string{"2.0.0"},
},
},
want: true,
},
{
name: "no patch",
args: args{
Expand Down Expand Up @@ -68,8 +79,12 @@ func TestNpmComparer_IsVulnerable(t *testing.T) {
args: args{
currentVersion: "2.0.0",
advisory: dbTypes.Advisory{
VulnerableVersions: []string{">=1.7.0 <1.7.16", ">=1.8.0 <1.8.8", ">=2.0.0 <2.0.8", ">=3.0.0-beta.1 <3.0.0-beta.7"},
PatchedVersions: []string{">=3.0.0-beta.7", ">=2.0.8 <3.0.0-beta.1", ">=1.8.8 <2.0.0", ">=1.7.16 <1.8.0"},
VulnerableVersions: []string{
">=1.7.0 <1.7.16", ">=1.8.0 <1.8.8", ">=2.0.0 <2.0.8", ">=3.0.0-beta.1 <3.0.0-beta.7",
},
PatchedVersions: []string{
">=3.0.0-beta.7", ">=2.0.8 <3.0.0-beta.1", ">=1.8.8 <2.0.0", ">=1.7.16 <1.8.0",
},
},
},
want: true,
Expand Down
Loading