cve-check: replace Looseversion with custom version class
PATCH v2 1/1 cve-check: replace Looseversion with custom version class
From: Lee Chee Yang <[email protected]>
The way distutils.version.LooseVersion compare version are tricky, it treat all these ( "1.0-beta2", "1.0-rc1", "1.0A", "1.0p2" and "1.0pre1") as greater version than "1.0". This might be right for "1.0A" and "1.0p1" but not for the rest, also these version could be confusing, the "p" in "1.0p1" can be "pre" or "patched" version or even other meaning.
Replace Looseversion with custom class, it uses regex to capture common version format like "1.1.1" or tag format using date like "2020-12-12" as release section, check for following known string/tags ( beta, rc, pre, dev, alpha, preview) as pre-release section, any other trailing characters are difficult to understand/define so ignore them. Compare release section and pre-release section saperately.
included selftest for the version class.
[YOCTO#14127]
--- meta/classes/cve-check.bbclass | 10 ++-- meta/lib/oe/cve_check.py | 58 +++++++++++++++++++++++ meta/lib/oeqa/selftest/cases/cve_check.py | 27 +++++++++++ 3 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 meta/lib/oe/cve_check.py create mode 100644 meta/lib/oeqa/selftest/cases/cve_check.py
meta/classes/cve-check.bbclass +5 -5
@@ -206,7 +206,7 @@ def check_cves(d, patched_cves): """ Connect to the NVD database and find unpatched cves. """ - from distutils.version import LooseVersion + from oe.cve_check import Version pn = d.getVar("PN") real_pv = d.getVar("PV")
@@ -263,8 +263,8 @@ def check_cves(d, patched_cves): else: if operator_start: try: - vulnerable_start = (operator_start == '>=' and LooseVersion(pv) >= LooseVersion(version_start)) - vulnerable_start |= (operator_start == '>' and LooseVersion(pv) > LooseVersion(version_start)) + vulnerable_start = (operator_start == '>=' and Version(pv) >= Version(version_start)) + vulnerable_start |= (operator_start == '>' and Version(pv) > Version(version_start)) except: bb.warn("%s: Failed to compare %s %s %s for %s" % (product, pv, operator_start, version_start, cve))
@@ -274,8 +274,8 @@ def check_cves(d, patched_cves): if operator_end: try: - vulnerable_end = (operator_end == '<=' and LooseVersion(pv) <= LooseVersion(version_end)) - vulnerable_end |= (operator_end == '<' and LooseVersion(pv) < LooseVersion(version_end)) + vulnerable_end = (operator_end == '<=' and Version(pv) <= Version(version_end) ) + vulnerable_end |= (operator_end == '<' and Version(pv) < Version(version_end) ) except: bb.warn("%s: Failed to compare %s %s %s for %s" % (product, pv, operator_end, version_end, cve))
meta/lib/oe/cve_check.py new file +58 -0
58 lines not on this page · raw message
meta/lib/oeqa/selftest/cases/cve_check.py new file +27 -0
@@ -0,0 +1,27 @@ +from oe.cve_check import Version +from oeqa.selftest.case import OESelftestTestCase + +class CVECheck(OESelftestTestCase): + + def test_version_compare(self): + result = Version("100") > Version("99") + self.assertTrue( result, msg="Failed to compare version '100' > '99'") + result = Version("2.3.1") > Version("2.2.3") + self.assertTrue( result, msg="Failed to compare version '2.3.1' > '2.2.3'") + result = Version("2021-01-21") > Version("2020-12-25") + self.assertTrue( result, msg="Failed to compare version '2021-01-21' > '2020-12-25'") + result = Version("1.2-20200910") < Version("1.2-20200920") + self.assertTrue( result, msg="Failed to compare version '1.2-20200910' < '1.2-20200920'") + + result = Version("1.0") >= Version("1.0beta") + self.assertTrue( result, msg="Failed to compare version '1.0' >= '1.0beta'") + result = Version("1.0-rc2") > Version("1.0-rc1") + self.assertTrue( result, msg="Failed to compare version '1.0-rc2' > '1.0-rc1'") + result = Version("1.0.alpha1") < Version("1.0") + self.assertTrue( result, msg="Failed to compare version '1.0.alpha1' < '1.0'") + result = Version("1.0_dev") <= Version("1.0") + self.assertTrue( result, msg="Failed to compare version '1.0_dev' <= '1.0'") + + # ignore "p1" and "p2", so these should be equal + result = Version("1.0p2") <= Version("1.0p1") and Version("1.0p2") >= Version("1.0p1") + self.assertTrue( result ,msg="Failed to compare version '1.0p2' to '1.0p1'")
Signature · 1 line
2.17.1
Quoted 9 lines · Lee Chee Yang
meta/lib/oe/cve_check.py new file +9
-0+ def __le__(self, other): + if not isinstance(other, Version): + return NotImplemented + return self._key <= other._key + + def __lt__(self, other): + if not isinstance(other, Version): + return NotImplemented + return self._key < other._key
meta/lib/oe/cve_check.py line 47
Quoted 10 lines
meta/lib/oe/cve_check.py new file +10
-0+ + def __ge__(self, other): + if not isinstance(other, Version): + return NotImplemented + return self._key >= other._key + + def __gt__(self, other): + if not isinstance(other, Version): + return NotImplemented + return self._key > other._key
You might want to look at the total_ordering decorator to make this a lot less code:
https://docs.python.org/3/library/functools.html#functools.total_ordering
Great to see a test case though!
Ross