diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 10:45:23 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 10:45:23 +0000 |
commit | 221dbb6261c5cbeeaf73b419b9d8344e54792bd1 (patch) | |
tree | d92bfc4eba1e97383e413d6b6aecf3b91c499087 | |
parent | 0894a185f5d280a53cecd8e5bf8ec33c722135ee (diff) | |
download | gitlab-ce-221dbb6261c5cbeeaf73b419b9d8344e54792bd1.tar.gz |
Add latest changes from gitlab-org/security/gitlab@12-7-stable-ee
-rw-r--r-- | lib/uploaded_file.rb | 2 | ||||
-rw-r--r-- | spec/lib/uploaded_file_spec.rb | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/uploaded_file.rb b/lib/uploaded_file.rb index 424db653fb8..f8d596b5d14 100644 --- a/lib/uploaded_file.rb +++ b/lib/uploaded_file.rb @@ -48,7 +48,7 @@ class UploadedFile return if path.blank? && remote_id.blank? file_path = nil - if path + if path.present? file_path = File.realpath(path) paths = Array(upload_paths) << Dir.tmpdir diff --git a/spec/lib/uploaded_file_spec.rb b/spec/lib/uploaded_file_spec.rb index 2bbbd67b13c..25536c07dd9 100644 --- a/spec/lib/uploaded_file_spec.rb +++ b/spec/lib/uploaded_file_spec.rb @@ -59,6 +59,16 @@ describe UploadedFile do expect(subject.sha256).to eq('sha256') expect(subject.remote_id).to eq('remote_id') end + + it 'handles a blank path' do + params['file.path'] = '' + + # Not a real file, so can't determine size itself + params['file.size'] = 1.byte + + expect { described_class.from_params(params, :file, upload_path) } + .not_to raise_error + end end end |