diff options
author | Kerri Miller <kerrizor@github.com> | 2016-08-09 10:35:59 -0700 |
---|---|---|
committer | Kerri Miller <kerrizor@github.com> | 2016-08-09 15:43:01 -0700 |
commit | 496d744fa31665de810b404de968ba86ed87c319 (patch) | |
tree | 5845602181062927cd72709facbb7d7eb92f6b42 /actionpack/lib/action_dispatch/http | |
parent | 46f511685c91486295a418547bb08c2aa5e49cfc (diff) | |
download | rails-496d744fa31665de810b404de968ba86ed87c319.tar.gz rails-496d744fa31665de810b404de968ba86ed87c319.tar.bz2 rails-496d744fa31665de810b404de968ba86ed87c319.zip |
Allow specifying encoding of parameters by action
At GitHub we need to handle parameter encodings that are not UTF-8. This
patch allows us to specify encodings per parameter per action.
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
-rw-r--r-- | actionpack/lib/action_dispatch/http/parameters.rb | 16 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb index f25e50f9f3..a9d1a501ab 100644 --- a/actionpack/lib/action_dispatch/http/parameters.rb +++ b/actionpack/lib/action_dispatch/http/parameters.rb @@ -37,11 +37,23 @@ module ActionDispatch query_parameters.dup end params.merge!(path_parameters) + params = set_custom_encoding(params) set_header("action_dispatch.request.parameters", params) params end alias :params :parameters + def set_custom_encoding(params) + action = params[:action] + params.each do |k, v| + if v.is_a?(String) && v.encoding != encoding_template(action, k) + params[k] = v.force_encoding(encoding_template(action, k)) + end + end + + params + end + def path_parameters=(parameters) #:nodoc: delete_header("action_dispatch.request.parameters") @@ -64,6 +76,10 @@ module ActionDispatch private + def encoding_template(action, param) + controller_class.encoding_for_param(action, param) + end + def parse_formatted_parameters(parsers) return yield if content_length.zero? || content_mime_type.nil? diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 46409a325e..e7cc6d5f31 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -69,6 +69,7 @@ module ActionDispatch PASS_NOT_FOUND = Class.new { # :nodoc: def self.action(_); self; end def self.call(_); [404, {"X-Cascade" => "pass"}, []]; end + def self.encoding_for_param(action, param); ::Encoding::UTF_8; end } def controller_class |