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

remove unnecessary conditional

Browse Source
This commit is contained in:
pemontto
2019-04-17 19:27:04 +10:00
parent 08334973be
commit e3907940bc
1 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
vulnwhisp/vulnwhisp.py
View File

@ -411,8 +411,7 @@ class vulnWhispererNessus(vulnWhispererBase):
all_scans = self.scan_count(scans) all_scans = self.scan_count(scans)
if self.uuids: if self.uuids:
scan_list = [ scan_list = [
scan scan for scan in all_scans
for scan in all_scans
if scan["uuid"] not in self.uuids if scan["uuid"] not in self.uuids
and scan["status"] in ["completed", "imported"] and scan["status"] in ["completed", "imported"]
] ]
@ -504,54 +503,38 @@ class vulnWhispererNessus(vulnWhispererBase):
self.exit_code += 1 self.exit_code += 1
continue continue
self.logger.info('Processing {}/{} for scan: {}'.format(scan_count, len(scan_list), scan_name.encode('utf8')))
vuln_ready = pd.read_csv(io.StringIO(file_req.decode('utf-8'))) vuln_ready = pd.read_csv(io.StringIO(file_req.decode('utf-8')))
if len(vuln_ready) > 2:
self.logger.info('Processing {}/{} for scan: {}'.format(scan_count, len(scan_list), scan_name.encode('utf8')))
# Map and transform fields # Map and transform fields
vuln_ready = self.nessus.normalise(vuln_ready) vuln_ready = self.nessus.normalise(vuln_ready)
vuln_ready = self.common_normalise(vuln_ready) vuln_ready = self.common_normalise(vuln_ready)
# Set common fields # Set common fields
vuln_ready['scan_name'] = scan_name.encode('utf8') vuln_ready['scan_name'] = scan_name.encode('utf8')
vuln_ready['scan_id'] = uuid vuln_ready['scan_id'] = uuid
# Add timestamp and convert to milliseconds # Add timestamp
vuln_ready['_timestamp'] = norm_time vuln_ready['_timestamp'] = norm_time
vuln_ready['scan_source'] = self.CONFIG_SECTION vuln_ready['scan_source'] = self.CONFIG_SECTION
vuln_ready.to_json(relative_path_name, orient='records', lines=True) vuln_ready.to_json(relative_path_name, orient='records', lines=True)
record_meta = ( record_meta = (
scan_name, scan_name,
scan_id, scan_id,
norm_time, norm_time,
file_name, file_name,
time.time(), time.time(),
vuln_ready.shape[0], vuln_ready.shape[0],
self.CONFIG_SECTION, self.CONFIG_SECTION,
uuid, uuid,
1, 1,
0, 0,
) )
self.record_insert(record_meta) self.record_insert(record_meta)
self.logger.info('{filename} records written to {path} '.format(filename=vuln_ready.shape[0], self.logger.info('{records} records written to {path} '.format(records=vuln_ready.shape[0],
path=file_name.encode('utf8'))) path=file_name.encode('utf8')))
else:
record_meta = (
scan_name,
scan_id,
norm_time,
file_name,
time.time(),
vuln_ready.shape[0],
self.CONFIG_SECTION,
uuid,
1,
0,
)
self.record_insert(record_meta)
self.logger.warn('{} has no host available... Updating database and skipping!'.format(file_name))
self.conn.close() self.conn.close()
self.logger.info('Scan aggregation complete! Connection to database closed.') self.logger.info('Scan aggregation complete! Connection to database closed.')
else: else:
@ -691,7 +674,7 @@ class vulnWhispererQualys(vulnWhispererBase):
# Set common fields # Set common fields
vuln_ready['scan_name'] = scan_name.encode('utf8') vuln_ready['scan_name'] = scan_name.encode('utf8')
vuln_ready['scan_id'] = report_id vuln_ready['scan_id'] = report_id
# Add timestamp and convert to milliseconds # Add timestamp
vuln_ready['_timestamp'] = launched_date vuln_ready['_timestamp'] = launched_date
vuln_ready['scan_source'] = self.CONFIG_SECTION vuln_ready['scan_source'] = self.CONFIG_SECTION
@ -969,7 +952,7 @@ class vulnWhispererQualysVuln(vulnWhispererBase):
vuln_ready['scan_name'] = scan_name.encode('utf8') vuln_ready['scan_name'] = scan_name.encode('utf8')
vuln_ready['scan_id'] = report_id vuln_ready['scan_id'] = report_id
# Add timestamp and convert to milliseconds # Add timestamp
vuln_ready['_timestamp'] = launched_date vuln_ready['_timestamp'] = launched_date
vuln_ready['scan_source'] = self.CONFIG_SECTION vuln_ready['scan_source'] = self.CONFIG_SECTION