jro_apps/redmine Commit - r15732:aef4a8a65bd6

Fixed that X-Sendfile header is never set (#24646)....

Jean-Philippe Lang -

r15732:aef4a8a65bd6

parent child

Context file:

r15732:aef4a8a65bd6

Collapse all files

config/application.rb +1 -1

             require File.expand_path('../boot', __FILE__)
             require 'rails/all'
             Bundler.require(*Rails.groups)
             module RedmineApp
               class Application < Rails::Application
                 # Settings in config/environments/* take precedence over those specified here.
                 # Application configuration should go into files in config/initializers
                 # -- all .rb files in that directory are automatically loaded.
                 # Custom directories with classes and modules you want to be autoloadable.
                 config.autoload_paths += %W(#{config.root}/lib)
                 # Only load the plugins named here, in the order given (default is alphabetical).
                 # :all can be used as a placeholder for all plugins not explicitly named.
                 # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
                 config.active_record.store_full_sti_class = true
                 config.active_record.default_timezone = :local
                 # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
                 # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
                 # config.time_zone = 'Central Time (US & Canada)'
                 # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
                 # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
                 # config.i18n.default_locale = :de
                 I18n.enforce_available_locales = true
                 # Configure the default encoding used in templates for Ruby 1.9.
                 config.encoding = "utf-8"
                 # Configure sensitive parameters which will be filtered from the log file.
                 config.filter_parameters += [:password]
                 # Enable the asset pipeline
                 config.assets.enabled = false
                 # Version of your assets, change this if you want to expire all your assets
                 config.assets.version = '1.0'
                 config.action_mailer.perform_deliveries = false
                 # Do not include all helpers
                 config.action_controller.include_all_helpers = false
                 # Do not supress errors in after_rollback and after_commit callbacks
                 config.active_record.raise_in_transactional_callbacks = true
                 # XML parameter parser removed from core in Rails 4.0
                 # and extracted to actionpack-xml_parser gem
                 config.middleware.insert_after ActionDispatch::ParamsParser, ActionDispatch::XmlParamsParser
                 # Sets the Content-Length header on responses with fixed-length bodies
-                config.middleware.use Rack::ContentLength
+                config.middleware.insert_after Rack::Sendfile, Rack::ContentLength
                 # Verify validity of user sessions
                 config.redmine_verify_sessions = true
                 # Specific cache for search results, the default file store cache is not
                 # a good option as it could grow fast. A memory store (32MB max) is used
                 # as the default. If you're running multiple server processes, it's
                 # recommended to switch to a shared cache store (eg. mem_cache_store).
                 # See http://guides.rubyonrails.org/caching_with_rails.html#cache-stores
                 # for more options (same options as config.cache_store).
                 config.redmine_search_cache_store = :memory_store
                 # Configure log level here so that additional environment file
                 # can change it (environments/ENV.rb would take precedence over it)
                 config.log_level = Rails.env.production? ? :info : :debug
                 config.session_store :cookie_store,
                   :key => '_redmine_session',
                   :path => config.relative_url_root || '/'
                 if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
                   instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
                 end
               end
             end

test/integration/attachments_test.rb +12 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class AttachmentsTest < Redmine::IntegrationTest
               fixtures :projects, :enabled_modules,
                        :users, :roles, :members, :member_roles,
                        :trackers, :projects_trackers,
                        :issue_statuses, :enumerations
               def test_upload_should_set_default_content_type
                 log_user('jsmith', 'jsmith')
                 assert_difference 'Attachment.count' do
                   post "/uploads.js?attachment_id=1&filename=foo.txt", "File content", {"CONTENT_TYPE" => 'application/octet-stream'}
                   assert_response :success
                 end
                 attachment = Attachment.order(:id => :desc).first
                 assert_equal 'text/plain', attachment.content_type
               end
               def test_upload_should_accept_content_type_param
                 log_user('jsmith', 'jsmith')
                 assert_difference 'Attachment.count' do
                   post "/uploads.js?attachment_id=1&filename=foo&content_type=image/jpeg", "File content", {"CONTENT_TYPE" => 'application/octet-stream'}
                   assert_response :success
                 end
                 attachment = Attachment.order(:id => :desc).first
                 assert_equal 'image/jpeg', attachment.content_type
               end
               def test_upload_as_js_and_attach_to_an_issue
                 log_user('jsmith', 'jsmith')
                 token = ajax_upload('myupload.txt', 'File content')
                 assert_difference 'Issue.count' do
                   post '/projects/ecookbook/issues', {
                       :issue => {:tracker_id => 1, :subject => 'Issue with upload'},
                       :attachments => {'1' => {:filename => 'myupload.txt', :description => 'My uploaded file', :token => token}}
                     }
                   assert_response 302
                 end
                 issue = Issue.order('id DESC').first
                 assert_equal 'Issue with upload', issue.subject
                 assert_equal 1, issue.attachments.count
                 attachment = issue.attachments.first
                 assert_equal 'myupload.txt', attachment.filename
                 assert_equal 'My uploaded file', attachment.description
                 assert_equal 'File content'.length, attachment.filesize
               end
               def test_upload_as_js_and_preview_as_inline_attachment
                 log_user('jsmith', 'jsmith')
                 token = ajax_upload('myupload.jpg', 'JPEG content')
                 post '/issues/preview/new/ecookbook', {
                     :issue => {:tracker_id => 1, :description => 'Inline upload: !myupload.jpg!'},
                     :attachments => {'1' => {:filename => 'myupload.jpg', :description => 'My uploaded file', :token => token}}
                   }
                 assert_response :success
                 attachment_path = response.body.match(%r{<img src="(/attachments/download/\d+/myupload.jpg)"})[1]
                 assert_not_nil token, "No attachment path found in response:\n#{response.body}"
                 get attachment_path
                 assert_response :success
                 assert_equal 'JPEG content', response.body
               end
               def test_upload_and_resubmit_after_validation_failure
                 log_user('jsmith', 'jsmith')
                 token = ajax_upload('myupload.txt', 'File content')
                 assert_no_difference 'Issue.count' do
                   post '/projects/ecookbook/issues', {
                       :issue => {:tracker_id => 1, :subject => ''},
                       :attachments => {'1' => {:filename => 'myupload.txt', :description => 'My uploaded file', :token => token}}
                     }
                   assert_response :success
                 end
                 assert_select 'input[type=hidden][name=?][value=?]', 'attachments[p0][token]', token
                 assert_select 'input[name=?][value=?]', 'attachments[p0][filename]', 'myupload.txt'
                 assert_select 'input[name=?][value=?]', 'attachments[p0][description]', 'My uploaded file'
                 assert_difference 'Issue.count' do
                   post '/projects/ecookbook/issues', {
                       :issue => {:tracker_id => 1, :subject => 'Issue with upload'},
                       :attachments => {'p0' => {:filename => 'myupload.txt', :description => 'My uploaded file', :token => token}}
                     }
                   assert_response 302
                 end
                 issue = Issue.order('id DESC').first
                 assert_equal 'Issue with upload', issue.subject
                 assert_equal 1, issue.attachments.count
                 attachment = issue.attachments.first
                 assert_equal 'myupload.txt', attachment.filename
                 assert_equal 'My uploaded file', attachment.description
                 assert_equal 'File content'.length, attachment.filesize
               end
               def test_upload_as_js_and_destroy
                 log_user('jsmith', 'jsmith')
                 token = ajax_upload('myupload.txt', 'File content')
                 attachment = Attachment.order('id DESC').first
                 attachment_path = "/attachments/#{attachment.id}.js?attachment_id=1"
                 assert_include "href: '#{attachment_path}'", response.body, "Path to attachment: #{attachment_path} not found in response:\n#{response.body}"
                 assert_difference 'Attachment.count', -1 do
                   delete attachment_path
                   assert_response :success
                 end
                 assert_include "$('#attachments_1').remove();", response.body
               end
+              def test_download_should_set_sendfile_header
+                set_fixtures_attachments_directory
+                Rack::Sendfile.any_instance.stubs(:variation).returns("X-Sendfile")
+                get "/attachments/download/4"
+                assert_response :success
+                assert_not_nil response.headers["X-Sendfile"]
+              ensure
+                set_tmp_attachments_directory
+              end
               private
               def ajax_upload(filename, content, attachment_id=1)
                 assert_difference 'Attachment.count' do
                   post "/uploads.js?attachment_id=#{attachment_id}&filename=#{filename}", content, {"CONTENT_TYPE" => 'application/octet-stream'}
                   assert_response :success
                   assert_equal 'text/javascript', response.content_type
                 end
                 token = response.body.match(/\.val\('(\d+\.[0-9a-f]+)'\)/)[1]
                 assert_not_nil token, "No upload token found in response:\n#{response.body}"
                 token
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages