Merge branch '212632-add-LFS-workhorse-upload-path' into 'master'

Add LFS workhorse upload path

Closes #212632

See merge request gitlab-org/gitlab!31794

ee/changelogs/unreleased/212632-add-LFS-workhorse-upload-path.yml

+---
+title: Add LFS workhorse upload path to allowed upload paths
+merge_request: 31794
+author:
+type: fixed

ee/spec/lib/gitlab/middleware/multipart_spec.rb

@@ -30,9 +30,11 @@ describe Gitlab::Middleware::Multipart do
       RSpec.shared_examples 'not allowing the multipart upload when package upload path is used' do
         it 'does not allow files to be uploaded' do
           with_tmp_dir('tmp/uploads', storage_path) do |dir, env|
-            # with_tmp_dir set the same workhorse_upload_path for all Uploaders,
-            # so we have to prevent JobArtifactUploader to allow the tested path
+            # with_tmp_dir sets the same workhorse_upload_path for all Uploaders,
+            # so we have to prevent JobArtifactUploader and LfsObjectUploader to
+            # allow the tested path
             allow(JobArtifactUploader).to receive(:workhorse_upload_path).and_return(Dir.tmpdir)
+            allow(LfsObjectUploader).to receive(:workhorse_upload_path).and_return(Dir.tmpdir)
 
             status, headers, body = middleware.call(env)
 

lib/gitlab/middleware/multipart.rb

@@ -110,6 +110,7 @@ module Gitlab
             ::FileUploader.root,
             Gitlab.config.uploads.storage_path,
             JobArtifactUploader.workhorse_upload_path,
+            LfsObjectUploader.workhorse_upload_path,
             File.join(Rails.root, 'public/uploads/tmp')
           ]
         end

spec/lib/gitlab/middleware/multipart_spec.rb

@@ -195,6 +195,17 @@ describe Gitlab::Middleware::Multipart do
     end
   end
 
+  it 'allows files in the lfs upload path' do
+    with_tmp_dir('lfs-objects') do |dir, env|
+      expect(LfsObjectUploader).to receive(:workhorse_upload_path).and_return(File.join(dir, 'lfs-objects'))
+      expect(app).to receive(:call) do |env|
+        expect(get_params(env)['file']).to be_a(::UploadedFile)
+      end
+
+      middleware.call(env)
+    end
+  end
+
   it 'allows symlinks for uploads dir' do
     Tempfile.open('two-levels') do |tempfile|
       symlinked_dir = '/some/dir/uploads'