Merge pull request #309 from airbrake/308-filter-crash-fix

filters/keys_filter: handle non-hash values
airbrake · Mar 12, 2018 · 9ec9ba3 · 9ec9ba3
2 parents e57de2d + 0773bd6
commit 9ec9ba3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ Airbrake Ruby Changelog
 
 ### master
 
+* Fixed bug introduced in v2.8.2 in blacklist/whitelist filtering. All
+  v2.8.2 users must upgrade to the recent version
+  ([#309](https://github.com/airbrake/airbrake-ruby/pull/309))
+
 ### [v2.8.2][v2.8.2] (March 5, 2018)
 
 * Fixed bug where params inside arrays couldn't be

diff --git a/lib/airbrake-ruby/filters/keys_filter.rb b/lib/airbrake-ruby/filters/keys_filter.rb
@@ -73,6 +73,8 @@ def should_filter?(_key)
       private
 
       def filter_hash(hash)
+        return hash unless hash.is_a?(Hash)
+
         hash.each_key do |key|
           if should_filter?(key.to_s)
             hash[key] = FILTERED

diff --git a/spec/filters/keys_blacklist_spec.rb b/spec/filters/keys_blacklist_spec.rb
@@ -65,8 +65,8 @@
       'pattern matching',
       ['bingo'],
       [
-        { array: [bingo: 'bango'] },
-        { array: [bingo: '[Filtered]'] }
+        { array: [{ bingo: 'bango' }, []] },
+        { array: [{ bingo: '[Filtered]' }, []] }
       ]
     )
   end