Connect and get working with net/http.

POST looks to be working too.

Author: jbarnett-r7

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

@@ -1,6 +1,8 @@
 require 'metasploit/framework/data_service/remote/http/remote_service_endpoint'
 require 'metasploit/framework/data_service'
 require 'metasploit/framework/data_service/remote/http/data_service_auto_loader'
+require 'net/http'
+require 'net/https'
 
 #
 # Parent data service for managing metasploit data in/on a separate process/machine over HTTP(s)
@@ -47,15 +49,15 @@ def post_data(path, data_hash)
 
       puts "#{Time.now} - Posting #{data_hash} to #{path}"
       client =  @client_pool.pop()
-      request_opts = build_request_opts(POST_REQUEST, data_hash, path)
-      request = client.request_raw(request_opts)
-      response = client._send_recv(request)
+      request = Net::HTTP::Post.new(path)
+      request = build_request(request, data_hash)
+      response = client.request(request)
 
-      if response.code == 200
+      if response.code == "200"
         #puts "POST request: #{path} with body: #{json_body} sent successfully"
         return SuccessResponse.new(response)
       else
-        puts "POST request: #{path} with body: #{json_body} failed with code: #{response.code} message: #{response.body}"
+        puts "POST request: #{path} with body: #{request.body} failed with code: #{response.code} message: #{response.body}"
         return FailedResponse.new(response)
       end
     rescue Exception => e
@@ -81,11 +83,11 @@ def get_data(path, data_hash = nil)
 
       puts "#{Time.now} - Getting #{path} with #{data_hash ? data_hash : "nil"}"
       client =  @client_pool.pop()
-      request_opts = build_request_opts(GET_REQUEST, data_hash, path)
-      request = client.request_raw(request_opts)
-      response = client._send_recv(request)
+      request = Net::HTTP::Get.new(path)
+      request = build_request(request, data_hash)
+      response = client.request(request)
 
-      if (response.code == 200)
+      if response.code == "200"
         # puts 'request sent successfully'
         return SuccessResponse.new(response)
       else
@@ -94,6 +96,7 @@ def get_data(path, data_hash = nil)
       end
     rescue Exception => e
         puts "Problem with GET request: #{e.message}"
+        e.backtrace.each {|line| puts "#{line}\n"}
     ensure
       @client_pool << client
     end
@@ -205,13 +208,8 @@ def append_workspace(data_hash)
     data_hash
   end
 
-  def build_request_opts(request_type, data_hash, path)
-    request_opts = {
-        'method' => request_type,
-        'ctype' => 'application/json',
-        'uri' => path
-    }
-
+  def build_request(request, data_hash)
+    request.content_type = 'application/json'
     if (!data_hash.nil? && !data_hash.empty?)
       data_hash.each do |k,v|
         if v.is_a?(Msf::Session)
@@ -223,25 +221,23 @@ def build_request_opts(request_type, data_hash, path)
         end
       end
       json_body = append_workspace(data_hash).to_json
-      request_opts['data'] = json_body
+      request.body = json_body
     end
 
     if (!@headers.nil? && !@headers.empty?)
-      request_opts['headers'] = @headers
+      #TODO: This probably needs to be converted for the net/http client
+      request['headers'] = @headers
     end
 
-    request_opts
+    request
   end
 
   def build_client_pool(size)
     @client_pool = Queue.new()
     (1..size).each {
-      @client_pool << Rex::Proto::Http::Client.new(
-          @endpoint.host,
-          @endpoint.port,
-          {},
-          @endpoint.use_ssl,
-          @endpoint.ssl_version)
+      http = Net::HTTP.new(@endpoint.host, @endpoint.port)
+      http.use_ssl = true if @endpoint.use_ssl
+      @client_pool << http
     }
   end