merge with testing

vulnwhisp/frameworks/qualys_vuln.py

@@ -19,7 +19,7 @@ class qualysWhisperAPI(object):
         self.logger = logging.getLogger('qualysWhisperAPI')
         self.config = config
         try:
-            self.qgc = qualysapi.connect(config)
+            self.qgc = qualysapi.connect(config, 'qualys_vuln')
             # Fail early if we can't make a request or auth is incorrect
             self.qgc.request('about.php')
             self.logger.info('Connected to Qualys at {}'.format(self.qgc.server))

vulnwhisp/frameworks/qualys_web.py

@@ -37,7 +37,7 @@ class qualysWhisperAPI(object):
         self.logger = logging.getLogger('qualysWhisperAPI')
         self.config = config
         try:
-            self.qgc = qualysapi.connect(config)
+            self.qgc = qualysapi.connect(config, 'qualys_web')
             self.logger.info('Connected to Qualys at {}'.format(self.qgc.server))
         except Exception as e:
             self.logger.error('Could not connect to Qualys: {}'.format(str(e)))

vulnwhisp/vulnwhisp.py

@@ -4,7 +4,7 @@ __author__ = 'Austin Taylor'
 
 from base.config import vwConfig
 from frameworks.nessus import NessusAPI
-from frameworks.qualys import qualysScanReport
+from frameworks.qualys_web import qualysScanReport
 from frameworks.qualys_vuln import qualysVulnScan
 from frameworks.openvas import OpenVAS_API
 from reporting.jira_api import JiraAPI
@@ -448,7 +448,7 @@ class vulnWhispererNessus(vulnWhispererBase):
 
 class vulnWhispererQualys(vulnWhispererBase):
 
-    CONFIG_SECTION = 'qualys'
+    CONFIG_SECTION = 'qualys_web'
     COLUMN_MAPPING = {'Access Path': 'access_path',
                      'Ajax Request': 'ajax_request',
                      'Ajax Request ID': 'ajax_request_id',
@@ -1157,7 +1157,7 @@ class vulnWhisperer(object):
                                      profile=self.profile)
             vw.whisper_nessus()
 
-        elif self.profile == 'qualys':
+        elif self.profile == 'qualys_web':
             vw = vulnWhispererQualys(config=self.config)
             vw.process_web_assets()