exceptional 2.0.25 → 2.0.26

data/lib/exceptional/controller_exception_data.rb

@@ -28,8 +28,27 @@ module Exceptional
       }
     end
 
+    def filter_hash(keys_to_filter, hash)
+      if keys_to_filter.is_a?(Array) && !keys_to_filter.empty?
+        hash.each do |key, value|
+          if value.respond_to?(:to_hash)
+            filter_hash(keys_to_filter, hash[key])
+          elsif key_match?(key, keys_to_filter)
+            hash[key] = "[FILTERED]"
+          end
+        end
+      end
+      hash
+    end
+
+    def key_match?(key, keys_to_filter)
+      keys_to_filter.map {|k| k.to_s}.include?(key.to_s)
+    end
+
     def filter_paramaters(hash)                                                                                       
-      if @controller.respond_to?(:filter_parameters)
+      if @request.respond_to?(:env) && @request.env["action_dispatch.parameter_filter"]
+        filter_hash(@request.env["action_dispatch.parameter_filter"], hash)
+      elsif @controller.respond_to?(:filter_parameters)
         @controller.send(:filter_parameters, hash)
       else
         hash

data/lib/exceptional/version.rb

@@ -1,3 +1,3 @@
 module Exceptional
-  VERSION = '2.0.25'
+  VERSION = '2.0.26'
 end

data/spec/exceptional/exception_data_spec.rb

@@ -117,6 +117,13 @@ describe Exceptional::ControllerExceptionData, 'with request/controller/params'
     Exceptional::ControllerExceptionData.sanitize_hash(input).should == {'crazy' => [crazy.to_s]}    
   end
 
+  it "filter params specified in env['action_dispatch.parameter_filter']" do
+    @request.stub!(:env).and_return({'SOME_VAR' => 'abc', 'HTTP_CONTENT_TYPE' => 'text/html', 'action_dispatch.parameter_filter' => [:var1]})
+    @request.stub!(:parameters).and_return({'var1' => 'abc'})
+    data = Exceptional::ControllerExceptionData.new(@error, @controller, @request)
+    data.to_hash['request']['parameters'].should == {'var1' => '[FILTERED]'}
+  end
+
   it "ArgumentError bug with file object" do
     file = File.new(File.expand_path('../../fixtures/favicon.png',__FILE__))
     @request.stub!(:parameters).and_return({'something' => file })

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exceptional
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 2
   - 0
-  - 25
-  version: 2.0.25
+  - 26
+  version: 2.0.26
 platform: ruby
 authors: 
 - Contrast
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +01:00
+date: 2010-09-14 00:00:00 +01:00
 default_executable: 
 dependencies: []