Bug fixes

Author: clee-r7

lib/msf/core/db_manager/http/servlet_helper.rb

@@ -27,7 +27,7 @@ def parse_json_request(request, strict = false)
     end
 
     hash = JSON.parse(body)
-    hash.symbolize_keys
+    hash.deep_symbolize_keys
   end
 
   def exec_report_job(request, &job)
@@ -39,9 +39,10 @@ def exec_report_job(request, &job)
       exec_async = opts.delete(:exec_async)
       if (exec_async)
         JobProcessor.instance.submit_job(opts, &job)
+        return set_empty_response()
       else
         data = job.call(opts)
-        set_json_response(data)
+        return set_json_response(data)
       end
 
     rescue Exception => e

lib/msf/core/db_manager/vuln.rb

@@ -105,7 +105,7 @@ def report_vuln(opts)
       opts[:refs].each do |r|
         if (r.respond_to?(:ctx_id)) and (r.respond_to?(:ctx_val))
           r = "#{r.ctx_id}-#{r.ctx_val}"
-        elsif (r.is_a?(Hash) and r['ctx_id'] and r['ctx_val'])
+        elsif (r.is_a?(Hash) and r[:ctx_id] and r[:ctx_val])
           r = "#{r[:ctx_id]}-#{r[:ctx_val]}"
         end
         rids << find_or_create_ref(:name => r)

lib/msf/ui/console/command_dispatcher/db.rb

@@ -92,7 +92,7 @@ def cmd_set_data_service(service_id)
   end
 
   def cmd_list_data_services()
-    data_service_manager = Metasploit::Framework::DataService::DataProxy..instance
+    data_service_manager = Metasploit::Framework::DataService::DataProxy.instance
     data_service_manager.print_data_services
   end