Merge pull request #21131 from eagletmt/percent-filename

Fix Encoding::UndefinedConversionError with multibyte UTF-8 filename containing "%" character

3 files changed, 28 insertions, 1 deletions

diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb
index 540e11a4a0..a221f4c5af 100644
--- a/actionpack/lib/action_dispatch/http/upload.rb
+++ b/actionpack/lib/action_dispatch/http/upload.rb
@@ -28,7 +28,13 @@ module ActionDispatch
         raise(ArgumentError, ':tempfile is required') unless @tempfile
 
         @original_filename = hash[:filename]
-        @original_filename &&= @original_filename.encode "UTF-8"
+        if @original_filename
+          begin
+            @original_filename.encode!(Encoding::UTF_8)
+          rescue EncodingError
+            @original_filename.force_encoding(Encoding::UTF_8)
+          end
+        end
         @content_type      = hash[:type]
         @headers           = hash[:head]
       end
diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index 939a771c65..b36fbd3c76 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -63,6 +63,17 @@ class MultipartParamsParsingTest < ActionDispatch::IntegrationTest
     assert_equal 'contents', file.read
   end
 
+  test "parses utf8 filename with percent character" do
+    params = parse_multipart('utf8_filename')
+    assert_equal %w(file foo), params.keys.sort
+    assert_equal 'bar', params['foo']
+
+    file = params['file']
+    assert_equal 'ファイル%名.txt', file.original_filename
+    assert_equal "text/plain", file.content_type
+    assert_equal 'contents', file.read
+  end
+
   test "parses boundary problem file" do
     params = parse_multipart('boundary_problem_file')
     assert_equal %w(file foo), params.keys.sort
diff --git a/actionpack/test/fixtures/multipart/utf8_filename b/actionpack/test/fixtures/multipart/utf8_filename
new file mode 100644
index 0000000000..60738d53b0
--- /dev/null
+++ b/actionpack/test/fixtures/multipart/utf8_filename
@@ -0,0 +1,10 @@
+--AaB03x

+Content-Disposition: form-data; name="foo"

+

+bar

+--AaB03x

+Content-Disposition: form-data; name="file"; filename="ファイル%名.txt"

+Content-Type: text/plain

+

+contents

+--AaB03x--