Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42

1 files changed, 25 insertions, 0 deletions

diff --git a/lib/gitlab/middleware/rack_multipart_tempfile_factory.rb b/lib/gitlab/middleware/rack_multipart_tempfile_factory.rb
new file mode 100644
index 00000000000..d16c068c3c0
--- /dev/null
+++ b/lib/gitlab/middleware/rack_multipart_tempfile_factory.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Middleware
+    class RackMultipartTempfileFactory
+      # Immediately unlink the created temporary file so we don't have to rely
+      # on Rack::TempfileReaper catching this after the fact.
+      FACTORY = lambda do |filename, content_type|
+        Rack::Multipart::Parser::TEMPFILE_FACTORY.call(filename, content_type).tap(&:unlink)
+      end
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        if ENV['GITLAB_TEMPFILE_IMMEDIATE_UNLINK'] == '1'
+          env[Rack::RACK_MULTIPART_TEMPFILE_FACTORY] = FACTORY
+        end
+
+        @app.call(env)
+      end
+    end
+  end
+end