Skip to content

Commit d2d4c6b

Browse files
author
Prabhu Subramanian
committed
Bug fix
1 parent ace0ca0 commit d2d4c6b

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="appthreat-vulnerability-db",
8-
version="1.6.6",
8+
version="1.6.7",
99
author="Team AppThreat",
1010
author_email="[email protected]",
1111
description="AppThreat's vulnerability database and package search library with a built-in file based storage. CVE, GitHub, npm are the primary sources of vulnerabilities.",

test/test_utils.py

+2
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ def test_version_compare():
105105
assert res
106106
res = utils.version_compare("2.0.27.Final", "*", "*", None, "2.0.29")
107107
assert res
108+
res = utils.version_compare("2.0.27.RELEASE", "*", "2.0.27", None, None)
109+
assert res
108110

109111

110112
def test_version_compare_go():

vdb/lib/nvd.py

+2
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ def bulk_search():
120120
@staticmethod
121121
def convert_vuln(vuln):
122122
id = vuln["cve"]["CVE_data_meta"]["ID"]
123+
if id == "CVE-2020-5408":
124+
print(vuln)
123125
problem_type = ""
124126

125127
if (

vdb/lib/utils.py

+4-11
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ def convert_to_semver(version):
284284
pre_str = ver.get("prerelease", "").lower()
285285
for s in KNOWN_PRERELEASE_STR:
286286
if s in pre_str:
287-
ver["prerelease"] = None
288-
ver["build"] = None
287+
ver["prerelease"] = 0
288+
ver["build"] = 0
289289
break
290290

291291
ver = VersionInfo(**ver)
@@ -304,7 +304,7 @@ def convert_to_semver(version):
304304
minor=0,
305305
patch=0,
306306
prerelease=int(f"{version.replace('-', '')[:8]}000000"),
307-
build=None,
307+
build=0,
308308
)
309309
if not number_part:
310310
rest = None
@@ -363,14 +363,7 @@ def version_compare(
363363
"0.0.0" if min_version == "*" else min_version
364364
)
365365
max_semver, maxrest = convert_to_semver(max_version)
366-
if (
367-
compare_semver
368-
and min_semver
369-
and max_semver
370-
and not comprest
371-
and not minrest
372-
and not maxrest
373-
):
366+
if compare_semver and min_semver and max_semver and not minrest and not maxrest:
374367
min_value = compare_semver.compare(min_semver)
375368
max_value = compare_semver.compare(max_semver)
376369
# If we are confident about the versions post upgrade then return True

0 commit comments

Comments
 (0)