Renamed msfdb to avoid omnibus collision, removed inline data service startup code

Author: clee-r7

lib/metasploit/framework/command/console.rb

@@ -79,7 +79,6 @@ def driver_options
       driver_options['DatabaseEnv'] = options.environment
       driver_options['DatabaseMigrationPaths'] = options.database.migrations_paths
       driver_options['DatabaseYAML'] = options.database.config
-      driver_options['DatabaseRemoteProcess'] = options.database.remote_process
       driver_options['DeferModuleLoads'] = options.modules.defer_loads
       driver_options['DisableBanner'] = options.console.quiet
       driver_options['DisableDatabase'] = options.database.disable

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

@@ -110,20 +110,6 @@ def respond_to?(method_name, include_private=false)
     false
   end
 
-  #
-  # Attempt to shutdown the local db process if it exists
-  #
-  def exit_called
-    if @pid
-      ilog 'Shutdown called, attempting to kill db process'
-      begin
-        Process.kill('TERM', @pid)
-      rescue Exception => e
-        elog "Unable to kill db process: #{e.message}"
-      end
-    end
-  end
-
   def get_data_service
     raise 'No registered data_service' unless @current_data_service
     return @current_data_service
@@ -139,14 +125,11 @@ def setup(opts)
       if !db_manager.nil?
         register_data_service(db_manager, true)
         @usable = true
-      elsif opts['DatabaseRemoteProcess']
-        run_remote_db_process(opts)
-        @usable = true
       else
         @error = 'disabled'
       end
     rescue Exception => e
-      raise "Unable to initialize a dataservice #{e.message}"
+      raise "Unable to initialize data service: #{e.message}"
     end
   end
 
@@ -166,19 +149,6 @@ def data_service_exist?(data_service)
     return false
   end
 
-
-  def run_remote_db_process(opts)
-    # started with no signal to prevent ctrl-c from taking out db
-    db_script = File.join( Msf::Config.install_root, "msfdb -ns")
-    wait_t = Open3.pipeline_start(db_script)
-    @pid = wait_t[0].pid
-    dlog("Started data service process with pid #{@pid}")
-
-    endpoint = URI.parse('http://localhost:8080')
-    remote_host_data_service = Metasploit::Framework::DataService::RemoteHTTPDataService.new(endpoint)
-    register_data_service(remote_host_data_service, true)
-  end
-
 end
 end
 end

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

@@ -31,6 +31,18 @@ def initialize(endpoint, https_opts = {})
     build_client_pool(5)
   end
 
+  def connection_established?
+    true
+  end
+
+  def after_establish_connection
+
+  end
+
+  def error
+    'none'
+  end
+
   #
   # POST data to the HTTP endpoint and don't wait for the endpoint to process the data before getting a response
   #

lib/metasploit/framework/parsed_options/base.rb

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

lib/metasploit/framework/parsed_options/remote_db.rb

@@ -22,7 +22,9 @@ def options
     @options
   end
 
+  #######
   private
+  #######
 
   def option_parser
     unless @option_parser

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

@@ -7,14 +7,6 @@ class HttpDBManagerService
 
   def start(opts)
     parsed_options = Metasploit::Framework::ParsedOptions::RemoteDB.new
-    if (parsed_options.options.database.no_signal)
-      print_warning 'Trap handling removed'
-      opts[:signals] = false
-      @shutdown_on_interupt = false
-    else
-      @shutdown_on_interupt = true
-    end
-
     require_environment!(parsed_options)
 
     if opts[:ssl]
@@ -36,13 +28,6 @@ def start_http_server(opts)
 
     Rack::Handler::Thin.run(SinatraApp, opts) do |server|
 
-      # TODO: prevent accidental shutdown from msfconsole eg: ctrl-c
-      [:INT, :TERM].each { |sig|
-        trap(sig) {
-          server.stop if (@shutdown_on_interupt || sig == :TERM)
-        }
-      }
-
       if opts[:ssl] && opts[:ssl] = true
         print_good "SSL Enabled"
         server.ssl = true

lib/msf/core/framework.rb

@@ -272,7 +272,7 @@ def search(match, logger: nil)
   private
 
   def get_db
-    if !options['DatabaseRemoteProcess'] && !options['DisableDatabase']
+    if !options['DisableDatabase']
       db_manager = Msf::DBManager.new(self)
       db_manager.init_db(options)
       options[:db_manager] = db_manager

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

@@ -457,7 +457,6 @@ def cmd_exit(*args)
     forced = false
     forced = true if (args[0] and args[0] =~ /-y/i)
 
-    framework.db.exit_called
     if(framework.sessions.length > 0 and not forced)
       print_status("You have active sessions open, to exit anyway type \"exit -y\"")
       return

msfdb renamed to msfdb_ws

@@ -20,7 +20,7 @@ end
 def parse_args(args)
   opts = {}
   opt = OptionParser.new
-  banner = "msfdb - A remote database process for Metasploit Framework.\n"
+  banner = "msfdb_ws - Metasploit data store as a web service.\n"
   banner << "Usage: #{$0} [options] <var=val>"
   opt.banner = banner
   opt.separator('')