Skip to content

Commit 57a5f85

Browse files
committed
Fix npm.py bug
Signed-off-by: sbs2001 <shivam.sandbhor@gmail.com>
1 parent 1abf16a commit 57a5f85

1 file changed

Lines changed: 9 additions & 10 deletions

File tree

vulnerabilities/scraper/npm.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,24 @@ def get_all_versions(package_name):
5858

5959
def extract_versions(package_name, aff_version_range, fixed_version_range):
6060
"""
61-
Seperate list of affected versions and fixed versions from all versions
62-
using the ranges specified
61+
Seperate list of affected versions and unaffected versions from all versions
62+
using the ranges specified.
6363
"""
64-
# FIXME This skips unfixed vulnerabilities
65-
if aff_version_range == '' or fixed_version_range == '':
66-
return ([], [])
67-
6864
aff_spec = semantic_version.NpmSpec(remove_spaces(aff_version_range))
6965
fix_spec = semantic_version.NpmSpec(remove_spaces(fixed_version_range))
7066
all_ver = get_all_versions(package_name)
7167
aff_ver = []
7268
fix_ver = []
69+
70+
# Unaffected version is that version which is in the fixed_version_range
71+
# or which is absent in the aff_version_range
72+
7373
for ver in all_ver:
7474
cur_version = semantic_version.Version(ver)
75-
if cur_version in aff_spec:
76-
aff_ver.append(ver)
75+
if cur_version in fix_spec or cur_version not in aff_spec:
76+
fix_ver.append(ver)
7777
else:
78-
if cur_version in fix_spec:
79-
fix_ver.append(ver)
78+
aff_ver.append(ver)
8079

8180
return (aff_ver, fix_ver)
8281

0 commit comments

Comments
 (0)