From 8654f8c5e9d50c8410376241e7ddc0a869929e4a Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 18 Oct 2012 18:10:32 -0700 Subject: add another singleton for environment filtering --- actionpack/lib/action_dispatch/http/filter_parameters.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb index 8e3443f349..bf6d3ade87 100644 --- a/actionpack/lib/action_dispatch/http/filter_parameters.rb +++ b/actionpack/lib/action_dispatch/http/filter_parameters.rb @@ -22,7 +22,9 @@ module ActionDispatch module FilterParameters @@parameter_filter_for = {} - NULL_FILTER = ParameterFilter.new # :nodoc: + ENV_MATCH = [/RAW_POST_DATA/, "rack.request.form_vars"] # :nodoc: + NULL_PARAM_FILTER = ParameterFilter.new # :nodoc: + NULL_ENV_FILTER = ParameterFilter.new ENV_MATCH # :nodoc: def initialize(env) super @@ -50,12 +52,15 @@ module ActionDispatch def parameter_filter parameter_filter_for @env.fetch("action_dispatch.parameter_filter") { - return NULL_FILTER + return NULL_PARAM_FILTER } end def env_filter - parameter_filter_for(Array(@env["action_dispatch.parameter_filter"]) + [/RAW_POST_DATA/, "rack.request.form_vars"]) + user_key = @env.fetch("action_dispatch.parameter_filter") { + return NULL_ENV_FILTER + } + parameter_filter_for(Array(user_key) + ENV_MATCH) end def parameter_filter_for(filters) -- cgit v1.2.3