1
diff --git a/scripts/check-cves b/scripts/check-cves
2
index e5cf20f..940d2d1 100755
3
--- a/scripts/check-cves
4
+++ b/scripts/check-cves
5
@@ -16,6 +16,7 @@
6
16
16
7
17
17
8
18
from datetime import datetime, timezone, date as datetime_date
18
from datetime import datetime, timezone, date as datetime_date
9
19
import typing
10
19
import json
20
import json
11
20
import math
21
import math
12
21
import argparse
22
import argparse
13
@@ -183,7 +184,7 @@ class PercentageFile(object):
14
183
        return self.f.close()
184
        return self.f.close()
15
184
185
16
185
186
18
186
def convert_to_nvd(cves=[], desc=""):
187
def convert_to_nvd(cves=[], desc=lambda _: ""):
19
187
    # convert to nvd format dict (like nvd json)
188
    # convert to nvd format dict (like nvd json)
20
188
    nvd = {"CVE_data_type": "CVE",
189
    nvd = {"CVE_data_type": "CVE",
21
189
           "CVE_data_format": "MITRE",
190
           "CVE_data_format": "MITRE",
22
@@ -335,7 +336,7 @@ def import_debian(handler):
23
335
class RHEL8OVALHandler(xml.sax.handler.ContentHandler):
336
class RHEL8OVALHandler(xml.sax.handler.ContentHandler):
24
336
    """SAX handler for processing rhel8 OVAL XML."""
337
    """SAX handler for processing rhel8 OVAL XML."""
25
337
338
27
338
    def __init__(self, ignore=[]):
339
    def __init__(self):
28
339
        # For per-hit processing
340
        # For per-hit processing
29
340
        self._curr_vuln = None
341
        self._curr_vuln = None
30
341
        self._curr_cve = None
342
        self._curr_cve = None
31
@@ -513,7 +514,7 @@ def read_mbox_file(f):
32
513
        sys.exit(1)
514
        sys.exit(1)
33
514
515
34
515
    child = subprocess.Popen(['./scripts/locate_cves.py', f], stdout=subprocess.PIPE, universal_newlines=True)
516
    child = subprocess.Popen(['./scripts/locate_cves.py', f], stdout=subprocess.PIPE, universal_newlines=True)
36
516
    out, err = child.communicate()
517
    out, _ = child.communicate()
37
517
518
38
518
    tmp = tempfile.NamedTemporaryFile(mode='w', prefix='mbox-import_', suffix='.out', delete=False)
519
    tmp = tempfile.NamedTemporaryFile(mode='w', prefix='mbox-import_', suffix='.out', delete=False)
39
519
    tmpname = tmp.name
520
    tmpname = tmp.name
40
@@ -675,7 +676,7 @@ class CVEHandler(xml.sax.handler.ContentHandler):
41
675
            try:
676
            try:
42
676
                for ref in cve["references"]["reference_data"]:
677
                for ref in cve["references"]["reference_data"]:
43
677
                    self.curr_refs += [(ref["refsource"], ref["name"], ref["url"])]
678
                    self.curr_refs += [(ref["refsource"], ref["name"], ref["url"])]
45
678
            except:
679
            except Exception:
46
679
                pass
680
                pass
47
680
681
48
681
            # find an english description
682
            # find an english description
49
@@ -776,6 +777,8 @@ class CVEHandler(xml.sax.handler.ContentHandler):
50
776
            self.curr_refs += [(self.curr_source, self.curr_chars, self.curr_url)]
777
            self.curr_refs += [(self.curr_source, self.curr_chars, self.curr_url)]
51
777
778
52
778
    def handle_cve(self):
779
    def handle_cve(self):
53
780
        if not self.curr_cve or not self.curr_desc:
54
781
            return
55
779
        # Skip CVEs we know about already unless this is a mistriaged CVE
782
        # Skip CVEs we know about already unless this is a mistriaged CVE
56
780
        if self.curr_cve in self.cve_ignore and mistriaged_hint not in self.curr_desc:
783
        if self.curr_cve in self.cve_ignore and mistriaged_hint not in self.curr_desc:
57
781
            return
784
            return
58
@@ -842,7 +845,7 @@ class CVEHandler(xml.sax.handler.ContentHandler):
59
842
845
60
843
        return external_subprojects
846
        return external_subprojects
61
844
847
63
845
    def display_cve(self, cve, file=sys.stdout, line_prefix=None, wrap_desc=False):
848
    def display_cve(self, cve, file: typing.IO=sys.stdout, line_prefix=None, wrap_desc=False):
64
846
        class CVEOutput:
849
        class CVEOutput:
65
847
            def __init__(self, file, line_prefix=None):
850
            def __init__(self, file, line_prefix=None):
66
848
                self.file = file
851
                self.file = file
67
@@ -904,7 +907,7 @@ class CVEHandler(xml.sax.handler.ContentHandler):
68
904
                        print(f'    Ubuntu: {pkg} | {answer[name][pkg]} | {name}')
907
                        print(f'    Ubuntu: {pkg} | {answer[name][pkg]} | {name}')
69
905
            # no debian info, display possible commented ignore command when
908
            # no debian info, display possible commented ignore command when
70
906
            # using command file (i.e. wrap_desc is true)
909
            # using command file (i.e. wrap_desc is true)
72
907
            if (self.debian[cve]['state'] == 'RESERVED' or self.debian[cve]['state'] == None)  and wrap_desc:
910
            if (self.debian[cve]['state'] == 'RESERVED' or self.debian[cve]['state'] is None)  and wrap_desc:
73
908
                proposed_ignore = self.ignore_suggestion.get_ignore_suggestion(self.cve_data[cve]['desc'])
911
                proposed_ignore = self.ignore_suggestion.get_ignore_suggestion(self.cve_data[cve]['desc'])
74
909
                print(f'{cve} ignore "{proposed_ignore}"')
912
                print(f'{cve} ignore "{proposed_ignore}"')
75
910
            # debian rejected, so offer to reject by ignoring when using command file (i.e. wrap_desc is true)
913
            # debian rejected, so offer to reject by ignoring when using command file (i.e. wrap_desc is true)
76
@@ -1009,7 +1012,7 @@ class CVEHandler(xml.sax.handler.ContentHandler):
77
1009
1012
78
1010
    def human_process_cve(self, cve, action='skip', reason='', package=''):
1013
    def human_process_cve(self, cve, action='skip', reason='', package=''):
79
1011
        info = ''
1014
        info = ''
81
1012
        while info == "" or not info[0] in ['i', 'a', 's', 'q', 'r']:
1015
        while info == "" or info[0] not in ['i', 'a', 's', 'q', 'r']:
82
1013
            prompt_user(f'\nA]dd (or R]epeat), I]gnore forever, S]kip for now, or Q]uit? [{action}] ')
1016
            prompt_user(f'\nA]dd (or R]epeat), I]gnore forever, S]kip for now, or Q]uit? [{action}] ')
83
1014
            info = sys.stdin.readline().strip().lower()
1017
            info = sys.stdin.readline().strip().lower()
84
1015
            if info == "":
1018
            if info == "":
85
@@ -1140,7 +1143,7 @@ class CVEHandler(xml.sax.handler.ContentHandler):
86
1140
                except IndexError:
1143
                except IndexError:
87
1141
                    raise ValueError(f'Invalid add command on line {line_num}:\n{orig_line}')
1144
                    raise ValueError(f'Invalid add command on line {line_num}:\n{orig_line}')
88
1142
1145
90
1143
                if not priority in cve_lib.priorities and not priority == 'untriaged':
1146
                if priority not in cve_lib.priorities and not priority == 'untriaged':
91
1144
                    raise ValueError(f'Invalid priority on line {line_num}:\n{orig_line}')
1147
                    raise ValueError(f'Invalid priority on line {line_num}:\n{orig_line}')
92
1145
1148
93
1146
                if os.path.exists(f'{destdir}/active/{cve}'):
1149
                if os.path.exists(f'{destdir}/active/{cve}'):
94
@@ -1471,7 +1474,7 @@ for uri in args.uris:
95
1471
            handler.parse_json(readable)
1474
            handler.parse_json(readable)
96
1472
        else:
1475
        else:
97
1473
            parser.parse(readable)
1476
            parser.parse(readable)
99
1474
    except xml.sax._exceptions.SAXParseException as e:
1477
    except xml.sax.SAXParseException as e:
100
1475
        print(f"\n\nWARNING: {uri} is malformed:\n{e}")
1478
        print(f"\n\nWARNING: {uri} is malformed:\n{e}")
101
1476
        print("Aborting", file=sys.stderr)
1479
        print("Aborting", file=sys.stderr)
102
1477
        sys.exit(1)
1480
        sys.exit(1)
103
@@ -1496,7 +1499,7 @@ def refresh_cves(cve_refresh_list, full_refresh=True):
104
1496
                desc = _wrap_desc(handler.cve_data[cve]['desc'].strip())
1499
                desc = _wrap_desc(handler.cve_data[cve]['desc'].strip())
105
1497
                public = handler.cve_data[cve]['public']
1500
                public = handler.cve_data[cve]['public']
106
1498
            cvsss = handler.cve_data[cve]['cvss']
1501
            cvsss = handler.cve_data[cve]['cvss']
108
1499
        except:
1502
        except Exception:
109
1500
            if args.verbose:
1503
            if args.verbose:
110
1501
                print(f'{cve} not listed in XML', file=sys.stderr)
1504
                print(f'{cve} not listed in XML', file=sys.stderr)
111
1502
1505
Status:	Merged
Merged at revision:	9ede61eeb5252dfdeea967aac5d56debd84c78f0
Proposed branch:	~alexmurray/ubuntu-cve-tracker:fix-pyright-warnings-in-check-cves
Merge into:	ubuntu-cve-tracker:master
Diff against target:	110 lines (+13/-10) 1 file modified scripts/check-cves (+13/-10)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Steve Beattie		2024-03-18	Approve on 2024-03-18
Review via email: mp+462558@code.launchpad.net