From 4ec259fd36fe57aa95446c10a47d784dae2c8f00 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Wed, 21 Dec 2016 11:44:47 +0100
Subject: [PATCH] Inject ::UploadedFile from Multipart middleware

I mistakenly concluded Rack::Multipart injects File instances into the
params. These should be UploadedFile instances. This reuses a mock
UploadedFile class we already had in GitLab.
---
 lib/gitlab/middleware/multipart.rb           | 8 ++++++--
 spec/lib/gitlab/middleware/multipart_spec.rb | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/gitlab/middleware/multipart.rb b/lib/gitlab/middleware/multipart.rb
index 65713e73a59..dd99f9bb7d7 100644
--- a/lib/gitlab/middleware/multipart.rb
+++ b/lib/gitlab/middleware/multipart.rb
@@ -42,7 +42,7 @@ module Gitlab
 
             key, value = parsed_field.first
             if value.nil?
-              value = File.open(tmp_path)
+              value = open_file(tmp_path)
               @open_files << value
             else
               value = decorate_params_value(value, @request.params[key], tmp_path)
@@ -68,7 +68,7 @@ module Gitlab
 
           case path_value
           when nil
-            value_hash[path_key] = File.open(tmp_path)
+            value_hash[path_key] = open_file(tmp_path)
             @open_files << value_hash[path_key]
             value_hash
           when Hash
@@ -78,6 +78,10 @@ module Gitlab
             raise "unexpected path value: #{path_value.inspect}"
           end
         end
+
+        def open_file(path)
+          ::UploadedFile.new(path, File.basename(path), 'application/octet-stream')
+        end
       end
 
       def initialize(app)
diff --git a/spec/lib/gitlab/middleware/multipart_spec.rb b/spec/lib/gitlab/middleware/multipart_spec.rb
index ab1ab22795c..8d925460f01 100644
--- a/spec/lib/gitlab/middleware/multipart_spec.rb
+++ b/spec/lib/gitlab/middleware/multipart_spec.rb
@@ -12,7 +12,7 @@ describe Gitlab::Middleware::Multipart do
 
       expect(app).to receive(:call) do |env|
         file = Rack::Request.new(env).params['file']
-        expect(file).to be_a(File)
+        expect(file).to be_a(::UploadedFile)
         expect(file.path).to eq(tempfile.path)
       end
 
@@ -39,7 +39,7 @@ describe Gitlab::Middleware::Multipart do
 
       expect(app).to receive(:call) do |env|
         file = Rack::Request.new(env).params['user']['avatar']
-        expect(file).to be_a(File)
+        expect(file).to be_a(::UploadedFile)
         expect(file.path).to eq(tempfile.path)
       end
 
@@ -54,7 +54,7 @@ describe Gitlab::Middleware::Multipart do
 
       expect(app).to receive(:call) do |env|
         file = Rack::Request.new(env).params['project']['milestone']['themesong']
-        expect(file).to be_a(File)
+        expect(file).to be_a(::UploadedFile)
         expect(file.path).to eq(tempfile.path)
       end