Merge pull request #12 from clee-r7/ms-2911

Ms 2911

Author: jbarnett-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.rb

@@ -33,6 +33,30 @@ def name
   def active
     raise 'DataLService#active is not implemented';
   end
+
+  #
+  # Hold metadata about a data service
+  #
+  class Metadata
+    attr_reader :id
+    attr_reader :name
+    attr_reader :active
+
+    def initialize (id, name, active)
+      self.id = id
+      self.name = name
+      self.active = active
+    end
+
+    #######
+    private
+    #######
+
+    attr_writer :id
+    attr_writer :name
+    attr_writer :active
+
+  end
 end
 end
 end

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

@@ -28,13 +28,13 @@ def initialize(opts = {})
   #
   def error
     return @error if (@error)
-    return @data_service.error if @data_service
-    return "none"
+    return @current_data_service.error if @current_data_service
+    return 'none'
   end
 
   def is_local?
-    if (@data_service)
-      return (@data_service.name == 'local_db_service')
+    if (@current_data_service)
+      return (@current_data_service.name == 'local_db_service')
     end
 
     return false
@@ -44,8 +44,8 @@ def is_local?
   # Determines if the data service is active
   #
   def active
-    if (@data_service)
-      return @data_service.active
+    if (@current_data_service)
+      return @current_data_service.active
     end
 
     return false
@@ -57,8 +57,6 @@ def active
   #
   def register_data_service(data_service, online=false)
     validate(data_service)
-
-    puts "Registering data service: #{data_service.name}"
     data_service_id = @data_service_id += 1
     @data_services[data_service_id] = data_service
     set_data_service(data_service_id, online)
@@ -70,67 +68,51 @@ def register_data_service(data_service, online=false)
   def set_data_service(data_service_id, online=false)
     data_service = @data_services[data_service_id.to_i]
     if (data_service.nil?)
-      puts "Data service with id: #{data_service_id} does not exist"
-      return nil
+      raise "Data service with id: #{data_service_id} does not exist"
     end
 
     if (!online && !data_service.active)
-      puts "Data service not online: #{data_service.name}, not setting as active"
-      return nil
+      raise "Data service not online: #{data_service.name}, not setting as active"
     end
 
-    puts "Setting active data service: #{data_service.name}"
-    @data_service = data_service
+    @current_data_service = data_service
   end
 
   #
-  # Prints out a list of the current data services
+  # Retrieves metadata about the data services
   #
-  def print_data_services()
+  def get_services_metadata()
+    services_metadata = []
     @data_services.each_key {|key|
-      out = "id: #{key}, description: #{@data_services[key].name}"
-      if (!@data_service.nil? && @data_services[key].name == @data_service.name)
-        out += " [active]"
-      end
-      puts out  #hahaha
+      name = @data_services[key].name
+      active = !@current_data_service.nil? && name == @current_data_service.name
+      services_metadata << Metasploit::Framework::DataService::Metadata.new(key, name, active)
     }
+
+    services_metadata
   end
 
   #
   # Used to bridge the local db
   #
   def method_missing(method, *args, &block)
-    #puts "Attempting to delegate method: #{method}"
-    unless @data_service.nil?
-      @data_service.send(method, *args, &block)
+    dlog ("Attempting to delegate method: #{method}")
+    unless @current_data_service.nil?
+      @current_data_service.send(method, *args, &block)
     end
   end
 
   def respond_to?(method_name, include_private=false)
-    unless @data_service.nil?
-      return @data_service.respond_to?(method_name, include_private)
+    unless @current_data_service.nil?
+      return @current_data_service.respond_to?(method_name, include_private)
     end
 
     false
   end
 
-  #
-  # Attempt to shutdown the local db process if it exists
-  #
-  def exit_called
-    if @pid
-      puts 'Killing db process'
-      begin
-        Process.kill("TERM", @pid)
-      rescue Exception => e
-        puts "Unable to kill db process: #{e.message}"
-      end
-    end
-  end
-
   def get_data_service
-    raise 'No registered data_service' unless @data_service
-    return @data_service
+    raise 'No registered data_service' unless @current_data_service
+    return @current_data_service
   end
 
   #######
@@ -143,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
-      puts "Unable to initialize a dataservice #{e.message}"
+      raise "Unable to initialize data service: #{e.message}"
     end
   end
 
@@ -170,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
-    puts "Started 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/proxy/credential_data_proxy.rb

@@ -5,7 +5,7 @@ def create_credential(opts)
       data_service = self.get_data_service()
       data_service.create_credential(opts)
     rescue Exception => e
-      puts "Call to #{data_service.class}#create_credential threw exception: #{e.message}"
+      elog "Problem creating credential: #{e.message}"
     end
   end
 
@@ -14,8 +14,7 @@ def creds(opts = {})
       data_service = self.get_data_service
       data_service.creds(opts)
     rescue Exception => e
-      puts "Call to #{data_service.class}#credentials threw exception: #{e.message}"
-      e.backtrace.each { |line| puts "#{line}\n" }
+      elog "Problem retrieving credentials: #{e.message}"
     end
   end
 end

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

