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

allow partial matches for nessus and tenable

Browse Source
This commit is contained in:
pemontto
2019-05-10 19:21:58 +01:00
parent e19dfd000c
commit a3a35502ec
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vulnwhisp/vulnwhisp.py
View File

@ -475,6 +475,15 @@ class vulnWhispererNessus(vulnWhispererBase):
scans = scan_data['scans'] if scan_data['scans'] else [] scans = scan_data['scans'] if scan_data['scans'] else []
all_scans = self.scan_count(scans) all_scans = self.scan_count(scans)
if self.scan_filter:
self.logger.info('Filtering scans that match "{}"'.format(self.scan_filter))
import code
code.interact(local=dict(globals(), **locals()))
all_scans = [
x for x in all_scans
if re.findall(self.scan_filter, x["scan_name"], re.IGNORECASE)
]
if self.list_scans: if self.list_scans:
scan_list = [] scan_list = []
for scan in all_scans: for scan in all_scans:
@ -493,12 +502,7 @@ class vulnWhispererNessus(vulnWhispererBase):
] ]
else: else:
scan_list = all_scans scan_list = all_scans
if self.scan_filter:
self.logger.info('Filtering scans that match "{}"'.format(self.scan_filter))
scan_list = [
x for x in scan_list
if re.match(self.scan_filter, x["scan_name"], re.IGNORECASE)
]
self.logger.info( self.logger.info(
"Identified {new} scans to be processed".format(new=len(scan_list)) "Identified {new} scans to be processed".format(new=len(scan_list))
) )
@ -1046,9 +1050,10 @@ class vulnWhispererQualysVM(vulnWhispererBase):
if self.uuids: if self.uuids:
self.scans_to_process = self.latest_scans.loc[ self.scans_to_process = self.latest_scans.loc[
(~self.latest_scans['id'].isin(self.uuids)) (~self.latest_scans['id'].isin(self.uuids))
& (self.latest_scans['status'] == 'Finished')] & (self.latest_scans['status'] == 'Finished')].copy()
else: else:
self.scans_to_process = self.latest_scans self.scans_to_process = self.latest_scans.copy()
self.scans_to_process.sort_values(by='date', inplace=True)
self.logger.info('Identified {new} scans to be processed'.format(new=len(self.scans_to_process))) self.logger.info('Identified {new} scans to be processed'.format(new=len(self.scans_to_process)))