honeybadger 1.13.1 → 1.13.2

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## Honeybadger 1.13.2 (unreleased) ##
+
+* Fix 2 bugs where the Rails raises exceptions when accessing session
+  information. (ActionDispatch::Session::SessionRestoreError) and
+  ArgumentError when `config.secret_token` is missing.
+
+  *Joshua Wood*
+
+* Disable notices via API when unauthorized.
+
+  *Joshua Wood*
+
+## Honeybadger 1.13.1 ##
+
+* Be less verbose when logging that metrics are disabled. (primarily for
+Unicorn users)
+
+  *Joshua Wood*
+
 ## Honeybadger 1.13.0 ##
 
 * Add native support for Sidekiq 3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    honeybadger (1.13.1)
+    honeybadger (1.13.2)
       json
 
 GEM

data/Rakefile

@@ -65,6 +65,10 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
     t.cucumber_opts << '--tags ~@rails_3'
   end
 
+  if ENV['BUNDLE_GEMFILE'] =~ /rails3/
+    t.cucumber_opts << 'features/rails3.x.feature'
+  end
+
   case ENV['BUNDLE_GEMFILE']
   when /rails/
     t.cucumber_opts << 'features/rails.feature features/metal.feature'

data/features/rails3.x.feature

@@ -0,0 +1,26 @@
+Feature: Install the Gem in a Rails 3.x application
+
+  Background:
+    Given I generate a new Rails application
+    And I configure the Honeybadger shim
+
+  Scenario: Rails is missing `config.secret_token`
+    When I configure my application to require Honeybadger
+    And I configure Honeybadger with:
+      """
+      config.api_key = "myapikey"
+      config.logger = Logger.new(STDOUT)
+      config.debug = true
+      """
+    And I define a response for "TestController#index":
+      """
+      session["secret"] = "blue42"
+      render :nothing => true
+      """
+    And I route "/test/index" to "test#index"
+    And I successfully run `rm config/initializers/secret_token.rb`
+    And I perform a request to "http://example.com:123/test/index"
+    Then I should receive a Honeybadger notification
+    And the request should not contain "blue42"
+    And the request session should contain "config.secret_token"
+

data/gemfiles/rack.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.13.1)
+    honeybadger (1.13.2)
       json
 
 GEM

data/gemfiles/rails2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.13.1)
+    honeybadger (1.13.2)
       json
 
 GEM

data/gemfiles/rails3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.13.1)
+    honeybadger (1.13.2)
       json
 
 GEM

data/gemfiles/rails3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.13.1)
+    honeybadger (1.13.2)
       json
 
 GEM

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.13.1)
+    honeybadger (1.13.2)
       json
 
 GEM

data/gemfiles/rails4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.13.1)
+    honeybadger (1.13.2)
       json
 
 GEM

data/gemfiles/rails4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.13.1)
+    honeybadger (1.13.2)
       json
 
 GEM

data/gemfiles/rake.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.13.1)
+    honeybadger (1.13.2)
       json
 
 GEM

data/gemfiles/sinatra.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.13.1)
+    honeybadger (1.13.2)
       json
 
 GEM

data/honeybadger.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'honeybadger'
-  s.version           = '1.13.1'
-  s.date              = '2014-05-14'
+  s.version           = '1.13.2'
+  s.date              = '2014-05-22'
 
   s.summary     = 'Error reports you can be happy about.'
   s.description = 'Make managing application errors a more pleasant experience.'
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
     features/metal.feature
     features/rack.feature
     features/rails.feature
+    features/rails3.x.feature
     features/rake.feature
     features/sinatra.feature
     features/step_definitions/metal_steps.rb

data/lib/honeybadger.rb

@@ -17,7 +17,7 @@ require 'honeybadger/railtie' if defined?(Rails::Railtie)
 require 'honeybadger/integrations/sidekiq'
 
 module Honeybadger
