Cyberdefense/VulnWhisperer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't try to process empty scans

Browse Source
This commit is contained in:
pemontto
2019-05-10 18:00:28 +01:00
parent 4386001111
commit 927bbe618f
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
vulnwhisp/vulnwhisp.py
View File

@ -341,7 +341,7 @@ class vulnWhispererBase(object):
print '-' * 110 print '-' * 110
for scan in sorted(scan_list, key=lambda k: k['time'], reverse=True): for scan in sorted(scan_list, key=lambda k: k['time'], reverse=True):
scan['imported'] = scan['imported'].ljust(8) scan['imported'] = scan['imported'].ljust(8)
scan['scan_name'] = scan['scan_name'].encode('utf-8')[:60].ljust(60) scan['scan_name'] = scan['scan_name'][:60].ljust(60).encode('utf-8')
scan['time'] = scan['time'][:19].ljust(19) scan['time'] = scan['time'][:19].ljust(19)
scan['status'] = scan['status'][:10].ljust(10) scan['status'] = scan['status'][:10].ljust(10)
print output_string.format(**scan) print output_string.format(**scan)
@ -991,32 +991,35 @@ class vulnWhispererQualysVM(vulnWhispererBase):
else: else:
try: try:
self.logger.info('Processing {}: {}'.format(report_id, scan_name.encode('utf8'))) self.logger.info('Processing {} ({})'.format(scan_name.encode('utf8'), report_id))
vuln_ready = self.qualys_scan.process_data(scan_id=report_id) vuln_ready = self.qualys_scan.process_data(scan_id=report_id)
# Map and transform fields
vuln_ready = self.qualys_scan.normalise(vuln_ready)
# Set common fields if len(vuln_ready) != 0:
vuln_ready['scan_name'] = scan_name.encode('utf8') # Map and transform fields
vuln_ready['scan_id'] = report_id vuln_ready = self.qualys_scan.normalise(vuln_ready)
vuln_ready['scan_time'] = launched_date
vuln_ready['scan_source'] = self.CONFIG_SECTION
vuln_ready['vendor'] = 'Qualys'
vuln_ready = self.common_normalise(vuln_ready) # Set common fields
vuln_ready['scan_name'] = scan_name.encode('utf8')
vuln_ready['scan_id'] = report_id
vuln_ready['scan_time'] = launched_date
vuln_ready['scan_source'] = self.CONFIG_SECTION
vuln_ready['vendor'] = 'Qualys'
vuln_ready = self.common_normalise(vuln_ready)
except Exception as e: except Exception as e:
self.logger.error('Could not process {}: {}'.format(report_id, str(e))) self.logger.error('Could not process {}: {}'.format(report_id, str(e)))
self.exit_code += 1 self.exit_code += 1
return self.exit_code return self.exit_code
if output_format == 'json': if len(vuln_ready) != 0:
vuln_ready.to_json(relative_path_name + '.tmp', orient='records', lines=True) if output_format == 'json':
elif output_format == 'csv': vuln_ready.to_json(relative_path_name + '.tmp', orient='records', lines=True)
vuln_ready.to_csv(relative_path_name + '.tmp', index=False, header=True) elif output_format == 'csv':
os.rename(relative_path_name + '.tmp', relative_path_name) vuln_ready.to_csv(relative_path_name + '.tmp', index=False, header=True)
self.logger.info('{records} records written to {path} '.format(records=vuln_ready.shape[0], os.rename(relative_path_name + '.tmp', relative_path_name)
path=relative_path_name)) self.logger.info('{records} records written to {path} '.format(records=vuln_ready.shape[0],
path=relative_path_name))
record_meta = ( record_meta = (
scan_name, scan_name,