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

Update to count tracker

Browse Source
This commit is contained in:
Austin Taylor
2017-12-30 14:07:02 -05:00
parent e03860d087
commit 0ba3cdf579
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vulnwhisp/frameworks/qualys.py
View File

@ -131,7 +131,7 @@ class qualysWhisperAPI(object):
dataframes = [] dataframes = []
_records = [] _records = []
total = int(self.get_was_scan_count(status=status)) total = int(self.get_was_scan_count(status=status))
print('Processing %s total scans' % total) print('Retrieving information for %s scans' % total)
for i in range(0, total): for i in range(0, total):
if i % limit == 0: if i % limit == 0:
if (total - i) < limit: if (total - i) < limit:

20
vulnwhisp/vulnwhisp.py
View File

@ -498,9 +498,9 @@ class vulnWhispererQualys(vulnWhispererBase):
relative_path_name = self.path_check(report_name) relative_path_name = self.path_check(report_name)
if os.path.isfile(self.path_check(report_name)): if os.path.isfile(relative_path_name):
#TODO Possibly make this optional to sync directories #TODO Possibly make this optional to sync directories
file_length = len(open(report_name).readlines()) file_length = len(open(relative_path_name).readlines())
record_meta = ( record_meta = (
scan_name, scan_name,
scan_reference, scan_reference,
@ -526,9 +526,9 @@ class vulnWhispererQualys(vulnWhispererBase):
print('{info} - New Report ID: %s'.format(info=bcolors.INFO) \ print('{info} - New Report ID: %s'.format(info=bcolors.INFO) \
% generated_report_id) % generated_report_id)
vuln_ready = self.qualys_scan.process_data(path=self.write_path, file_id=generated_report_id) vuln_ready = self.qualys_scan.process_data(path=self.write_path, file_id=str(generated_report_id))
vuln_ready.to_csv(self.path_check(report_name), index=False, header=True) # add when timestamp occured vuln_ready.to_csv(relative_path_name, index=False, header=True) # add when timestamp occured
vuln_ready.rename(columns=self.COLUMN_MAPPING, inplace=True) vuln_ready.rename(columns=self.COLUMN_MAPPING, inplace=True)
record_meta = ( record_meta = (
@ -545,11 +545,11 @@ class vulnWhispererQualys(vulnWhispererBase):
self.record_insert(record_meta) self.record_insert(record_meta)
if output_format == 'json': if output_format == 'json':
with open(self.path_check(report_name), 'w') as f: with open(relative_path_name, 'w') as f:
f.write(vuln_ready.to_json(orient='records', lines=True)) f.write(vuln_ready.to_json(orient='records', lines=True))
elif output_format == 'csv': elif output_format == 'csv':
vuln_ready.to_csv(self.path_check(report_name), index=False, header=True) # add when timestamp occured vuln_ready.to_csv(relative_path_name, index=False, header=True) # add when timestamp occured
print('{success} - Report written to %s'.format(success=bcolors.SUCCESS) \ print('{success} - Report written to %s'.format(success=bcolors.SUCCESS) \
% report_name) % report_name)
@ -559,9 +559,9 @@ class vulnWhispererQualys(vulnWhispererBase):
% generated_report_id) % generated_report_id)
cleaning_up = \ cleaning_up = \
self.qualys_scan.qw.delete_report(generated_report_id) self.qualys_scan.qw.delete_report(generated_report_id)
os.remove(self.path_check(str(generated_report_id) + '.{extension}'.format(extension=output_format))) os.remove(self.path_check(str(generated_report_id) + '.csv'))
print('{action} - Deleted report from local disk: %s'.format(action=bcolors.ACTION) \ print('{action} - Deleted report from local disk: %s'.format(action=bcolors.ACTION) \
% generated_report_id) % self.path_check(str(generated_report_id)))
else: else:
print('{error} Could not process report ID: %s'.format(error=bcolors.FAIL) % status) print('{error} Could not process report ID: %s'.format(error=bcolors.FAIL) % status)
self.conn.close() self.conn.close()
@ -576,7 +576,7 @@ class vulnWhispererQualys(vulnWhispererBase):
else: else:
self.scans_to_process = self.latest_scans self.scans_to_process = self.latest_scans
self.vprint('{info} Identified {new} scans to be processed'.format(info=bcolors.INFO, self.vprint('{info} Identified {new} scans to be processed'.format(info=bcolors.INFO,
new=len(self.latest_scans))) new=len(self.scans_to_process)))
def process_web_assets(self): def process_web_assets(self):
@ -587,7 +587,7 @@ class vulnWhispererQualys(vulnWhispererBase):
counter += 1 counter += 1
r = app[1] r = app[1]
print('Processing %s/%s' % (counter, len(self.latest_scans))) print('Processing %s/%s' % (counter, len(self.scans_to_process)))
self.whisper_reports(report_id=r['id'], self.whisper_reports(report_id=r['id'],
launched_date=r['launchedDate'], launched_date=r['launchedDate'],
scan_name=r['name'], scan_name=r['name'],