From 742a645190341239918d0daa0799219fd188742b Mon Sep 17 00:00:00 2001 From: nate Date: Tue, 3 Aug 2021 14:29:00 -0500 Subject: [PATCH] moved dict_tracker assignments into creation --- vulnwhisp/frameworks/qualys_web.py | 39 ++++++++++++++++-------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/vulnwhisp/frameworks/qualys_web.py b/vulnwhisp/frameworks/qualys_web.py index 78c6386..b4105f4 100644 --- a/vulnwhisp/frameworks/qualys_web.py +++ b/vulnwhisp/frameworks/qualys_web.py @@ -263,67 +263,70 @@ class qualysScanReport: def grab_sections(self, report): all_dataframes = [] - dict_tracker = {} - dict_tracker['WEB_SCAN_VULN_BLOCK'] = pd.DataFrame( + dict_tracker = { + 'WEB_SCAN_VULN_BLOCK': pd.DataFrame( self.utils.grab_section( report, self.WEB_SCAN_VULN_BLOCK, end=[self.WEB_SCAN_SENSITIVE_BLOCK, self.WEB_SCAN_INFO_BLOCK], pop_last=True), - columns=self.WEB_SCAN_VULN_HEADER) - dict_tracker['WEB_SCAN_SENSITIVE_BLOCK'] = pd.DataFrame( + columns=self.WEB_SCAN_VULN_HEADER), + 'WEB_SCAN_SENSITIVE_BLOCK': pd.DataFrame( self.utils.grab_section(report, self.WEB_SCAN_SENSITIVE_BLOCK, end=[self.WEB_SCAN_INFO_BLOCK, self.WEB_SCAN_SENSITIVE_BLOCK], pop_last=True), - columns=self.WEB_SCAN_SENSITIVE_HEADER) - dict_tracker['WEB_SCAN_INFO_BLOCK'] = pd.DataFrame( + columns=self.WEB_SCAN_SENSITIVE_HEADER), + 'WEB_SCAN_INFO_BLOCK': pd.DataFrame( self.utils.grab_section( report, self.WEB_SCAN_INFO_BLOCK, end=[self.QID_HEADER], pop_last=True), - columns=self.WEB_SCAN_INFO_HEADER) - dict_tracker['QID_HEADER'] = pd.DataFrame( + columns=self.WEB_SCAN_INFO_HEADER), + + 'QID_HEADER': pd.DataFrame( self.utils.grab_section( report, self.QID_HEADER, end=[self.GROUP_HEADER], pop_last=True), - columns=self.QID_HEADER) - dict_tracker['GROUP_HEADER'] = pd.DataFrame( + columns=self.QID_HEADER), + 'GROUP_HEADER': pd.DataFrame( self.utils.grab_section( report, self.GROUP_HEADER, end=[self.OWASP_HEADER], pop_last=True), - columns=self.GROUP_HEADER) - dict_tracker['OWASP_HEADER'] = pd.DataFrame( + columns=self.GROUP_HEADER), + 'OWASP_HEADER': pd.DataFrame( self.utils.grab_section( report, self.OWASP_HEADER, end=[self.WASC_HEADER], pop_last=True), - columns=self.OWASP_HEADER) - dict_tracker['WASC_HEADER'] = pd.DataFrame( + columns=self.OWASP_HEADER), + 'WASC_HEADER': pd.DataFrame( self.utils.grab_section( report, self.WASC_HEADER, end=[['APPENDIX']], pop_last=True), - columns=self.WASC_HEADER) - dict_tracker['SCAN_META'] = pd.DataFrame( + columns=self.WASC_HEADER), + 'SCAN_META': pd.DataFrame( self.utils.grab_section(report, self.SCAN_META, end=[self.CATEGORY_HEADER], pop_last=True), - columns=self.SCAN_META) - dict_tracker['CATEGORY_HEADER'] = pd.DataFrame( + columns=self.SCAN_META), + 'CATEGORY_HEADER': pd.DataFrame( self.utils.grab_section(report, self.CATEGORY_HEADER), columns=self.CATEGORY_HEADER) + } all_dataframes.append(dict_tracker) + return all_dataframes def data_normalizer(self, dataframes):