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

fix: don't throw on invalid semver versions #43

Merged
merged 1 commit into from
Jun 29, 2022
Merged

fix: don't throw on invalid semver versions #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/advisory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ class Advisory {
// we can try to be a *little* smarter up front by doing x-y for all
// contiguous version sets in the list
const ranges = []
this.versions = semver.sort(this.versions)
this.vulnerableVersions = semver.sort(this.vulnerableVersions)
this.versions = semver.sort(this.versions, semverOpt)
this.vulnerableVersions = semver.sort(this.vulnerableVersions, semverOpt)
for (let v = 0, vulnVer = 0; v < this.versions.length; v++) {
// figure out the vulnerable subrange
const vr = [this.versions[v]]
Expand Down
24 changes: 12 additions & 12 deletions test/advisory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const Advisory = require('../lib/advisory.js')
const advisories = require('./fixtures/advisories/index.js')
const packuments = require('./fixtures/packuments/index.js')
const semver = require('semver')
const so = { includePrerelease: true }
const so = { includePrerelease: true, loose: true }

t.test('create vulns from advisory', t => {
const v = new Advisory('semver', advisories.semver)
Expand All @@ -32,9 +32,9 @@ t.test('create vulns from advisory', t => {
name: 'semver',
title: 'Regular Expression Denial of Service',
severity: 'moderate',
versions: semver.sort(Object.keys(packuments.semver.versions)),
versions: semver.sort(Object.keys(packuments.semver.versions), so),
vulnerableVersions: semver.sort(Object.keys(packuments.semver.versions).filter(vulnerable =>
semver.satisfies(vulnerable, '<4.3.2', so))),
semver.satisfies(vulnerable, '<4.3.2', so)), so),
url: 'https://npmjs.com/advisories/31',
range: '<4.3.2',
id: 'jETG9IyfV60PqVhvt3BAecPdQKL2CvXOXr1GeFeSsTkGn8YHi+dU93h8zcjK/xptcxeaYeUBBKmD83eafSecwA==',
Expand All @@ -55,9 +55,9 @@ t.test('create vulns from advisory', t => {
name: 'semver',
title: 'Regular Expression Denial of Service',
severity: 'moderate',
versions: semver.sort(Object.keys(packuments.semver.versions)),
versions: semver.sort(Object.keys(packuments.semver.versions), so),
vulnerableVersions: semver.sort(Object.keys(packuments.semver.versions).filter(vulnerable =>
semver.satisfies(vulnerable, '<4.3.2', so))),
semver.satisfies(vulnerable, '<4.3.2', so)), so),
url: 'https://npmjs.com/advisories/31',
range: '<4.3.2',
id: 'jETG9IyfV60PqVhvt3BAecPdQKL2CvXOXr1GeFeSsTkGn8YHi+dU93h8zcjK/xptcxeaYeUBBKmD83eafSecwA==',
Expand Down Expand Up @@ -89,7 +89,7 @@ t.test('create vulns from advisory', t => {
title: 'Depends on vulnerable versions of semver',
url: null,
severity: 'moderate',
versions: semver.sort(Object.keys(packuments.pacote.versions)),
versions: semver.sort(Object.keys(packuments.pacote.versions), so),
vulnerableVersions: [],
range: '<0.0.0-0',
id: 'gJzFN5q57zHrhqiRn+lNQXirLlMUtC+8bFqEBGqE3XW/5VC880QTk2o/iRXUfJPT+jhc90QD+d9QIADI68nYlg==',
Expand All @@ -107,7 +107,7 @@ t.test('create vulns from advisory', t => {
title: 'Depends on vulnerable versions of semver',
url: null,
severity: 'moderate',
versions: semver.sort(Object.keys(packuments.pacote.versions)),
versions: semver.sort(Object.keys(packuments.pacote.versions), so),
vulnerableVersions: [],
range: '<0.0.0-0',
id: 'gJzFN5q57zHrhqiRn+lNQXirLlMUtC+8bFqEBGqE3XW/5VC880QTk2o/iRXUfJPT+jhc90QD+d9QIADI68nYlg==',
Expand All @@ -124,7 +124,7 @@ t.test('create vulns from advisory', t => {
title: 'Depends on vulnerable versions of semver',
url: null,
severity: 'moderate',
versions: semver.sort(Object.keys(packuments.pacote.versions)),
versions: semver.sort(Object.keys(packuments.pacote.versions), so),
vulnerableVersions: [],
range: '<0.0.0-0',
id: 'gJzFN5q57zHrhqiRn+lNQXirLlMUtC+8bFqEBGqE3XW/5VC880QTk2o/iRXUfJPT+jhc90QD+d9QIADI68nYlg==',
Expand All @@ -143,7 +143,7 @@ t.test('create vulns from advisory', t => {
title: 'Depends on vulnerable versions of minimist',
url: null,
severity: 'low',
versions: semver.sort(Object.keys(packuments.mkdirp.versions)),
versions: semver.sort(Object.keys(packuments.mkdirp.versions), so),
vulnerableVersions: ['0.4.1', '0.4.2', '0.5.0', '0.5.1'],
range: '0.4.1 - 0.5.1',
id: 'dOqvv9Jcyhu8PueSJZB+eZ0G/JI7mVomMmOBSku5SA7OScjvKmHq9jcLVFKmH1wsW2LcZATEOArlMxt/fa5LmA==',
Expand All @@ -169,7 +169,7 @@ t.test('create vulns from advisory', t => {
title: 'Depends on vulnerable versions of minimist',
url: null,
severity: 'low',
versions: semver.sort(Object.keys(packuments.mkdirp.versions)),
versions: semver.sort(Object.keys(packuments.mkdirp.versions), so),
vulnerableVersions: ['0.4.1', '0.4.2', '0.5.0', '0.5.1', '99.99.99'],
range: '0.4.1 - 0.5.1 || >=99.99.99',
id: 'dOqvv9Jcyhu8PueSJZB+eZ0G/JI7mVomMmOBSku5SA7OScjvKmHq9jcLVFKmH1wsW2LcZATEOArlMxt/fa5LmA==',
Expand All @@ -192,7 +192,7 @@ t.test('create vulns from advisory', t => {
title: 'Depends on vulnerable versions of minimist',
url: null,
severity: 'low',
versions: semver.sort(Object.keys(packuments.mkdirp.versions)),
versions: semver.sort(Object.keys(packuments.mkdirp.versions), so),
vulnerableVersions: ['0.4.1', '0.4.2', '0.5.0-bundler', '0.5.0', '0.5.1', '99.99.99'],
range: '0.4.1 - 0.5.1 || >=99.99.99',
id: 'dOqvv9Jcyhu8PueSJZB+eZ0G/JI7mVomMmOBSku5SA7OScjvKmHq9jcLVFKmH1wsW2LcZATEOArlMxt/fa5LmA==',
Expand Down Expand Up @@ -220,7 +220,7 @@ t.test('create vulns from advisory', t => {
title: 'Depends on vulnerable versions of minimist',
url: null,
severity: 'low',
versions: semver.sort(Object.keys(packuments.mkdirp.versions)),
versions: semver.sort(Object.keys(packuments.mkdirp.versions), so),
vulnerableVersions: ['0.4.1', '0.4.2', '0.5.0', '0.5.1'],
range: '0.4.1 - 0.5.1',
id: 'dOqvv9Jcyhu8PueSJZB+eZ0G/JI7mVomMmOBSku5SA7OScjvKmHq9jcLVFKmH1wsW2LcZATEOArlMxt/fa5LmA==',
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/packuments/pacote.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"v9-legacy": "9.5.12"
},
"versions": {
"0.0.0": {
"0.0.0pre92": {
"name": "pacote",
"version": "0.0.0",
"dist": {
Expand Down