Merge pull request #1 from github/logging-fix

Logging fix

RAILS_VERSION

-2.3.14.github47
+2.3.14.github48

actionpack/lib/action_controller/base.rb

@@ -1310,7 +1310,7 @@ def log_processing_for_request_id
       end
 
       def log_processing_for_parameters
-        parameters = respond_to?(:filter_parameters) ? filter_parameters(params) : params.dup
+        parameters = respond_to?(:filter_parameters, true) ? filter_parameters(params) : params.dup
         parameters = parameters.except!(:controller, :action, :format, :_method)
 
         logger.info "  Parameters: #{parameters.inspect}" unless parameters.empty?

actionpack/test/controller/filter_params_test.rb

@@ -44,6 +44,23 @@ def test_filter_parameters
     end
   end
 
+  def test_log_is_filtered
+    FilterParamController.filter_parameter_logging(:password, :foo)
+
+    params = {
+      :foo => "not logged",
+      :bar => "logged",
+      :nested => { :password => "not logged" },
+      :controller => "not_logged",
+      :action => "not_logged",
+    }.freeze
+    logger = stub("Logger")
+    logger.expects(:info).with(%Q{  Parameters: {:foo=>"[FILTERED]", :bar=>"logged", :nested=>{:password=>"[FILTERED]"}}})
+    @controller.stubs(:params => params, :logger => logger)
+
+    @controller.send(:log_processing_for_parameters)
+  end
+
   def test_filter_parameters_is_protected
     FilterParamController.filter_parameter_logging(:foo)
     assert !FilterParamController.action_methods.include?('filter_parameters')