@@ -5,7 +5,7 @@ def report_event(opts)
       data_service = self.get_data_service()
       data_service.report_event(opts)
     rescue  Exception => e
-      puts"Call to  #{data_service.class}#report_event threw exception: #{e.message}"
+      elog "Problem reporting event: #{e.message}"
     end
   end
 

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

@@ -5,7 +5,7 @@ def report_exploit_attempt(host, opts)
       data_service = self.get_data_service()
       data_service.report_exploit_attempt(host, opts)
     rescue  Exception => e
-      puts"Call to  #{data_service.class}#report_exploit_attempt threw exception: #{e.message}"
+      elog "Problem reporting exploit attempt: #{e.message}"
     end
   end
 
@@ -14,7 +14,7 @@ def report_exploit_failure(opts)
       data_service = self.get_data_service()
       data_service.report_exploit_failure(opts)
     rescue  Exception => e
-      puts"Call to  #{data_service.class}#report_exploit_failure threw exception: #{e.message}"
+      elog "Problem reporting exploit failure: #{e.message}"
     end
   end
 
@@ -23,7 +23,7 @@ def report_exploit_success(opts)
       data_service = self.get_data_service()
       data_service.report_exploit_success(opts)
     rescue  Exception => e
-      puts"Call to  #{data_service.class}#report_exploit_success threw exception: #{e.message}"
+      elog "Problem reporting exploit success: #{e.message}"
     end
   end
 end

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

@@ -10,14 +10,13 @@ def hosts(wspace = workspace, non_dead = false, addresses = nil, search_term = n
       opts[:search_term] = search_term
       data_service.hosts(opts)
     rescue Exception => e
-      puts "Call to #{data_service.class}#hosts threw exception: #{e.message}"
+      elog "Problem retrieving hosts: #{e.message}"
     end
   end
 
   # TODO: Shouldn't this proxy to RemoteHostDataService#find_or_create_host ?
   # It's currently skipping the "find" part
   def find_or_create_host(opts)
-    puts 'Calling find host'
     report_host(opts)
   end
 
@@ -28,8 +27,7 @@ def report_host(opts)
       data_service = self.get_data_service()
       data_service.report_host(opts)
     rescue Exception => e
-      puts "Call to #{data_service.class}#report_host threw exception: #{e.message}"
-      opts.each { |k, v| puts "#{k} : #{v}" }
+      elog "Problem reporting host: #{e.message}"
     end
   end
 
@@ -38,7 +36,7 @@ def report_hosts(hosts)
       data_service = self.get_data_service()
       data_service.report_hosts(hosts)
     rescue Exception => e
-      puts "Call to #{data_service.class}#report_hosts threw exception: #{e.message}"
+      elog "Problem reporting hosts: #{e.message}"
     end
   end
 
@@ -47,21 +45,21 @@ def delete_host(opts)
       data_service = self.get_data_service()
       data_service.delete_host(opts)
     rescue Exception => e
-      puts "Call to #{data_service.class}#delete_host threw exception: #{e.message}"
+      elog "Problem removing host: #{e.message}"
     end
   end
 
   private
 
   def valid(opts)
     unless opts[:host]
-      puts 'Invalid host hash passed, :host is missing'
+      ilog 'Invalid host hash passed, :host is missing'
       return false
     end
 
     # Sometimes a host setup through a pivot will see the address as "Remote Pipe"
     if opts[:host].eql? "Remote Pipe"
-      puts "Invalid host hash passed, address was of type 'Remote Pipe'"
+      ilog "Invalid host hash passed, address was of type 'Remote Pipe'"
       return false
     end
 

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

@@ -8,7 +8,7 @@ def report_loot(opts)
       end
       data_service.report_loot(opts)
     rescue Exception => e
-      puts "Call to #{data_service.class}#report_loot threw exception: #{e.message}"
+      elog "Problem reporting loot: #{e.message}"
     end
   end
 
@@ -18,9 +18,9 @@ def loots(wspace, opts = {})
       opts[:wspace] = wspace
       data_service.loot(opts)
     rescue Exception => e
-      puts "Call to #{data_service.class}#loots threw exception: #{e.message}"
-      e.backtrace.each { |line| puts "#{line}\n" }
+      elog "Problem retrieving loot: #{e.message}"
     end
   end
+
   alias_method :loot, :loots
 end

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

@@ -5,8 +5,7 @@ def import_nmap_xml_file(args = {})
       data_service = self.get_data_service()
       data_service.import_nmap_xml_file(args)
     rescue Exception => e
-      puts "Call to #{data_service.class}#import_nmap_xml_file threw exception: #{e.message}"
-      e.backtrace { |line| puts "#{line}\n"}
+      elog "Problem importing NMAP XML: #{e.message}"
     end
   end
 end

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

@@ -4,7 +4,7 @@ def report_note(opts)
       data_service = self.get_data_service()
       data_service.report_note(opts)
     rescue  Exception => e
-      puts"Call to  #{data_service.class}#report_note threw exception: #{e.message}"
+      elog "Problem reporting note: #{e.message}"
     end
   end
 end