WIP: getting services add working

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

@@ -9,4 +9,19 @@ module ServiceDataProxy
     end
   end
 
+  def services(wspace = workspace, only_up = false, proto = nil, addresses = nil, ports = nil, names = nil)
+    begin
+      data_service = self.get_data_service()
+      opts = {}
+      opts[:workspace] = wspace
+      opts[:only_up] = only_up
+      opts[:proto] = proto
+      opts[:address] = addresses
+      opts[:ports] = ports
+      opts[:names] = names
+      data_service.services(opts)
+    rescue Exception => e
+      elog "Problem retrieving services: #{e.message}"
+    end
+  end
 end

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

@@ -1,7 +1,12 @@
 module RemoteServiceDataService
-  SERVICE_API_PATH = '/api/v1/services'
+  SERVICE_API_PATH  = '/api/v1/services'
+  SERVICE_MDM_CLASS = 'Mdm::Service'
 
   def report_service(opts)
     self.post_data_async(SERVICE_API_PATH, opts)
   end
+
+  def services(opts)
+    json_to_mdm_object(self.get_data(SERVICE_API_PATH, nil, opts), SERVICE_MDM_CLASS, [])
+  end
 end

lib/msf/core/db_manager/http/servlet/service_servlet.rb

@@ -5,6 +5,7 @@ module ServiceServlet
   end
 
   def self.registered(app)
+    app.get  ServiceServlet.api_path, &get_services
     app.post ServiceServlet.api_path, &report_service
   end
 
@@ -12,11 +13,16 @@ module ServiceServlet
   private
   #######
 
-  def self.get_host
+  def self.get_services
     lambda {
       begin
         opts = parse_json_request(request, false)
-        data = get_db().hosts(opts)
+        data = get_db().services(opts[:workspace],
+                                 opts[:only_up],
+                                 opts[:proto],
+                                 opts[:address],
+                                 opts[:ports],
+                                 opts[:names])
         set_json_response(data)
       rescue Exception => e
         set_error_on_response(e)