Merge pull request #11 from clee-r7/fix-workspace-query-data-remote-http-data-service

jbarnett-r7 · web-flow · commit be0ca39ac307 · 2018-01-25T16:48:31.000-06:00
Fix issue with workspace in query data
diff --git a/lib/metasploit/framework/data_service/remote/http/core.rb b/lib/metasploit/framework/data_service/remote/http/core.rb
@@ -108,7 +108,7 @@ def put_data(path, data_hash, query = nil)
   #
   def make_request(request_type, path, data_hash = nil, query = nil)
     begin
-      query_str = (!query.nil? && !query.empty?) ? URI.encode_www_form(query) : nil
+      query_str = (!query.nil? && !query.empty?) ? URI.encode_www_form(append_workspace(query)) : nil
       uri = URI::HTTP::build({path: path, query: query_str})
       puts "#{Time.now} - HTTP #{request_type} request to #{uri.request_uri} with #{data_hash ? data_hash : "nil"}"
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ def put_data(path, data_hash, query = nil)`
`108`	`108`	`#`
`109`	`109`	`def make_request(request_type, path, data_hash = nil, query = nil)`
`110`	`110`	`begin`
`111`		`- query_str = (!query.nil? && !query.empty?) ? URI.encode_www_form(query) : nil`
	`111`	`+ query_str = (!query.nil? && !query.empty?) ? URI.encode_www_form(append_workspace(query)) : nil`
`112`	`112`	`uri = URI::HTTP::build({path: path, query: query_str})`
`113`	`113`	`puts "#{Time.now} - HTTP #{request_type} request to #{uri.request_uri} with #{data_hash ? data_hash : "nil"}"`
`114`	`114`