<%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>
+<%= setting_text_field :bulk_download_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>
+<%= setting_text_area :attachment_extensions_allowed %> <%= l(:text_comma_separated) %> <%= l(:label_example) %>: txt, png
diff --git a/config/locales/en.yml b/config/locales/en.yml index c4988e493..1c01fbe91 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -211,6 +211,7 @@ en: error_unable_delete_issue_status: 'Unable to delete issue status (%{value})' error_unable_to_connect: "Unable to connect (%{value})" error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})" + error_bulk_download_size_too_big: "These attachments cannot be bulk downloaded because the total file size exceeds the maximum allowed size (%{max_size})" error_session_expired: "Your session has expired. Please login again." error_token_expired: "This password recovery link has expired, please try again." warning_attachments_not_saved: "%{count} file(s) could not be saved." @@ -398,6 +399,7 @@ en: setting_self_registration: Self-registration setting_show_custom_fields_on_registration: Show custom fields on registration setting_attachment_max_size: Maximum attachment size + setting_bulk_download_max_size: Maximum total size for bulk download setting_issues_export_limit: Issues export limit setting_mail_from: Emission email address setting_bcc_recipients: Blind carbon copy recipients (bcc) @@ -1015,6 +1017,7 @@ en: label_users_visibility_all: All active users label_users_visibility_members_of_visible_projects: Members of visible projects label_edit_attachments: Edit attached files + label_download_all_attachments: Download all files label_link_copied_issue: Link copied issue label_ask: Ask label_search_attachments_yes: Search attachment filenames and descriptions diff --git a/config/routes.rb b/config/routes.rb index 264532042..7e8cdeac9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -289,6 +289,7 @@ Rails.application.routes.draw do resources :attachments, :only => [:show, :update, :destroy] get 'attachments/:object_type/:object_id/edit', :to => 'attachments#edit_all', :as => :object_attachments_edit patch 'attachments/:object_type/:object_id', :to => 'attachments#update_all', :as => :object_attachments + get 'attachments/:object_type/:object_id/download', :to => 'attachments#download_all', :as => :object_attachments_download resources :groups do resources :memberships, :controller => 'principal_memberships' diff --git a/config/settings.yml b/config/settings.yml index d33523aeb..2fa2c38ed 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -66,6 +66,9 @@ session_timeout: attachment_max_size: format: int default: 5120 +bulk_download_max_size: + format: int + default: 512000 attachment_extensions_allowed: default: attachment_extensions_denied: diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 131da3213..1cfb7a3b3 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -902,6 +902,8 @@ div.attachments p { margin:4px 0 2px 0; } div.attachments img { vertical-align: middle; } div.attachments span.author { font-size: 0.9em; color: #888; } +div.bulk-download { margin-top: 1em; margin-left: 0.3em; margin-bottom: 0.4em;} + div.thumbnails {margin:0.6em;} div.thumbnails div {background:#fff;border:2px solid #ddd;display:inline-block;margin-right:2px;} div.thumbnails img {margin: 3px; vertical-align: middle;} diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb index 33181cb8c..2576f5f7a 100644 --- a/test/functional/attachments_controller_test.rb +++ b/test/functional/attachments_controller_test.rb @@ -577,6 +577,50 @@ class AttachmentsControllerTest < Redmine::ControllerTest assert_equal 'This is a Ruby source file', attachment.description end + def test_download_all_with_valid_container + @request.session[:user_id] = 2 + get :download_all, :params => { + :object_type => 'issues', + :object_id => '2' + } + assert_response 200 + assert_equal response.headers['Content-Type'], 'application/zip' + assert_match /issue-2-attachments.zip/, response.headers['Content-Disposition'] + assert_not_includes Dir.entries(Rails.root.join('tmp')), /attachments_zip/ + end + + def test_download_all_with_invalid_container + @request.session[:user_id] = 2 + get :download_all, :params => { + :object_type => 'issues', + :object_id => '999' + } + assert_response 404 + end + + def test_download_all_without_readable_attachments + @request.session[:user_id] = 2 + get :download_all, :params => { + :object_type => 'issues', + :object_id => '1' + } + assert_equal Issue.find(1).attachments, [] + assert_response 404 + end + + def test_download_all_with_maximum_bulk_download_size_larger_than_attachments + with_settings :bulk_download_max_size => 0 do + @request.session[:user_id] = 2 + get :download_all, :params => { + :object_type => 'issues', + :object_id => '2', + :back_url => '/issues/2' + } + assert_redirected_to '/issues/2' + assert_equal flash[:error], 'These attachments cannot be bulk downloaded because the total file size exceeds the maximum allowed size (0)' + end + end + def test_destroy_issue_attachment set_tmp_attachments_directory issue = Issue.find(3) diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb index 7e12483f5..25c51ed1f 100644 --- a/test/unit/attachment_test.rb +++ b/test/unit/attachment_test.rb @@ -278,6 +278,36 @@ class AttachmentTest < ActiveSupport::TestCase end end + def test_aarchive_attachments + attachment = Attachment.create!(:file => uploaded_test_file("testfile.txt", ""), :author_id => 1) + Tempfile.create('attachments_zip', Rails.root.join('tmp')) do |tempfile| + zip_file = Attachment.archive_attachments(tempfile, [attachment]) + assert_instance_of File, zip_file + end + end + + def test_archive_attachments_without_attachments + Tempfile.create('attachments_zip', Rails.root.join('tmp')) do |tempfile| + zip_file = Attachment.archive_attachments(tempfile, []) + assert_nil zip_file + end + end + + def test_archive_attachments_should_not_use_duplicate_file_names + attachment1 = Attachment.create!(:file => uploaded_test_file("testfile.txt", ""), :author_id => 1) + attachment2 = Attachment.create!(:file => uploaded_test_file("testfile.txt", ""), :author_id => 1) + Tempfile.create('attachments_zip', Rails.root.join('tmp')) do |tempfile| + zip_file = Attachment.archive_attachments(tempfile, [attachment1, attachment2]) + zip_file_names = ['testfile.txt', 'testfile(2).txt'] + + Zip::File.open(zip_file.path) do |z| + z.each_with_index do |entry, i| + assert_includes zip_file_names[i], entry.name + end + end + end + end + def test_move_from_root_to_target_directory_should_move_root_files a = Attachment.find(20) assert a.disk_directory.blank?