diff options
author | José Iván Vargas López <jvargas@gitlab.com> | 2018-08-24 21:34:14 +0300 |
---|---|---|
committer | Jose Vargas <jvargas@gitlab.com> | 2018-08-24 21:44:12 +0300 |
commit | 7375faef3c2e7a7d78b5a61adf5c8ccde98d6e2b (patch) | |
tree | d7582a6098c3313f1d02a873fdab86ecd129c240 /lib/gitlab | |
parent | 191f9d2f81c131358a78a3467f1a535685b599a8 (diff) |
Merge branch 'security-mk-exclude-orphaned-upload-files-from-export-11-2' into 'security-11-2'
[11.2] Resolve "Orphaned upload files are accessible via project exports"
See merge request gitlab/gitlabhq!2464
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/import_export/uploads_manager.rb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/gitlab/import_export/uploads_manager.rb b/lib/gitlab/import_export/uploads_manager.rb index 07875ebb56a..e0d4235e65b 100644 --- a/lib/gitlab/import_export/uploads_manager.rb +++ b/lib/gitlab/import_export/uploads_manager.rb @@ -13,13 +13,11 @@ module Gitlab end def save - copy_files(@from, uploads_export_path) if File.directory?(@from) - if File.file?(@from) && @relative_export_path == 'avatar' copy_files(@from, File.join(uploads_export_path, @project.avatar.filename)) end - copy_from_object_storage + copy_project_uploads true rescue => e @@ -48,14 +46,19 @@ module Gitlab UploadService.new(@project, File.open(upload, 'r'), FileUploader, uploader_context).execute end - def copy_from_object_storage - return unless Gitlab::ImportExport.object_storage? - + def copy_project_uploads each_uploader do |uploader| next unless uploader.file - next if uploader.upload.local? # Already copied, using the old method - download_and_copy(uploader) + if uploader.upload.local? + next unless uploader.upload.exist? + + copy_files(uploader.absolute_path, File.join(uploads_export_path, uploader.upload.path)) + else + next unless Gitlab::ImportExport.object_storage? + + download_and_copy(uploader) + end end end |