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

Add scan name to output

Browse Source
This commit is contained in:
pemontto
2019-04-11 21:57:18 +10:00
parent 8f9932e56b
commit 2547873bd2
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vulnwhisp/vulnwhisp.py
View File

@ -445,6 +445,9 @@ class vulnWhispererNessus(vulnWhispererBase):
# Map and transform fields # Map and transform fields
clean_csv = self.nessus.normalise(clean_csv) clean_csv = self.nessus.normalise(clean_csv)
clean_csv['scan_name'] = scan_name.encode('utf8')
clean_csv['scan_id'] = scan_id
clean_csv.to_json(relative_path_name.replace('csv', 'json'), orient='records', lines=True) clean_csv.to_json(relative_path_name.replace('csv', 'json'), orient='records', lines=True)
clean_csv.to_csv(relative_path_name, index=False) clean_csv.to_csv(relative_path_name, index=False)
record_meta = ( record_meta = (
@ -608,8 +611,8 @@ class vulnWhispererQualys(vulnWhispererBase):
vuln_ready = self.qualys_scan.process_data(path=self.write_path, file_id=str(generated_report_id)) vuln_ready = self.qualys_scan.process_data(path=self.write_path, file_id=str(generated_report_id))
vuln_ready['scan_name'] = scan_name vuln_ready['scan_name'] = scan_name.encode('utf8')
vuln_ready['scan_reference'] = scan_reference vuln_ready['scan_id'] = scan_reference
# Map and transform fields # Map and transform fields
vuln_ready = self.qualys_scan.normalise(vuln_ready) vuln_ready = self.qualys_scan.normalise(vuln_ready)
# TODO remove the line below once normalising complete # TODO remove the line below once normalising complete
@ -775,8 +778,8 @@ class vulnWhispererOpenVAS(vulnWhispererBase):
else: else:
vuln_ready = self.openvas_api.process_report(report_id=report_id) vuln_ready = self.openvas_api.process_report(report_id=report_id)
vuln_ready['scan_name'] = scan_name vuln_ready['scan_name'] = scan_name.encode('utf8')
vuln_ready['scan_reference'] = report_id vuln_ready['scan_id'] = report_id
vuln_ready.rename(columns=self.COLUMN_MAPPING, inplace=True) vuln_ready.rename(columns=self.COLUMN_MAPPING, inplace=True)
vuln_ready.port = vuln_ready.port.fillna(0).astype(int) vuln_ready.port = vuln_ready.port.fillna(0).astype(int)
vuln_ready.fillna('', inplace=True) vuln_ready.fillna('', inplace=True)
@ -873,7 +876,7 @@ class vulnWhispererQualysVuln(vulnWhispererBase):
try: try:
self.logger.info('Processing report ID: {}'.format(report_id)) self.logger.info('Processing report ID: {}'.format(report_id))
vuln_ready = self.qualys_scan.process_data(scan_id=report_id) vuln_ready = self.qualys_scan.process_data(scan_id=report_id)
vuln_ready['scan_name'] = scan_name vuln_ready['scan_name'] = scan_name.encode('utf8')
vuln_ready['scan_reference'] = report_id vuln_ready['scan_reference'] = report_id
# Map and transform fields # Map and transform fields
vuln_ready = self.qualys_scan.normalise(vuln_ready) vuln_ready = self.qualys_scan.normalise(vuln_ready)