Changeset 6786

Timestamp:

05/19/07 21:34:36 (2 years ago)

Author:

bitsweat

Message:

Fix incorrent content type lookup in request parsing. Closes #8407.

Files:

• trunk/actionpack/lib/action_controller/request.rb (modified) (5 diffs)
• trunk/actionpack/test/controller/cgi_test.rb (modified) (3 diffs)

trunk/actionpack/lib/action_controller/request.rb

@@ -64 +64 @@
-    end
-
-
-
-
-
-
-
+
-    #
-    # For backward compatibility, the post format is extracted from the
@@ -75 +70 @@
-    def content_type
-      @content_type ||=
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    end
-
@@ -309 +291 @@
-    end
-
+    protected
+      # The raw content type string. Use when you need parameters such as
+      # charset or boundary which aren't included in the content_type MIME type.
+      def content_type_with_parameters
+        env['CONTENT_TYPE'].to_s
+      end
+
+      # The raw content type string with its parameters stripped off.
+      def content_type_without_parameters
+        @content_type_without_parameters ||= self.class.extract_content_type_without_parameters(content_type_with_parameters)
+      end
+
+    private
+      def content_type_from_legacy_post_data_format_header
+        if x_post_format = @env['HTTP_X_POST_DATA_FORMAT']
+          case x_post_format.to_s.downcase
+            when 'yaml';  Mime::YAML
+            when 'xml';   Mime::XML
+          end
+        end
+      end
+
-
-    class << self
-
+
+
+
+
+
-        content_length = content_length.to_i
-        return {} if content_length.zero?
-
-
+_with_parameters
-        return {} if content_type.blank?
-
@@ -344 +352 @@
-        raise
-        { "body" => body,
-
+_with_parameters
-          "content_length" => content_length,
-          "exception" => "#{e.message} (#{e.class})",
@@ -445 +453 @@
-        MULTIPART_BOUNDARY = %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n
-
-
-
+_with_parameters
+_with_parameters
-            ['multipart/form-data', $1.dup]
-          else
-content_type
+extract_content_type_without_parameters(content_type_with_parameters)
-          end
-        end

trunk/actionpack/test/controller/cgi_test.rb

@@ -2 +2 @@
-require 'action_controller/cgi_process'
-
-CgiRequest
+BaseCgi
-  def setup
-    @request_hash = {"HTTP_MAX_FORWARDS"=>"10", "SERVER_NAME"=>"glu.ttono.us:8007", "FCGI_ROLE"=>"RESPONDER", "HTTP_X_FORWARDED_HOST"=>"glu.ttono.us", "HTTP_ACCEPT_ENCODING"=>"gzip, deflate", "HTTP_USER_AGENT"=>"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/312.5.1 (KHTML, like Gecko) Safari/312.3.1", "PATH_INFO"=>"", "HTTP_ACCEPT_LANGUAGE"=>"en", "HTTP_HOST"=>"glu.ttono.us:8007", "SERVER_PROTOCOL"=>"HTTP/1.1", "REDIRECT_URI"=>"/dispatch.fcgi", "SCRIPT_NAME"=>"/dispatch.fcgi", "SERVER_ADDR"=>"207.7.108.53", "REMOTE_ADDR"=>"207.7.108.53", "SERVER_SOFTWARE"=>"lighttpd/1.4.5", "HTTP_COOKIE"=>"_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes", "HTTP_X_FORWARDED_SERVER"=>"glu.ttono.us", "REQUEST_URI"=>"/admin", "DOCUMENT_ROOT"=>"/home/kevinc/sites/typo/public", "SERVER_PORT"=>"8007", "QUERY_STRING"=>"", "REMOTE_PORT"=>"63137", "GATEWAY_INTERFACE"=>"CGI/1.1", "HTTP_X_FORWARDED_FOR"=>"65.88.180.234", "HTTP_ACCEPT"=>"*/*", "SCRIPT_FILENAME"=>"/home/kevinc/sites/typo/public/dispatch.fcgi", "REDIRECT_STATUS"=>"200", "REQUEST_METHOD"=>"GET"}
@@ -11 +11 @@
-  end
-
+  def default_test; end
+end
+
+
+class CgiRequestTest < BaseCgiTest
-  def test_proxy_request
-    assert_equal 'glu.ttono.us', @request.host_with_port
@@ -53 +58 @@
-  end
-end
+
+
+class CgiRequestParamsParsingTest < BaseCgiTest
+  def test_doesnt_break_when_content_type_has_charset
+    data = 'flamenco=love'
+    @request.env['CONTENT_LENGTH'] = data.length
+    @request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
+    @request.env['RAW_POST_DATA'] = data
+    assert_equal({"flamenco"=> "love"}, @request.request_parameters)
+  end
+end