Clean up Safari's ajax POST body

leahneukirchen · Jan 21, 2009 · 0f081dd · 0f081dd
1 parent a2a2600
commit 0f081dd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/rack/request.rb b/lib/rack/request.rb
@@ -119,8 +119,13 @@ def POST
         @env["rack.request.form_input"] = @env["rack.input"]
         unless @env["rack.request.form_hash"] =
             Utils::Multipart.parse_multipart(env)
-          @env["rack.request.form_vars"] = @env["rack.input"].read
-          @env["rack.request.form_hash"] = Utils.parse_query(@env["rack.request.form_vars"])
+          form_vars = @env["rack.input"].read
+
+          # Fix for Safari Ajax postings that always append \0
+          form_vars.sub!(/\0\z/, '')
+
+          @env["rack.request.form_vars"] = form_vars
+          @env["rack.request.form_hash"] = Utils.parse_query(form_vars)
 
           begin
             @env["rack.input"].rewind if @env["rack.input"].respond_to?(:rewind)

diff --git a/test/spec_rack_request.rb b/test/spec_rack_request.rb
@@ -103,6 +103,12 @@
     req.params.should.equal "foo" => "bar", "quux" => "bla"
   end
 
+  specify "cleans up Safari's ajax POST body" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/", :input => "foo=bar&quux=bla\0")
+    req.POST.should.equal "foo" => "bar", "quux" => "bla"
+  end
+
   specify "can get value by key from params with #[]" do
     req = Rack::Request.new \
       Rack::MockRequest.env_for("?foo=quux")