Merge branch 'goliath' into standardize_proxy_errors

Author: mkienow-r7

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

@@ -25,6 +25,9 @@ def self.get_loot
         opts = parse_json_request(request, false)
         data = get_db().loots(params.symbolize_keys)
         includes = [:host]
+        data.each do |loot|
+          loot.data = Base64.urlsafe_encode64(loot.data) if loot.data
+        end
         set_json_response(data, includes)
       rescue Exception => e
         set_error_on_response(e)
@@ -39,6 +42,7 @@ def self.report_loot
           filename = File.basename(opts[:path])
           local_path = File.join(Msf::Config.loot_directory, filename)
           opts[:path] = process_file(opts[:data], local_path)
+          opts[:data] = Base64.urlsafe_decode64(opts[:data])
         end
 
         get_db().report_loot(opts)