honeybadger 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f7f7f0ed185071b638c1397c651de08defdd67f
-  data.tar.gz: dc426f168bc4fc433638826c744df12f2f11e137
+  metadata.gz: 0b9267b35e8dd5e293fb8047d86757f4d1301bcd
+  data.tar.gz: 01b79957eb4d49740231a9c631189756bdcab2f2
 SHA512:
-  metadata.gz: 19f26d5077e250b8faee7309504bc93ae568d87f8fb5eed8274a4810181dcb865e6688190bfba68c43cc3ac5dbd405f6ddd9ebc98aacf4e736605386c2a6b943
-  data.tar.gz: 1227af632c510f6255b24766622a921a5f2487d71450453a700db852da47cf4b0991b27b11714b0c71227ce224bd9d55a7701c90596704fdbd81fe405b278c35
+  metadata.gz: 58b52ed3d6b25f1ae0c9ae6cd9200c8c216ffcc1dd9b667eb8c1e56d7eb0cab1e11ac2f7ae6a526ca5308a408f08503a4df54ef277090aa31097f690391334b1
+  data.tar.gz: 8d7715734fbf44ee8ae83699782385d837699014d8f02a56bd98cb44ad4512cd63dd4c87ee36048b2f7e57c73b0a8a0d73f9cbf50b8d231f152db43552a11f26

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+* Fixed a bug introduced in v2.0.8 which applied params filters to backtrace.
+
+  *Joshua Wood*
+
+* Fail gracefully when honeybadger.yml is empty or invalid.
+
+  *Joshua Wood*
+
 * Handle bad encodings in exception payloads.
 
   *Joshua Wood*

data/README.md

@@ -1,6 +1,7 @@
 # Honeybadger for Ruby
 
 [![Code Climate](https://codeclimate.com/github/honeybadger-io/honeybadger-ruby/badges/gpa.svg)](https://codeclimate.com/github/honeybadger-io/honeybadger-ruby)
+[![Test Coverage](https://codeclimate.com/github/honeybadger-io/honeybadger-ruby/badges/coverage.svg)](https://codeclimate.com/github/honeybadger-io/honeybadger-ruby)
 [![Build Status](https://secure.travis-ci.org/honeybadger-io/honeybadger-ruby.png?branch=master)](http://travis-ci.org/honeybadger-io/honeybadger-ruby)
 [![Gem Version](https://badge.fury.io/rb/honeybadger.png)](http://badge.fury.io/rb/honeybadger)
 

data/lib/honeybadger/config/yaml.rb

@@ -15,7 +15,7 @@ module Honeybadger
         elsif !@path.readable?
           raise ConfigError, "The configuration file #{@path} is not readable."
         else
-          yaml = YAML.load(ERB.new(@path.read).result)
+          yaml = load_yaml
           yaml.merge!(yaml[env]) if yaml[env].kind_of?(Hash)
           update(dotify_keys(yaml))
         end
@@ -23,6 +23,18 @@ module Honeybadger
 
       private
 
+      def load_yaml
+        yaml = YAML.load(ERB.new(@path.read).result)
+        case yaml
+        when Hash
+          yaml
+        when NilClass, FalseClass
+          {}
+        else
+          raise ConfigError, "The configuration file #{@path} is invalid."
+        end
+      end
+
       def dotify_keys(hash, key_prefix = nil)
         {}.tap do |new_hash|
           hash.each_pair do |k,v|

data/lib/honeybadger/notice.rb

@@ -136,7 +136,9 @@ module Honeybadger
 
       @opts = opts
       @config = config
-      @sanitizer = Util::Sanitizer.new(filters: config.params_filters)
+
+      @sanitizer = Util::Sanitizer.new
+      @filtered_sanitizer = Util::Sanitizer.new(filters: config.params_filters)
 
       @exception = opts[:exception]
       @error_class = exception_attribute(:error_class) {|exception| exception.class.name }
@@ -188,9 +190,9 @@ module Honeybadger
           url: sanitized_url,
           component: s(component),
           action: s(action),
-          params: s(params),
-          session: s(session),
-          cgi_data: s(cgi_data),
+          params: f(params),
+          session: f(session),
+          cgi_data: f(cgi_data),
           context: s(context),
           local_variables: s(local_variables)
         },
@@ -237,7 +239,7 @@ module Honeybadger
 
     private
 
-    attr_reader :config, :opts, :context, :stats, :api_key, :now, :pid, :causes, :sanitizer
+    attr_reader :config, :opts, :context, :stats, :api_key, :now, :pid, :causes, :sanitizer, :filtered_sanitizer
 
     def ignore_by_origin?
       opts[:origin] == :rake && !config[:'exceptions.rescue_rake']
@@ -406,9 +408,13 @@ module Honeybadger
       sanitizer.sanitize(data)
     end
 
+    def f(data)
+      filtered_sanitizer.sanitize(data)
+    end
+
     def sanitized_url
       return nil unless url
-      sanitizer.filter_url(s(url))
+      filtered_sanitizer.filter_url(s(url))
     end
 
     # Internal: Fetch local variables from first frame of backtrace.

data/lib/honeybadger/util/sanitizer.rb

@@ -7,8 +7,11 @@ module Honeybadger
 
       def initialize(opts = {})
         @max_depth = opts.fetch(:max_depth, 20)
-        @filters = Array(opts.fetch(:filters, nil)).collect do |f|
-          f.kind_of?(Regexp) ? f : f.to_s
+
+        if filters = opts.fetch(:filters, nil)
+          @filters = Array(filters).collect do |f|
+            f.kind_of?(Regexp) ? f : f.to_s
+          end
         end
       end
 
@@ -47,6 +50,8 @@ module Honeybadger
       end
 
       def filter_url(url)
+        return url unless filters
+
         filtered_url = url.to_s.dup
         filtered_url.scan(/(?:^|&|\?)([^=?&]+)=([^&]+)/).each do |m|
           next unless filter_key?(m[0])

data/lib/honeybadger/version.rb

@@ -1,4 +1,4 @@
 module Honeybadger
   # Public: The current String Honeybadger version.
-  VERSION = '2.0.8'.freeze
+  VERSION = '2.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Honeybadger Industries LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies: []
 description: Make managing application errors a more pleasant experience.
 email: