From 25082a984e7b3a7e5f079f8e06a905ceada8e62a Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Tue, 30 Mar 2021 10:33:06 +0300 Subject: [PATCH 13/19] Remove #filename_for_content_disposition for MS browsers (#29914, #32914). --- app/controllers/application_controller.rb | 2 +- test/functional/wiki_controller_test.rb | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c63382e98..7ddf58a4c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -692,7 +692,7 @@ class ApplicationController < ActionController::Base # Returns a string that can be used as filename value in Content-Disposition header def filename_for_content_disposition(name) - %r{(MSIE|Trident|Edge)}.match?(request.env['HTTP_USER_AGENT'].to_s) ? ERB::Util.url_encode(name) : name + name end def api_request? diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index 1fd8a9492..032d3f30e 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -1152,7 +1152,7 @@ class WikiControllerTest < Redmine::ControllerTest assert_include 'h1. CookBook documentation v2', @response.body end - def test_show_filename_should_be_uri_encoded_for_ms_browsers + def test_show_filename_should_be_uri_encoded @request.session[:user_id] = 2 title = 'Этика_менеджмента' %w|pdf html txt|.each do |format| @@ -1160,14 +1160,15 @@ class WikiControllerTest < Redmine::ControllerTest @request.user_agent = "" get :show, :params => {:project_id => 1, :id => title, :format => format} assert_response :success - assert_equal "attachment; filename=\"#{title}.#{format}\"", + ascii_filename = "%3F%3F%3F%3F%3F_%3F%3F%3F%3F%3F%3F%3F%3F%3F%3F%3F.#{format}" + utf8_filename = "%D0%AD%D1%82%D0%B8%D0%BA%D0%B0_%D0%BC%D0%B5%D0%BD%D0%B5%D0%B4%D0%B6%D0%BC%D0%B5%D0%BD%D1%82%D0%B0.#{format}" + assert_equal "attachment; filename=\"#{ascii_filename}\"; filename*=UTF-8''#{utf8_filename}", @response.headers['Content-Disposition'] - # Microsoft's browsers: filename should be URI encoded + # Microsoft's browsers @request.user_agent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36 Edge/15.15063' get :show, :params => {:project_id => 1, :id => title, :format => format} assert_response :success - filename = Addressable::URI.encode("#{title}.#{format}") - assert_equal "attachment; filename=\"#{filename}\"", + assert_equal "attachment; filename=\"#{ascii_filename}\"; filename*=UTF-8''#{utf8_filename}", @response.headers['Content-Disposition'] end end -- 2.22.0