From 9619a47d7a909fd98b6d43b11af21117fc66c2c2 Mon Sep 17 00:00:00 2001
From: pemontto <939704+pemontto@users.noreply.github.com>
Date: Mon, 1 Apr 2019 19:04:12 +1100
Subject: [PATCH] Fix Tenable and Nessus scan listing (#162)

* Prevent multiple requests to nessus scans endpoint

* Remove unnecessary call
---
 vulnwhisp/frameworks/nessus.py | 3 ++-
 vulnwhisp/vulnwhisp.py         | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vulnwhisp/frameworks/nessus.py b/vulnwhisp/frameworks/nessus.py
index 09ce24e..5423caf 100755
--- a/vulnwhisp/frameworks/nessus.py
+++ b/vulnwhisp/frameworks/nessus.py
@@ -53,6 +53,7 @@ class NessusAPI(object):
         }
 
         self.login()
+        self.scans = self.get_scans()
         self.scan_ids = self.get_scan_ids()
 
     def login(self):
@@ -113,7 +114,7 @@ class NessusAPI(object):
         return scans
 
     def get_scan_ids(self):
-        scans = self.get_scans()
+        scans = self.scans
         scan_ids = [scan_id['id'] for scan_id in scans['scans']] if scans['scans'] else []
         self.logger.debug('Found {} scan_ids'.format(len(scan_ids)))
         return scan_ids
diff --git a/vulnwhisp/vulnwhisp.py b/vulnwhisp/vulnwhisp.py
index ba30aeb..0e79437 100755
--- a/vulnwhisp/vulnwhisp.py
+++ b/vulnwhisp/vulnwhisp.py
@@ -312,7 +312,7 @@ class vulnWhispererNessus(vulnWhispererBase):
 
     def whisper_nessus(self):
         if self.nessus_connect:
-            scan_data = self.nessus.get_scans()
+            scan_data = self.nessus.scans
             folders = scan_data['folders']
             scans = scan_data['scans'] if scan_data['scans'] else []
             all_scans = self.scan_count(scans)
@@ -368,7 +368,6 @@ class vulnWhispererNessus(vulnWhispererBase):
                 # TODO Create directory sync function which scans the directory for files that exist already and populates the database
 
                 folder_id = s['folder_id']
-                scan_history = self.nessus.get_scan_history(scan_id)
                 if self.CONFIG_SECTION == 'tenable':
                     folder_name = ''
                 else: