diff options
author | Lee Chee Yang <chee.yang.lee@intel.com> | 2021-01-29 11:51:15 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-30 10:41:04 +0000 |
commit | 86b42289bda5bc2a4eff221ab476f170dd3d3794 (patch) | |
tree | e936bb438cb97ea1a07db5517bc29524e2af501f /meta/lib/oe | |
parent | ef208aaf0f05c478a3dbade3d2bfd3744f91d87e (diff) | |
download | poky-86b42289bda5bc2a4eff221ab476f170dd3d3794.tar.gz |
cve_check: add CVE_VERSION_SUFFIX to indicate suffix in versioning
add CVE_VERSION_SUFFIX to indicate the version suffix type, currently
works in two value, "alphabetical" if the version string uses single
alphabetical character suffix as incremental release, blank to not
consider the unidentified suffixes. This can be expand when more suffix
pattern identified.
refactor cve_check.Version class to use functools and add parameter to
handle suffix condition.
Also update testcases to cover new changes.
(From OE-Core rev: 5dfd5ad5144708b474ef31eaa89a846c57be8ac0)
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/cve_check.py | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py index ec48a3f829..ce755f940a 100644 --- a/meta/lib/oe/cve_check.py +++ b/meta/lib/oe/cve_check.py | |||
@@ -1,58 +1,60 @@ | |||
1 | import collections | 1 | import collections |
2 | import re | 2 | import re |
3 | import itertools | 3 | import itertools |
4 | import functools | ||
4 | 5 | ||
5 | _Version = collections.namedtuple( | 6 | _Version = collections.namedtuple( |
6 | "_Version", ["release", "pre_l", "pre_v"] | 7 | "_Version", ["release", "patch_l", "pre_l", "pre_v"] |
7 | ) | 8 | ) |
8 | 9 | ||
10 | @functools.total_ordering | ||
9 | class Version(): | 11 | class Version(): |
10 | _version_pattern = r"""v?(?:(?P<release>[0-9]+(?:[-\.][0-9]+)*)(?P<pre>[-_\.]?(?P<pre_l>(rc|alpha|beta|pre|preview|dev))[-_\.]?(?P<pre_v>[0-9]+)?)?)(.*)?""" | 12 | |
11 | _regex = re.compile(r"^\s*" + _version_pattern + r"\s*$", re.VERBOSE | re.IGNORECASE) | 13 | def __init__(self, version, suffix=None): |
12 | def __init__(self, version): | 14 | if str(suffix) == "alphabetical": |
13 | match = self._regex.search(version) | 15 | version_pattern = r"""r?v?(?:(?P<release>[0-9]+(?:[-\.][0-9]+)*)(?P<patch>[-_\.]?(?P<patch_l>[a-z]))?(?P<pre>[-_\.]?(?P<pre_l>(rc|alpha|beta|pre|preview|dev))[-_\.]?(?P<pre_v>[0-9]+)?)?)(.*)?""" |
16 | else: | ||
17 | version_pattern = r"""r?v?(?:(?P<release>[0-9]+(?:[-\.][0-9]+)*)(?P<pre>[-_\.]?(?P<pre_l>(rc|alpha|beta|pre|preview|dev))[-_\.]?(?P<pre_v>[0-9]+)?)?)(.*)?""" | ||
18 | regex = re.compile(r"^\s*" + version_pattern + r"\s*$", re.VERBOSE | re.IGNORECASE) | ||
19 | |||
20 | match = regex.search(version) | ||
14 | if not match: | 21 | if not match: |
15 | raise Exception("Invalid version: '{0}'".format(version)) | 22 | raise Exception("Invalid version: '{0}'".format(version)) |
16 | 23 | ||
17 | self._version = _Version( | 24 | self._version = _Version( |
18 | release=tuple(int(i) for i in match.group("release").replace("-",".").split(".")), | 25 | release=tuple(int(i) for i in match.group("release").replace("-",".").split(".")), |
26 | patch_l=match.group("patch_l") if str(suffix) == "alphabetical" and match.group("patch_l") else "", | ||
19 | pre_l=match.group("pre_l"), | 27 | pre_l=match.group("pre_l"), |
20 | pre_v=match.group("pre_v") | 28 | pre_v=match.group("pre_v") |
21 | ) | 29 | ) |
22 | 30 | ||
23 | self._key = _cmpkey( | 31 | self._key = _cmpkey( |
24 | self._version.release, | 32 | self._version.release, |
33 | self._version.patch_l, | ||
25 | self._version.pre_l, | 34 | self._version.pre_l, |
26 | self._version.pre_v | 35 | self._version.pre_v |
27 | ) | 36 | ) |
28 | 37 | ||
29 | def __le__(self, other): | 38 | def __eq__(self, other): |
30 | if not isinstance(other, Version): | ||
31 | return NotImplemented | ||
32 | return self._key <= other._key | ||
33 | |||
34 | def __lt__(self, other): | ||
35 | if not isinstance(other, Version): | 39 | if not isinstance(other, Version): |
36 | return NotImplemented | 40 | return NotImplemented |
37 | return self._key < other._key | 41 | return self._key == other._key |
38 | |||
39 | def __ge__(self, other): | ||
40 | if not isinstance(other, Version): | ||
41 | return NotImplemented | ||
42 | return self._key >= other._key | ||
43 | 42 | ||
44 | def __gt__(self, other): | 43 | def __gt__(self, other): |
45 | if not isinstance(other, Version): | 44 | if not isinstance(other, Version): |
46 | return NotImplemented | 45 | return NotImplemented |
47 | return self._key > other._key | 46 | return self._key > other._key |
48 | 47 | ||
49 | def _cmpkey(release, pre_l, pre_v): | 48 | def _cmpkey(release, patch_l, pre_l, pre_v): |
50 | # remove leading 0 | 49 | # remove leading 0 |
51 | _release = tuple( | 50 | _release = tuple( |
52 | reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release)))) | 51 | reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release)))) |
53 | ) | 52 | ) |
53 | |||
54 | _patch = patch_l.upper() | ||
55 | |||
54 | if pre_l is None and pre_v is None: | 56 | if pre_l is None and pre_v is None: |
55 | _pre = float('inf') | 57 | _pre = float('inf') |
56 | else: | 58 | else: |
57 | _pre = float(pre_v) if pre_v else float('-inf') | 59 | _pre = float(pre_v) if pre_v else float('-inf') |
58 | return _release, _pre | 60 | return _release, _patch, _pre |