diff options
Diffstat (limited to 'bin/nist/srtool_nist.py')
| -rwxr-xr-x | bin/nist/srtool_nist.py | 127 |
1 files changed, 86 insertions, 41 deletions
diff --git a/bin/nist/srtool_nist.py b/bin/nist/srtool_nist.py index e93f0882..021836b9 100755 --- a/bin/nist/srtool_nist.py +++ b/bin/nist/srtool_nist.py @@ -113,6 +113,14 @@ def get_name_sort(cve_name): cve_name_sort = cve_name return cve_name_sort +# Extract the source file path from the "Lookup" command +def get_file_from_lookup(lookup): + for param in lookup.split(' '): + if param.startswith('--file='): + return(param.replace('--file=','')) + return('') + + ####################################################################### # CVE_ItemToSummary: Translate a CVE_Item JSON node to a dictionary @@ -760,6 +768,7 @@ def file_date(filename,utc=False): # def do_fetch_cve(cve_name,cve_source_file,use_cache=True): + # Fetch cached data, else extract data from datasource file cache_path = os.path.join(srtool_basepath, nist_cache_dir) cve_cache_path = os.path.join(cache_path, cve_name + ".json") @@ -804,11 +813,11 @@ def do_fetch_cve(cve_name,cve_source_file,use_cache=True): return None if not CVE_Item: - print("description=There is no CVE record for %s in the loaded NIST public CVE database." % cve_name) + # Not found return None - - # Translate a CVE_Item JSON node - return(CVE_ItemToSummary(CVE_Item)) + else: + # Return translated CVE_Item JSON node + return(CVE_ItemToSummary(CVE_Item)) def fetch_cve(cve_name,cve_source_file): summary = do_fetch_cve(cve_name,cve_source_file) @@ -832,30 +841,26 @@ def cve_summary(cve_name): base_id = [] modified_id = [] - def get_file(lookup): - for param in lookup.split(' '): - if param.startswith('--file='): - return(param.replace('--file=','')) - return('') - - def show_summary(cve_name,datasource_map): - summary = do_fetch_cve(cve_name,datasource_map[DSMAP_FILE],False) - if summary: + def description_summary(description): desc_sum = 0 - description = summary['description'] for ch in description: desc_sum += ord(ch) if 37 < len(description): description = "%-37s..." % description[:37] - print(" * Name:%s in %s (%s,%s)" % (summary['name'],datasource_map[DSMAP_FILE],datasource_map[DSMAP_MOD],datasource_map[DSMAP_UPDATE])) - print(" description :%-40s [sum=%d]" % (description,desc_sum)) + return("%-40s [sum=%d]" % (description,desc_sum)) + + def show_summary(key,cve_name,datasource_map): + summary = do_fetch_cve(cve_name,datasource_map[DSMAP_FILE],False) + if summary: + print(" %s: %s in %s (%s,%s)" % (key,summary['name'],datasource_map[DSMAP_FILE],datasource_map[DSMAP_MOD],datasource_map[DSMAP_UPDATE])) + print(" description :%s" % description_summary(summary['description'])) print(" cvssV3_baseScore :%s" % summary['cvssV3_baseScore']) print(" cvssV3_baseSeverity:%s" % summary['cvssV3_baseSeverity']) print(" cvssV2_baseScore :%s" % summary['cvssV2_baseScore']) print(" cvssV2_severity :%s" % summary['cvssV2_severity']) print(" lastModifiedDate :%s" % summary['lastModifiedDate']) else: - print(" There is no CVE record for %s in %s" % (cve_name,base_file)) + print(" %s: There is no CVE record for %s in %s" % (key,cve_name,datasource_map[DSMAP_FILE])) cur_ds.execute('SELECT * FROM orm_datasource;') datasource_map = {} @@ -865,28 +870,39 @@ def cve_summary(cve_name): # DataSource Map is [cve_file,ds_desc,ds_lastmodifieddate,ds_lastupdateddate] datasource_map[datasource[ORM.DATASOURCE_ID]] = ['',datasource[ORM.DATASOURCE_DESCRIPTION],datasource[ORM.DATASOURCE_LASTMODIFIEDDATE],datasource[ORM.DATASOURCE_LASTUPDATEDDATE]] if ('nist' == datasource[ORM.DATASOURCE_SOURCE]) and ('NIST Modified Data' == datasource[ORM.DATASOURCE_DESCRIPTION]): - datasource_map[datasource[ORM.DATASOURCE_ID]][DSMAP_FILE] = get_file(datasource[ORM.DATASOURCE_LOOKUP]) + datasource_map[datasource[ORM.DATASOURCE_ID]][DSMAP_FILE] = get_file_from_lookup(datasource[ORM.DATASOURCE_LOOKUP]) modified_id = datasource[ORM.DATASOURCE_ID] elif ('nist' == datasource[ORM.DATASOURCE_SOURCE]) and datasource[ORM.DATASOURCE_CVE_FILTER] and cve_name.startswith(datasource[ORM.DATASOURCE_CVE_FILTER]): - datasource_map[datasource[ORM.DATASOURCE_ID]][DSMAP_FILE] = get_file(datasource[ORM.DATASOURCE_LOOKUP]) + datasource_map[datasource[ORM.DATASOURCE_ID]][DSMAP_FILE] = get_file_from_lookup(datasource[ORM.DATASOURCE_LOOKUP]) base_id = datasource[ORM.DATASOURCE_ID] - #print("FOO2:%s,%s" % (base_id,modified_id)) # Return the NIST results print("NIST Summary:") - show_summary(cve_name,datasource_map[base_id]) - show_summary(cve_name,datasource_map[modified_id]) - # Return the DataSource mapping results - print("DataSource Summary:") - cur_cve.execute('SELECT * FROM orm_cve WHERE name = "%s"' % cve_name) - for i,cve in enumerate(cur_cve): + show_summary("BASE",cve_name,datasource_map[base_id]) + show_summary("MOD ",cve_name,datasource_map[modified_id]) + cve = cur_cve.execute('SELECT * FROM orm_cve WHERE name = "%s"' % cve_name).fetchone() + if cve: cur_ds.execute('SELECT * FROM orm_cvesource WHERE cve_id = %d' % cve[ORM.CVE_ID]) + # Return the CVE record's current values + print("CVE Summary:") + print(" CVE : %s" % (cve[ORM.CVE_NAME])) + print(" description :%s" % description_summary(cve[ORM.CVE_DESCRIPTION])) + print(" cvssV3_baseScore :%s" % cve[ORM.CVE_CVSSV3_BASESCORE]) + print(" cvssV3_baseSeverity:%s" % cve[ORM.CVE_CVSSV3_BASESEVERITY]) + print(" cvssV2_baseScore :%s" % cve[ORM.CVE_CVSSV2_BASESCORE]) + print(" cvssV2_severity :%s" % cve[ORM.CVE_CVSSV2_SEVERITY]) + print(" lastModifiedDate :%s" % cve[ORM.CVE_LASTMODIFIEDDATE]) + # Return the DataSource mapping results + print("DataSource Summary:") for j,cs in enumerate(cur_ds): datasource_id = cs[ORM.CVESOURCE_DATASOURCE_ID] if datasource_id in datasource_map: print(" [%2d] %s" % (j+1,datasource_map[cs[ORM.CVESOURCE_DATASOURCE_ID]][DSMAP_DESC])) else: print(" [%2d] Unknown DataSource ID %d" % (j+1,cs[ORM.CVESOURCE_DATASOURCE_ID])) + else: + print("CVE Summary:") + print(" CVE : There is no CVE record for %s in orm_cve" % (cve_name)) ####################################################################### @@ -898,7 +914,14 @@ def cve_summary(cve_name): # as data sources that are on-demand only # -def update_cve_list(action,cve_list,conn=None): +def update_cve_list(action,cve_string_list,conn=None): + cve_list = cve_string_list.split(',') + + DS_MODIFIED_SOURCE = 0 + DS_CVEFILTER = 1 + DS_LOOKUP = 2 + DS_ID = 3 + DS_SOURCE_FILE = 4 # Set up database connection do_close = False @@ -911,11 +934,20 @@ def update_cve_list(action,cve_list,conn=None): sql = "SELECT * FROM orm_datasource" cur.execute(sql) datasource_table = [] + datasource_nist_ids = {} for datasource in cur: if 'nist' != datasource[ORM.DATASOURCE_SOURCE]: # Only consider NIST datasources continue - datasource_table.append([datasource[ORM.DATASOURCE_CVE_FILTER], datasource[ORM.DATASOURCE_LOOKUP], datasource[ORM.DATASOURCE_ID]]) + + # Track the IDs for NIST sources + datasource_nist_ids[datasource[ORM.DATASOURCE_ID]] = True + + # Always put the Modified source first + if 'NIST Modified Data' == datasource[ORM.DATASOURCE_DESCRIPTION]: + datasource_table.insert(0,[True,datasource[ORM.DATASOURCE_CVE_FILTER], datasource[ORM.DATASOURCE_LOOKUP], datasource[ORM.DATASOURCE_ID], get_file_from_lookup(datasource[ORM.DATASOURCE_LOOKUP]) ]) + else: + datasource_table.append([False,datasource[ORM.DATASOURCE_CVE_FILTER], datasource[ORM.DATASOURCE_LOOKUP], datasource[ORM.DATASOURCE_ID], get_file_from_lookup(datasource[ORM.DATASOURCE_LOOKUP]) ]) update = False fd = None @@ -928,17 +960,17 @@ def update_cve_list(action,cve_list,conn=None): fd = None source_dct = [] has_matches = False - # Find at least one CVE that is in this datasource - for cve_name in cve_list.split(','): - if (not datasource[0]) or cve_name.startswith(datasource[0]): + # Find at least one CVE that is in this datasource, and always scan the Modified source + for cve_name in cve_list: + if datasource[DS_MODIFIED_SOURCE] or cve_name.startswith(datasource[DS_CVEFILTER]): has_matches = True + break if not has_matches: continue # Find the CVEs in this datasource # bin/nist/srtool_nist.py --file=data/nvdcve-1.0-2002.json %command% - cve_source_file = re.sub(r".*=", "", datasource[1]) - cve_source_file = re.sub(r" .*", "", cve_source_file) + cve_source_file = datasource[DS_SOURCE_FILE] if verbose: print("NIST_SOURCE:%s %s" % (cve_source_file,cve_name)) try: if not fd: @@ -952,10 +984,18 @@ def update_cve_list(action,cve_list,conn=None): continue if not 'ID' in item['cve']['CVE_data_meta']: continue - for cve_name in cve_list.split(','): + + # Use a temp CVE list so that Modified" can safely remove found CVEs from the main CVE list + cve_list_local = cve_list + for cve_name in cve_list_local: if item['cve']['CVE_data_meta']['ID'] == cve_name: if verbose: print(" NIST_TRANSLATE:%s %s" % (cve_source_file,cve_name)) + # If found in the Modified List, remove it from further consideration by regular sources + if datasource[DS_MODIFIED_SOURCE]: + cve_list.remove(cve_name) + if verbose: print(" NIST_FOUND_MODIFIED_REMOVE_NAME:%s" % cve_name) + # Translate the CVE content summary = CVE_ItemToSummary(item,True) # Commit the CVE content @@ -963,13 +1003,18 @@ def update_cve_list(action,cve_list,conn=None): if is_change: update = True - # Add NIST datasource to CVE - sql = '''SELECT * FROM orm_cvesource WHERE cve_id=? AND datasource_id=?''' - cve2ds = cur.execute(sql, (cve_id, datasource[2],)).fetchone() - if not cve2ds: - sql = ''' INSERT into orm_cvesource (cve_id, datasource_id) VALUES (?, ?)''' - cur.execute(sql, (cve_id,datasource[2],)) - # Remember this match in case it gets preempted + # First, remove all existing (potentially obsolete) NIST datasources to CVE + sql = '''SELECT * FROM orm_cvesource WHERE cve_id=?''' + for cve2ds in cur.execute(sql, (cve_id, )): + if cve2ds[ORM.CVESOURCE_DATASOURCE_ID] in datasource_nist_ids: + sql = 'DELETE FROM orm_cvesource WHERE id=?' + cur.execute(sql, (cve2ds[ORM.CVESOURCE_ID],)) + if verbose: print(" NIST_REMOVE_OLDSOURCE:%s" % (cve2ds[ORM.CVESOURCE_DATASOURCE_ID])) + # Second, add found NIST datasource to CVE + sql = ''' INSERT into orm_cvesource (cve_id, datasource_id) VALUES (?, ?)''' + cur.execute(sql, (cve_id,datasource[DS_ID],)) + # Note, CVE top record was updated with found values (NIST wins over other sources) + # when sql_cve_query() executed if verbose: print(" NIST_QUERIED:%s %s" % (cve_source_file,cve_name)) |