Ticket #9016: base64_multipart_decoding.diff

actionpack/test/controller/request_test.rb

@@ -712 +712 @@
-    assert_equal 19756, params['files'].size
-  end
-
+  def test_base64_encoded_file
+    params = process('base64_encoded_file')
+    assert_equal %w(file foo), params.keys.sort
+    assert_equal 'bar', params['foo']
+
+    file = params['file']
+    assert_kind_of StringIO, file
+    assert_equal 'file.txt', file.original_filename
+    assert_equal "text/plain\r", file.content_type
+    assert_equal 'contents', file.read
+  end
+
-  private
-    def process(name)
-      File.open(File.join(FIXTURE_PATH, name), 'rb') do |file|

actionpack/test/fixtures/multipart/base64_encoded_file

@@ +1 @@
+--AaB03x
+Content-Disposition: form-data; name="foo"
+
+bar
+--AaB03x
+Content-Disposition: form-data; name="file"; filename="file.txt"
+Content-Transfer-Encoding: base64
+Content-Type: text/plain
+
+Y29udGVudHM=
+--AaB03x--

actionpack/lib/action_controller/request.rb

@@ -1 +1 @@
-require 'tempfile'
-require 'stringio'
-require 'strscan'
+require 'base64'
-
-module ActionController
-  # CgiRequest and TestRequest provide concrete implementations.
@@ -523 +524 @@
-              content_length -= c.size
-            end
-
+            base64 = /Content-Transfer-Encoding:\s*base64/ni.match(head)
+              
-            buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{quoted_boundary}([\r\n]{1,2}|--)/n) do
- $1
+(base64 ? Base64.decode64($1) : $1)
-              if "--" == $2
-                content_length = -1
-              end