More general cleanup including is_local db check

Author: clee-r7

Gemfile

@@ -23,7 +23,6 @@ group :development do
   # module documentation
   gem 'octokit'
   # Metasploit::Aggregator external session proxy
-
   # Disabled for now for crypttlv updates
   # gem 'metasploit-aggregator'
 end

Gemfile.lock

@@ -110,8 +110,8 @@ GEM
     bindata (2.4.1)
     bit-struct (0.16)
     builder (3.2.3)
-    coderay (1.1.1)
     coderay (1.1.2)
+    daemons (1.2.4)
     diff-lcs (1.3)
     dnsruby (1.60.2)
     docile (1.1.5)
@@ -315,7 +315,6 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    slop (3.6.0)
     sqlite3 (1.3.13)
     sshkey (1.9.0)
     thin (1.7.1)

lib/metasploit/framework/data_service/proxy/core.rb

@@ -29,6 +29,14 @@ def error
     return "none"
   end
 
+  def is_local?
+    if (@data_service)
+      return (@data_service.name == 'local_db_service')
+    end
+
+    return false
+  end
+
   #
   # Determines if the data service is active
   #
@@ -117,7 +125,7 @@ def print_data_services()
   # Used to bridge the local db
   #
   def method_missing(method, *args, &block)
-    puts "Attempting to delegate method: #{method}"
+    #puts "Attempting to delegate method: #{method}"
     unless @data_service.nil?
       @data_service.send(method, *args, &block)
     end

lib/metasploit/framework/data_service/remote/http/remote_session_data_service.rb

@@ -10,7 +10,6 @@ def report_session(opts)
       opts[:host] = opts[:host].address
     end
 
-    #TODO: Fix
     opts[:time_stamp] = Time.now.utc
     self.post_data_async(SESSION_API_PATH, opts)
   end
@@ -43,7 +42,7 @@ def parse_host_opts(msf_session)
   def parse_session_data(msf_session)
     hash = Hash.new()
     # TODO: what to do with this shiz
-    # hash[:datastore] = msf_session.exploit_datastore.to_h
+    hash[:datastore] = msf_session.exploit_datastore.to_h
     hash[:desc] = msf_session.info
     hash[:local_id] = msf_session.sid
     hash[:platform] = msf_session.session_type

lib/metasploit/framework/parsed_options/base.rb

@@ -137,7 +137,7 @@ def option_parser
         options.database.config = path
       end
 
-      option_parser.on('-dbrp', 'Run database as a remote process') do
+      option_parser.on('-dbrp', 'Run database as a separate local process') do
         options.database.remote_process = true
       end
 

lib/msf/core/auxiliary/scanner.rb

@@ -61,14 +61,6 @@ def peer
   super.ljust(21)
 end
 
-  def formatted_duration (total_seconds)
-    hours = total_seconds / (60 * 60)
-    minutes = (total_seconds / 60) % 60
-    seconds = total_seconds % 60
-
-    " #{ hours } h #{ minutes } m #{ seconds } s"
-  end
-
 #
 # The command handler when launched from the console
 #
@@ -121,8 +113,6 @@ def run
 
   if (self.respond_to?('run_host'))
 
-    start_time = Time.now.to_i
-
     loop do
       # Stop scanning if we hit a fatal error
       break if has_fatal_errors?
@@ -181,8 +171,6 @@ def run
       scanner_show_progress() if @show_progress
     end
 
-    puts "Time to scan hosts: #{formatted_duration(Time.now.to_i - start_time)}"
-
     scanner_handle_fatal_errors
     return
   end

lib/msf/core/db_manager.rb

@@ -131,9 +131,7 @@ def initialize(framework, opts = {})
       return
     end
 
-    init_success = initialize_database_support
-
-    return init_success
+    return initialize_database_support
   end
 
   #

lib/msf/core/db_manager.tar.gz

@@ -232,7 +232,7 @@ def threads?
   def search(match, logger: nil)
     # Check if the database is usable
     use_db = true
-    if self.db
+    if self.db and self.db.is_local?
       if !(self.db.migrated && self.db.modules_cached)
         logger.print_warning("Module database cache not built yet, using slow search") if logger
         use_db = false
@@ -336,19 +336,19 @@ def on_module_error(instance, exception=nil)
 
   include ::Msf::UiEventSubscriber
   ##
-  # :category: ::Msf::Uips -ef | EventSubscriber implementors
+  # :category: ::Msf::UiEventSubscriber implementors
   def on_ui_command(command)
-    # if framework.db.active
-    #   report_event(:name => "ui_command", :info => {:command => command})
-    # end
+    if (framework.db and framework.db.active)
+      report_event(:name => "ui_command", :info => {:command => command})
+    end
   end
 
   ##
   # :category: ::Msf::UiEventSubscriber implementors
   def on_ui_stop()
-    # if framework.db.active
-    #   report_event(:name => "ui_stop")
-    # end
+    if (framework.db and framework.db.active)
+      report_event(:name => "ui_stop")
+    end
   end
 
   ##

lib/msf/core/framework.rb

@@ -131,8 +131,13 @@ def refresh_cache_from_database(allowed_paths=[""])
   # @return [true] if migrations have been run
   # @return [false] otherwise
   def framework_migrated?
+    if (framework.db)
+      if (framework.db.is_local?)
+        return framework.db.migrated
+      end
+    end
+
     return false
-    #framework.db && framework.db.migrated
   end
 
   # @!attribute [rw] module_info_by_path