-
Notifications
You must be signed in to change notification settings - Fork 21.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Build query string and POST params parser on top of Rack::Request. Al…
…so switch our multipart parser to use Racks. Moved XML, JSON, and YAML parsers into ActionController::ParamsParser middleware [#1661 state:resolved]
- Loading branch information
Showing
12 changed files
with
190 additions
and
333 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,71 @@ | |||
module ActionController | |||
class ParamsParser | |||
ActionController::Base.param_parsers[Mime::XML] = :xml_simple | |||
ActionController::Base.param_parsers[Mime::JSON] = :json | |||
|
|||
def initialize(app) | |||
@app = app | |||
end | |||
|
|||
def call(env) | |||
if params = parse_formatted_parameters(env) | |||
env["action_controller.request.request_parameters"] = params | |||
end | |||
|
|||
@app.call(env) | |||
end | |||
|
|||
private | |||
def parse_formatted_parameters(env) | |||
request = Request.new(env) | |||
|
|||
return false if request.content_length.zero? | |||
|
|||
mime_type = content_type_from_legacy_post_data_format_header(env) || request.content_type | |||
strategy = ActionController::Base.param_parsers[mime_type] | |||
|
|||
return false unless strategy | |||
|
|||
case strategy | |||
when Proc | |||
strategy.call(request.raw_post) | |||
when :xml_simple, :xml_node | |||
body = request.raw_post | |||
body.blank? ? {} : Hash.from_xml(body).with_indifferent_access | |||
when :yaml | |||
YAML.load(request.raw_post) | |||
when :json | |||
body = request.raw_post | |||
if body.blank? | |||
{} | |||
else | |||
data = ActiveSupport::JSON.decode(body) | |||
data = {:_json => data} unless data.is_a?(Hash) | |||
data.with_indifferent_access | |||
end | |||
else | |||
false | |||
end | |||
rescue Exception => e # YAML, XML or Ruby code block errors | |||
raise | |||
{ "body" => request.raw_post, | |||
"content_type" => request.content_type, | |||
"content_length" => request.content_length, | |||
"exception" => "#{e.message} (#{e.class})", | |||
"backtrace" => e.backtrace } | |||
end | |||
|
|||
def content_type_from_legacy_post_data_format_header(env) | |||
if x_post_format = env['HTTP_X_POST_DATA_FORMAT'] | |||
case x_post_format.to_s.downcase | |||
when 'yaml' | |||
return Mime::YAML | |||
when 'xml' | |||
return Mime::XML | |||
end | |||
end | |||
|
|||
nil | |||
end | |||
end | |||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,2 +1,3 @@ | |||
require 'action_controller/rack_ext/lock' | require 'action_controller/rack_ext/lock' | ||
require 'action_controller/rack_ext/multipart' | require 'action_controller/rack_ext/multipart' | ||
require 'action_controller/rack_ext/parse_query' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,18 @@ | |||
# Rack does not automatically cleanup Safari 2 AJAX POST body | |||
# This has not yet been commited to Rack, please +1 this ticket: | |||
# http://rack.lighthouseapp.com/projects/22435/tickets/19 | |||
|
|||
module Rack | |||
module Utils | |||
alias_method :parse_query_without_ajax_body_cleanup, :parse_query | |||
module_function :parse_query_without_ajax_body_cleanup | |||
|
|||
def parse_query(qs, d = '&;') | |||
qs = qs.dup | |||
qs.chop! if qs[-1] == 0 | |||
qs.gsub!(/&_=$/, '') | |||
parse_query_without_ajax_body_cleanup(qs, d) | |||
end | |||
module_function :parse_query | |||
end | |||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
ff0a267
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Josh,
You forgot to remove the autoload line for ‘action_controller/request_parser’.