-  VERSION = '1.13.1'
+  VERSION = '1.13.2'
   LOG_PREFIX = "** [Honeybadger] "
 
   HEADERS = {

data/lib/honeybadger/notice.rb

@@ -124,12 +124,12 @@ module Honeybadger
       self.source_extract_radius = args[:source_extract_radius] || 2
       self.source_extract        = extract_source_from_backtrace
 
-      self.send_request_session     = args[:send_request_session].nil? ? true : args[:send_request_session]
+      self.send_request_session = args[:send_request_session].nil? ? true : args[:send_request_session]
 
-      also_use_rack_params_filters
       find_session_data
-      clean_params
       clean_rack_request_data
+      also_use_rack_params_filters
+      clean_params
       set_context
     end
 
@@ -338,8 +338,10 @@ module Honeybadger
 
     def clean_rack_request_data
       if cgi_data
+        self.cgi_data = cgi_data.dup
         cgi_data.delete("rack.request.form_vars")
         cgi_data.delete("rack.request.query_string")
+        cgi_data.delete("rack.session")
         cgi_data.delete("action_dispatch.request.parameters")
         cgi_data.delete("action_dispatch.request.request_parameters")
       end
@@ -406,6 +408,11 @@ module Honeybadger
         self.session_data = args[:session_data] || args[:session] || rack_session || {}
         self.session_data = session_data[:data] if session_data[:data]
       end
+    rescue => e
+      # Rails raises ArgumentError when `config.secret_token` is missing, and
+      # ActionDispatch::Session::SessionRestoreError when the session can't be
+      # restored.
+      self.session_data = { :error => "Failed to access session data -- #{e.message}" }
     end
 
     def set_context
@@ -431,7 +438,7 @@ module Honeybadger
     end
 
     def rack_session
-      args[:rack_env]['rack.session'] if args[:rack_env]
+      rack_env(:session).to_hash if args[:rack_env]
     end
 
     # Private: (Rails 3+) Adds params filters to filter list

data/lib/honeybadger/sender.rb

@@ -35,7 +35,9 @@ module Honeybadger
     # Returns error id from successful response
     def send_to_honeybadger(notice)
       if !Honeybadger.configuration.features['notices']
-        log(:error, "Can't send error report -- the gem has been deactivated by the remote service.  Try restarting your app or contacting support@honeybadger.io.")
+        log(:error, "Can't send error report -- the gem has been deactivated by the remote service.\n\t" \
+            "This is usually a result of an expired plan. Please check your payment info and restart your app.\n\t" \
+            "If you continue to receive this message, contact support@honeybadger.io.")
         return nil
       end
 
@@ -51,6 +53,7 @@ module Honeybadger
         log(Honeybadger.configuration.debug ? :info : :debug, "Success: #{response.class}", response, data)
         JSON.parse(response.body).fetch('id')
       else
+        Honeybadger.configuration.features['notices'] = false if Net::HTTPForbidden === response
         log(:error, "Failure: #{response.class}", response, data)
         log_original_exception(notice)
         nil

data/spec/honeybadger/sender_spec.rb

@@ -63,11 +63,27 @@ describe Honeybadger::Sender do
     end
   end
 
-  it "logs success" do
-    stub_http
-    sender = build_sender
-    sender.should_receive(:log).with(:debug, /Success/, kind_of(Net::HTTPSuccess), kind_of(String))
-    send_exception(:sender => sender, :secure => false)
+  context "success response from server" do
+    let(:sender) { build_sender }
+
+    before { stub_http }
+
+    it "logs success" do
+      sender.should_receive(:log).with(:debug, /Success/, kind_of(Net::HTTPSuccess), kind_of(String))
+      send_exception(:sender => sender, :secure => false)
+    end
+
+    it "doesn't change features" do
+      expect { send_exception(:sender => sender, :secure => false) }.not_to change { Honeybadger.configuration.features }
+    end
+  end
+
+  context "403 response from server" do
+    it "deactivates notices on 403" do
+      stub_http(:response => Net::HTTPForbidden.new('1.2', '403', 'Forbidden'))
+      sender = build_sender
+      expect { send_exception(:sender => sender, :secure => false) }.to change { Honeybadger.configuration.features['notices'] }.to false
+    end
   end
 
   it "logs failure" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -254,6 +254,7 @@ files:
 - features/metal.feature
 - features/rack.feature
 - features/rails.feature
+- features/rails3.x.feature
 - features/rake.feature
 - features/sinatra.feature
 - features/step_definitions/metal_steps.rb
@@ -361,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2870056027279170581
+      hash: 2811727937091942835
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: