diff options
author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-07-09 13:06:12 +0200 |
---|---|---|
committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-07-09 13:06:12 +0200 |
commit | 6b2ebea7dc036c2b21bd47f2955639f9b257b568 (patch) | |
tree | e61b7ec8ba14149c844606f720359c1e8329cfb6 | |
parent | e2ec97a92e6393dd0adeed39c77ff2b4eba0aed9 (diff) | |
download | gitlab-ce-6b2ebea7dc036c2b21bd47f2955639f9b257b568.tar.gz |
Added test and used Array() instead of .wrap
-rw-r--r-- | lib/uploaded_file.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/middleware/multipart_spec.rb | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/lib/uploaded_file.rb b/lib/uploaded_file.rb index 0172461670b..4b9cb59eab5 100644 --- a/lib/uploaded_file.rb +++ b/lib/uploaded_file.rb @@ -37,7 +37,7 @@ class UploadedFile file_path = File.realpath(params["#{field}.path"]) - paths = Array.wrap(upload_paths) << Dir.tmpdir + paths = Array(upload_paths) << Dir.tmpdir unless self.allowed_path?(file_path, paths.compact) raise InvalidPathError, "insecure path used '#{file_path}'" end diff --git a/spec/lib/gitlab/middleware/multipart_spec.rb b/spec/lib/gitlab/middleware/multipart_spec.rb index b4837a1689a..f788f8ee276 100644 --- a/spec/lib/gitlab/middleware/multipart_spec.rb +++ b/spec/lib/gitlab/middleware/multipart_spec.rb @@ -75,6 +75,33 @@ describe Gitlab::Middleware::Multipart do it_behaves_like 'multipart upload files' end + it 'allows symlinks for uploads dir' do + Tempfile.open('two-levels') do |tempfile| + symlinked_dir = '/some/dir/uploads' + symlinked_path = File.join(symlinked_dir, File.basename(tempfile.path)) + env = post_env({ 'file' => symlinked_path }, { 'file.name' => original_filename, 'file.path' => symlinked_path }, Gitlab::Workhorse.secret, 'gitlab-workhorse') + + allow(FileUploader).to receive(:root).and_return(symlinked_dir) + allow(UploadedFile).to receive(:allowed_paths).and_return([symlinked_dir, Gitlab.config.uploads.storage_path]) + allow(File).to receive(:realpath).and_call_original + allow(File).to receive(:realpath).with(symlinked_dir).and_return(Dir.tmpdir) + allow(File).to receive(:realpath).with(symlinked_path).and_return(tempfile.path) + allow(File).to receive(:exist?).and_call_original + allow(File).to receive(:exist?).with(symlinked_dir).and_return(true) + + # override Dir.tmpdir because this dir is in the list of allowed paths + # and it would match FileUploader.root path (which in this test is linked + # to /tmp too) + allow(Dir).to receive(:tmpdir).and_return(File.join(Dir.tmpdir, 'tmpsubdir')) + + expect(app).to receive(:call) do |env| + expect(Rack::Request.new(env).params['file']).to be_a(::UploadedFile) + end + + middleware.call(env) + end + end + def post_env(rewritten_fields, params, secret, issuer) token = JWT.encode({ 'iss' => issuer, 'rewritten_fields' => rewritten_fields }, secret, 'HS256') Rack::MockRequest.env_for( |