Skip to content

Commit 8d00edc

Browse files
committed
Address review comments
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 9e91b44 commit 8d00edc

1 file changed

Lines changed: 14 additions & 21 deletions

File tree

  • vulnerabilities/importers

vulnerabilities/importers/npm.py

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -105,31 +105,24 @@ def to_advisory_data(self, file: Path) -> List[AdvisoryData]:
105105
)
106106

107107
def get_affected_package(self, data, package_name):
108+
affected_version_range = None
109+
unaffected_version_range = None
110+
fixed_version = None
111+
108112
vulnerable_range = data.get("vulnerable_versions") or ""
113+
patched_range = data.get("patched_versions") or ""
109114

110-
# https://github.com/nodejs/security-wg/blob/main/vuln/npm/213.json#L14
115+
# https://github.com/nodejs/security-wg/blob/cfaa51cc5c83f01eea61b69658f7bc76a77c5979/vuln/npm/213.json#L14
111116
if vulnerable_range == "<=99.999.99999":
112117
vulnerable_range = "*"
113-
114-
affected_version_range = (
115-
NpmVersionRange.from_native(vulnerable_range) if vulnerable_range else None
116-
)
117-
118-
if vulnerable_range == "*":
119-
return AffectedPackage(
120-
package=PackageURL(
121-
type="npm",
122-
name=package_name,
123-
),
124-
affected_version_range=affected_version_range,
125-
)
126-
127-
patched_range = data.get("patched_versions") or ""
128-
129-
unaffected_version_range = (
130-
NpmVersionRange.from_native(patched_range) if patched_range else None
131-
)
132-
fixed_version = None
118+
if vulnerable_range:
119+
affected_version_range = NpmVersionRange.from_native(vulnerable_range)
120+
121+
# https://github.com/nodejs/security-wg/blob/cfaa51cc5c83f01eea61b69658f7bc76a77c5979/vuln/npm/213.json#L15
122+
if patched_range == "<0.0.0":
123+
patched_range = None
124+
if patched_range:
125+
unaffected_version_range = NpmVersionRange.from_native(patched_range)
133126

134127
# We only store single fixed versions and not a range of fixed versions
135128
# If there is a single constraint in the unaffected_version_range

0 commit comments

Comments
 (0)