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

Fix *some* unicode issues for nessus and qualys (#160)

Browse Source 
* Fix *some* unicode issues for nessus and qualys

* More unicode fixes
This commit is contained in:
pemontto
2019-04-01 19:06:16 +11:00
committed by Quim Montal
parent 9619a47d7a
commit e32c9bf55d
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vulnwhisp/frameworks/qualys_vuln.py
View File

@ -30,7 +30,7 @@ class qualysWhisperAPI(object):
def scan_xml_parser(self, xml): def scan_xml_parser(self, xml):
all_records = [] all_records = []
root = ET.XML(xml) root = ET.XML(xml.encode("utf-8"))
for child in root.find('.//SCAN_LIST'): for child in root.find('.//SCAN_LIST'):
all_records.append({ all_records.append({
'name': child.find('TITLE').text, 'name': child.find('TITLE').text,

15
vulnwhisp/vulnwhisp.py
View File

@ -164,11 +164,11 @@ class vulnWhispererBase(object):
if not os.path.exists(self.write_path): if not os.path.exists(self.write_path):
os.makedirs(self.write_path) os.makedirs(self.write_path)
self.logger.info('Directory created at {scan} - Skipping creation'.format( self.logger.info('Directory created at {scan} - Skipping creation'.format(
scan=self.write_path)) scan=self.write_path.encode('utf8')))
else: else:
os.path.exists(self.write_path) os.path.exists(self.write_path)
self.logger.info('Directory already exist for {scan} - Skipping creation'.format( self.logger.info('Directory already exist for {scan} - Skipping creation'.format(
scan=self.write_path)) scan=self.write_path.encode('utf8')))
def get_latest_results(self, source, scan_name): def get_latest_results(self, source, scan_name):
try: try:
@ -302,7 +302,6 @@ class vulnWhispererNessus(vulnWhispererBase):
scan_records.append(record.copy()) scan_records.append(record.copy())
except Exception as e: except Exception as e:
# Generates error each time nonetype is encountered. # Generates error each time nonetype is encountered.
pass pass
if completed: if completed:
@ -338,8 +337,7 @@ class vulnWhispererNessus(vulnWhispererBase):
else: else:
os.path.exists(self.path_check(f['name'])) os.path.exists(self.path_check(f['name']))
self.logger.info('Directory already exist for {scan} - Skipping creation'.format( self.logger.info('Directory already exist for {scan} - Skipping creation'.format(
scan=self.path_check(f['name' scan=self.path_check(f['name']).encode('utf8')))
])))
# try download and save scans into each folder the belong to # try download and save scans into each folder the belong to
@ -400,10 +398,9 @@ class vulnWhispererNessus(vulnWhispererBase):
self.nessus.download_scan(scan_id=scan_id, history=history_id, self.nessus.download_scan(scan_id=scan_id, history=history_id,
export_format='csv', profile=self.CONFIG_SECTION) export_format='csv', profile=self.CONFIG_SECTION)
clean_csv = \ clean_csv = \
pd.read_csv(io.StringIO(file_req.decode('utf-8' pd.read_csv(io.StringIO(file_req.decode('utf-8')))
)))
if len(clean_csv) > 2: if len(clean_csv) > 2:
self.logger.info('Processing {}/{} for scan: {}'.format(scan_count, len(scan_list), scan_name)) self.logger.info('Processing {}/{} for scan: {}'.format(scan_count, len(scan_list), scan_name.encode('utf8')))
columns_to_cleanse = ['CVSS','CVE','Description','Synopsis','Solution','See Also','Plugin Output'] columns_to_cleanse = ['CVSS','CVE','Description','Synopsis','Solution','See Also','Plugin Output']
for col in columns_to_cleanse: for col in columns_to_cleanse:
@ -423,7 +420,7 @@ class vulnWhispererNessus(vulnWhispererBase):
) )
self.record_insert(record_meta) self.record_insert(record_meta)
self.logger.info('{filename} records written to {path} '.format(filename=clean_csv.shape[0], self.logger.info('{filename} records written to {path} '.format(filename=clean_csv.shape[0],
path=file_name)) path=file_name.encode('utf8')))
else: else:
record_meta = ( record_meta = (
scan_name, scan_name,