scan_export_status patch for issue 5217

Author: void-in

lib/nessus/nessus-xmlrpc.rb

@@ -181,12 +181,7 @@ def scan_export_status(scan_id, file_id)
       request = Net::HTTP::Get.new("/scans/#{scan_id}/export/#{file_id}/status")
       request.add_field("X-Cookie", @token)
       res = @connection.request(request)
-      if res.code == "200"
-        return "ready"
-      else
-        res = JSON.parse(res.body)
-        return res
-      end
+      return res.code, JSON.parse(res.body)
     end
 
     def policy_delete(policy_id)

plugins/nessus.rb

@@ -4,20 +4,21 @@
 
 module Msf
 
-  PLUGIN_NAME        = 'Nessus'
-  PLUGIN_DESCRIPTION = 'Nessus Bridge for Metasploit'
-
   class Plugin::Nessus < Msf::Plugin
 
     def name
-      PLUGIN_NAME
+      "Nessus"
+    end
+
+    def desc
+        "Nessus Bridge for Metasploit"
     end
 
     class ConsoleCommandDispatcher
       include Msf::Ui::Console::CommandDispatcher
 
       def name
-        PLUGIN_NAME
+        "Nessus"
       end
 
       def xindex
@@ -450,7 +451,7 @@ def cmd_nessus_template_list(*args)
           print_status("Returns a list of information about the scan or policy templates..")
           return
         end
-        if type.in?(['scan', 'policy'])
+        if type.downcase.in?(['scan', 'policy'])
           list=@n.list_template(type)
         else
           print_error("Only scan and policy are valid templates")
@@ -1183,7 +1184,7 @@ def cmd_nessus_scan_details(*args)
         when 2
           scan_id = args[0]
           category = args[1]
-          if category.in?(['info', 'hosts', 'vulnerabilities', 'history'])
+          if category.downcase.in?(['info', 'hosts', 'vulnerabilities', 'history'])
             category = args[1]
           else
             print_error("Invalid category. The available categories are info, hosts, vulnerabilities, and history")
@@ -1274,9 +1275,13 @@ def cmd_nessus_scan_export(*args)
             file_id = export["file"]
             print_good("The export file ID for scan ID #{scan_id} is #{file_id}")
             print_status("Checking export status...")
-            status = @n.scan_export_status(scan_id, file_id)
-            if status == "ready"
-              print_good("The status of scan ID #{scan_id} export is ready")
+            code, body = @n.scan_export_status(scan_id, file_id)
+            if code == "200"
+              if body =~ /ready/
+                print_good("The status of scan ID #{scan_id} export is ready")
+              else
+                print_status("Scan result not ready for download. Please check again after a few seconds")
+              end
             else
               print_error("There was some problem in exporting the scan. The error message is #{status}")
             end
@@ -1301,19 +1306,33 @@ def cmd_nessus_scan_export_status(*args)
         when 2
           scan_id = args[0]
           file_id = args[1]
-          status = @n.scan_export_status(scan_id, file_id)
-          if status == "ready"
-            print_status("The status of scan ID #{scan_id} export is ready")
-          else
-            print_error("There was some problem in exporting the scan. The error message is #{status}")
-          end
+          check_export_status(scan_id, file_id)
         else
           print_status("Usage: ")
           print_status("nessus_scan_export_status <scan ID> <file ID>")
           print_status("Use nessus_scan_export <scan ID> <format> to export a scan and get its file ID")
         end
       end
 
+      def check_export_status(scan_id, file_id, attempt = 0)
+        code, body = @n.scan_export_status(scan_id, file_id)
+        if code == "200"
+          if body.to_s =~ /ready/
+            print_status("The status of scan ID #{scan_id} export is ready")
+          else
+            if attempt < 3
+              print_status("Scan result not ready for download. Checking again...")
+              select(nil, nil, nil, 1)
+              attempt = attempt + 1
+              print_error("Current value of attempt is #{attempt}")
+              check_export_status(scan_id, file_id, attempt)
+            end
+          end
+        else
+          print_error("There was some problem in exporting the scan. The error message is #{body}")
+        end
+      end
+
       def cmd_nessus_plugin_list(*args)
         if args[0] == "-h"
           print_status("nessus_plugin_list <Family ID>")
@@ -1668,7 +1687,7 @@ def nessus_verify_db
     def initialize(framework, opts)
       super
       add_console_dispatcher(ConsoleCommandDispatcher)
-      print_status(PLUGIN_DESCRIPTION)
+      print_status("Nessus Bridge for Metasploit")
       print_status("Type %bldnessus_help%clr for a command listing")
     end