diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-04 12:02:22 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-08 12:41:24 -0800 |
commit | 8e577fe560d5756fcc67840ba304d79ada6804e4 (patch) | |
tree | 4826e41e676ac89d5c17b0b4eb20c939a166c3fb /actionpack/lib/action_dispatch/http | |
parent | c31cc963daac55f6a3bca9da99b619276911dbd7 (diff) | |
download | rails-8e577fe560d5756fcc67840ba304d79ada6804e4.tar.gz rails-8e577fe560d5756fcc67840ba304d79ada6804e4.tar.bz2 rails-8e577fe560d5756fcc67840ba304d79ada6804e4.zip |
* Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_dispatch/http/request.rb
actionpack/lib/action_dispatch/middleware/params_parser.rb
activerecord/CHANGELOG.md
activerecord/lib/active_record/relation/predicate_builder.rb
activerecord/test/cases/relation/where_test.rb
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
-rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 452809a689..31b36eedb0 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -276,15 +276,14 @@ module ActionDispatch LOCALHOST =~ remote_addr && LOCALHOST =~ remote_ip end - protected - # Remove nils from the params hash def deep_munge(hash) - hash.each_value do |v| + hash.each do |k, v| case v when Array v.grep(Hash) { |x| deep_munge(x) } v.compact! + hash[k] = nil if v.empty? when Hash deep_munge(v) end @@ -293,6 +292,8 @@ module ActionDispatch hash end + protected + def parse_query(qs) deep_munge(super) end |