aboutsummaryrefslogtreecommitdiffstats
path: root/bin/common/srtool_utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'bin/common/srtool_utils.py')
-rwxr-xr-xbin/common/srtool_utils.py114
1 files changed, 89 insertions, 25 deletions
diff --git a/bin/common/srtool_utils.py b/bin/common/srtool_utils.py
index 33405c67..573a86d5 100755
--- a/bin/common/srtool_utils.py
+++ b/bin/common/srtool_utils.py
@@ -1084,17 +1084,41 @@ def foo_fix_bad_mitre_init():
# Fix CVE records with missing 'cvssV2_severity' values in the top-level CVE records, due to
# CVE imports before a patch was sent upstream
#
-def fix_v2_severity(datasource_list):
+# The NIST Modified list is processed first. If any of its CVEs are found in a regular
+# list, that CVE is skipped since it was preempted
+#
+
+def fix_severity(datasource_list):
conn = sqlite3.connect(srtDbName)
cur_ds = conn.cursor()
cur_cs = conn.cursor()
cur_cve = conn.cursor()
+ cur_del = conn.cursor()
cve_count = 0
fix_count = 0
+ nist_ds_list = {}
+ modified_cve_list = []
- # Find NIST data sources
- cur_ds.execute('SELECT * FROM orm_datasource WHERE source = "nist" ORDER BY key ASC;')
+ DATA_MAP_V3_Score = 0
+ DATA_MAP_V3_Severity = 1
+ DATA_MAP_V2_Score = 2
+ DATA_MAP_V2_Severity = 3
+
+
+ #
+ # Gather the NIST data source list
+ #
+
+ cur_ds.execute('SELECT * FROM orm_datasource WHERE source = "nist" ORDER BY key DESC;')
+ for i,ds in enumerate(cur_ds):
+ nist_ds_list[ds[ORM.DATASOURCE_ID]] = ds[ORM.DATASOURCE_DESCRIPTION]
+
+ #
+ # Iterate over the NIST data sources
+ #
+
+ cur_ds.execute('SELECT * FROM orm_datasource WHERE source = "nist" ORDER BY key DESC;')
for i,ds in enumerate(cur_ds):
# Development/debug support
if cmd_count and ((cve_count - cmd_skip) > cmd_count):
@@ -1107,6 +1131,7 @@ def fix_v2_severity(datasource_list):
elif not ds[ORM.DATASOURCE_DESCRIPTION] in datasource_list.split(','):
continue
print("NIST Source:%s" % ds[ORM.DATASOURCE_DESCRIPTION])
+ is_modified_list = ds[ORM.DATASOURCE_DESCRIPTION] == 'NIST Modified Data'
# Scan the NIST datasource file and extract required values into a map
# (bin/nist/srtool_nist.py --download-only --source='NIST 2002' --file=data/nvdcve-1.1-2002.json --url-file=nvdcve-1.1-2002.json.gz --url-meta=nvdcve-1.1-2002.meta)
@@ -1118,6 +1143,11 @@ def fix_v2_severity(datasource_list):
break
nist_data_map = {}
nist_file = os.path.join(srtool_basepath,cve_source_file)
+
+ #
+ # Gather the V3/V2 status of all the CVEs in this NIST data sources
+ #
+
try:
f = open(nist_file, 'r')
source_dct = json.load(f)
@@ -1130,9 +1160,17 @@ def fix_v2_severity(datasource_list):
continue
cve_name = item['cve']['CVE_data_meta']['ID']
+ # Is this the NIST Modified list?
+ if is_modified_list:
+ # Add CVE name to Modified list
+ modified_cve_list.append(cve_name)
+ elif cve_name in modified_cve_list:
+ # Skip if already process by Modified list
+ continue
- if cve_name == "CVE-2019-15031":
- print("BAR1:%s" % (item['impact']['baseMetricV3']))
+# # Debugging support
+# if cve_name != "CVE-2016-0887": #"CVE-2020-7470","CVE-2019-15031"
+# continue
cvssV3_baseScore = ''
cvssV3_baseSeverity = ''
@@ -1145,27 +1183,18 @@ def fix_v2_severity(datasource_list):
cvssV2_baseScore = "%.1f" % float(item['impact']['baseMetricV2']['cvssV2']['baseScore'])
cvssV2_severity = item['impact']['baseMetricV2']['severity']
-# print(" Name:%s,cvssV2_severity=%s" % (cve_name,cvssV2_severity))
nist_data_map[cve_name] = [cvssV3_baseScore,cvssV3_baseSeverity,cvssV2_baseScore,cvssV2_severity]
- if cve_name == "CVE-2019-15031":
- print("BAR2:%s" % str(nist_data_map[cve_name]))
-
-
except Exception as e:
print("ERROR:%s (%s)" % (e,item['impact']['baseMetricV3']))
return
+ #
+ # Update the V3/V2 status for all found CVE records in this datasource
+ #
- # Find all CVEs with this datasource
- cur_cs.execute('SELECT * FROM orm_cvesource WHERE datasource_id = %d' % ds[ORM.DATASOURCE_ID])
- for j,cvesource in enumerate(cur_cs):
- # Development/debug support
- cve_count += 1
- if cmd_skip and (cve_count < cmd_skip): continue
- if cmd_count and ((cve_count - cmd_skip) > cmd_count): break
-
- cur_cve.execute('SELECT * FROM orm_cve WHERE id = %d' % cvesource[ORM.CVESOURCE_CVE_ID])
+ for cve_name in nist_data_map:
+ cur_cve.execute('SELECT * FROM orm_cve WHERE name = "%s"' % cve_name)
cve = cur_cve.fetchone()
if not cve:
print("WARNING: MISSING CVE in orm_cvesource '%d:%d' : %s" % (cvesource[ORM.CVESOURCE_CVE_ID],cvesource[ORM.CVESOURCE_DATASOURCE_ID],ds[ORM.DATASOURCE_DESCRIPTION]))
@@ -1173,18 +1202,53 @@ def fix_v2_severity(datasource_list):
cve_name = cve[ORM.CVE_NAME]
if cve_name in nist_data_map:
fix_count += 1
- if (nist_data_map[cve_name][0] != cve[ORM.CVE_CVSSV3_BASESCORE]) or (nist_data_map[cve_name][1] != cve[ORM.CVE_CVSSV3_BASESEVERITY]):
- print("WARNING: diff V3 for %s (%s->%s) (%s->%s)" % (cve_name,nist_data_map[cve_name][0],cve[ORM.CVE_CVSSV3_BASESCORE],nist_data_map[cve_name][1],cve[ORM.CVE_CVSSV3_BASESEVERITY]))
+ if (nist_data_map[cve_name][DATA_MAP_V3_Score] != cve[ORM.CVE_CVSSV3_BASESCORE]) or (nist_data_map[cve_name][DATA_MAP_V3_Severity] != cve[ORM.CVE_CVSSV3_BASESEVERITY]) or \
+ (nist_data_map[cve_name][DATA_MAP_V2_Score] != cve[ORM.CVE_CVSSV2_BASESCORE]) or (nist_data_map[cve_name][DATA_MAP_V2_Severity] != cve[ORM.CVE_CVSSV2_SEVERITY ]):
+ print("CHANGE: %s V3(%s to %s,%s to %s)V2(%s to %s,%s to %s)" % (cve_name,cve[ORM.CVE_CVSSV3_BASESCORE],nist_data_map[cve_name][DATA_MAP_V3_Score],cve[ORM.CVE_CVSSV3_BASESEVERITY],nist_data_map[cve_name][DATA_MAP_V3_Severity],
+ cve[ORM.CVE_CVSSV2_BASESCORE],nist_data_map[cve_name][DATA_MAP_V2_Score],cve[ORM.CVE_CVSSV2_SEVERITY ],nist_data_map[cve_name][DATA_MAP_V2_Severity]))
if force:
sql = ''' UPDATE orm_cve
SET cvssV3_baseScore = ?, cvssV3_baseSeverity = ?, cvssV2_baseScore = ?, cvssV2_severity = ?
WHERE id = ?'''
- cur_cve.execute(sql, (nist_data_map[cve_name][0],nist_data_map[cve_name][1],nist_data_map[cve_name][2],nist_data_map[cve_name][3],cve[ORM.CVE_ID],))
+ cur_cve.execute(sql, (nist_data_map[cve_name][DATA_MAP_V3_Score],nist_data_map[cve_name][DATA_MAP_V3_Severity],nist_data_map[cve_name][DATA_MAP_V2_Score],nist_data_map[cve_name][DATA_MAP_V2_Severity],cve[ORM.CVE_ID],))
# print('%05d: %-20s = %-20s' % (j,cve_name,nist_data_map[cve_name]))
else:
print("ERROR:CVE_NAME '%s' NOT MAPPED" % cve_name)
+ #
+ # Repair the data source mappings
+ # * Add missing NIST links
+ # * Replace old NIST links with found links (e.g. Modified datasource preempts regular datasources)
+ #
+
+ found_mapping = False
+ cur_cs.execute('SELECT * FROM orm_cvesource WHERE cve_id = %d' % cve[ORM.CVE_ID])
+ for j,cve2ds in enumerate(cur_cs):
+ if cve2ds[ORM.CVESOURCE_DATASOURCE_ID] in nist_ds_list:
+ # Do we have an obsolete NIST mapping?
+ if cve2ds[ORM.CVESOURCE_DATASOURCE_ID] != ds[ORM.DATASOURCE_ID]:
+ # Delete old mapping
+ print("Delete old mapping %s,%s" % (cve_name,nist_ds_list[cve2ds[ORM.CVESOURCE_DATASOURCE_ID]]))
+ if force:
+ sql = 'DELETE FROM orm_cvesource WHERE id=?'
+ cur_del.execute(sql, (cve2ds[ORM.CVESOURCE_ID],))
+ else:
+ # We are good to go
+ found_mapping = True
+ # Add if missing or deleted as obsolete
+ if not found_mapping:
+ print("Insert new mapping %s,%s" % (cve_name,nist_ds_list[ds[ORM.DATASOURCE_ID]]))
+ if force:
+ sql = ''' INSERT into orm_cvesource (cve_id, datasource_id) VALUES (?, ?)'''
+ cur_cs.execute(sql, (cve[ORM.CVE_ID],ds[ORM.DATASOURCE_ID],))
+
+
+ # Development/debug support
+ cve_count += 1
+ if cmd_skip and (cve_count < cmd_skip): continue
+ if cmd_count and ((cve_count - cmd_skip) > cmd_count): break
+
# Progress indicator support
if (0 == cve_count % 1000):
print('%05d: %-20s\r' % (cve_count,cve_name), end='')
@@ -1497,8 +1561,8 @@ def main(argv):
parser.add_argument('--fix-remove-bulk-cve-history', action='store_const', const='fix_remove_bulk_cve_history', dest='command', help='foo')
parser.add_argument('--fix-bad-mitre-init', action='store_const', const='fix_bad_mitre_init', dest='command', help='foo')
parser.add_argument('--fix-bad-new', action='store_const', const='fix_bad_new', dest='command', help='foo')
- parser.add_argument('--fix-v2-severity', dest='fix_v2_severity', help='foo')
+ parser.add_argument('--fix-severity', dest='fix_severity', help='Fix bad score/severity values, broken cve source links')
parser.add_argument('--find-empty-status', action='store_const', const='find_empty_status', dest='command', help='foo')
parser.add_argument('--find-multiple-defects', action='store_const', const='find_multiple_defects', dest='command', help='foo')
@@ -1573,8 +1637,8 @@ def main(argv):
fix_bad_mitre_init()
elif 'fix_bad_new' == args.command:
fix_bad_new()
- elif args.fix_v2_severity:
- fix_v2_severity(args.fix_v2_severity)
+ elif args.fix_severity:
+ fix_severity(args.fix_severity)
elif 'find_multiple_defects' == args.command:
find_multiple_defects()