rollbar 2.5.1 → 2.5.2

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.5.2
+
+Bug fixes:
+
+- Use ACCEPT header to check json requests. See [#328](https://github.com/rollbar/rollbar-gem/pull/333)
+- Fix URL scrubbing when using a malformed URL. See [#328](https://github.com/rollbar/rollbar-gem/pull/332)
+
 ## 2.5.1
 
 Bug fix:

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.5.1)](https://travis-ci.org/rollbar/rollbar-gem/branches)
+# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.5.2)](https://travis-ci.org/rollbar/rollbar-gem/branches)
 
 <!-- RemoveNext -->
 [Rollbar](https://rollbar.com) is an error tracking service for Ruby and other languages. The Rollbar service will alert you of problems with your code and help you understand them in a ways never possible before. We love it and we hope you will too.
@@ -12,7 +12,7 @@ This is the Ruby library for Rollbar. It will instrument many kinds of Ruby appl
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rollbar', '~> 2.5.1'
+gem 'rollbar', '~> 2.5.2'
 ```
 
 If you are not using JRuby we suggest using [Oj](https://github.com/ohler55/oj) for JSON serialization. In order to install Oj you can add this line to your Gemfile:

data/gemfiles/rails32.gemfile

@@ -15,3 +15,5 @@ gem "rubinius-developer_tools", :platform => :rbx
 gem "rails", "3.2.22"
 
 gemspec :path => "../"
+
+gem 'debugger'

data/lib/rollbar/request_data_extractor.rb

@@ -137,7 +137,7 @@ module Rollbar
       correct_method = rack_req.post? || rack_req.put? || rack_req.patch?
 
       return {} unless correct_method
-      return {} unless rack_req.env['CONTENT_TYPE'] =~ %r{application/json}i
+      return {} unless json_request?(rack_req)
 
       Rollbar::JSON.load(rack_req.body.read)
     rescue
@@ -146,6 +146,11 @@ module Rollbar
       rack_req.body.rewind
     end
 
+    def json_request?(rack_req)
+      !!(rack_req.env['CONTENT_TYPE'] =~ %r{application/json} ||
+         rack_req.env['ACCEPT']       =~ /\bjson\b/)
+    end
+
     def rollbar_request_params(env)
       env['action_dispatch.request.parameters'] || {}
     end

data/lib/rollbar/scrubbers/url.rb

@@ -28,6 +28,8 @@ module Rollbar
         uri.query = filter_query(uri.query)
 
         uri.to_s
+      rescue
+        url
       end
 
       private

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 end

data/spec/controllers/home_controller_spec.rb

@@ -388,6 +388,18 @@ describe HomeController do
     end
   end
 
+  context 'with json ACCEPT header', :type => 'request' do
+    let(:params) { { :foo => :bar } }
+
+    it 'parses the correct headers' do
+      expect do
+        post '/cause_exception', params, { 'ACCEPT' => 'application/vnd.github.v3+json' }
+      end.to raise_exception
+
+      expect(Rollbar.last_report[:request][:params]['foo']).to be_eql('bar')
+    end
+  end
+
   context 'with params to be scrubed from URL', :type => :request do
     next unless Rollbar::LanguageSupport.can_scrub_url?
 

data/spec/dummyapp/config/routes.rb

@@ -4,7 +4,7 @@ Dummy::Application.routes.draw do
     member { post :start_session }
   end
 
-  get '/cause_exception' => 'home#cause_exception'
+  match '/cause_exception' => 'home#cause_exception', :via => [:get, :post]
   put '/deprecated_report_exception' => 'home#deprecated_report_exception'
   match '/report_exception' => 'home#report_exception',
         :via => [:get, :post, :put]

data/spec/rollbar/middleware/sinatra_spec.rb

@@ -144,13 +144,21 @@ describe Rollbar::Middleware::Sinatra, :reconfigure_notifier => true do
         }
       end
 
-      it 'appear in the sent payload' do
+      it 'appears in the sent payload when application/json is the content type' do
         expect do
           post '/crash_post', params.to_json, { 'CONTENT_TYPE' => 'application/json' }
         end.to raise_error(exception)
 
         expect(Rollbar.last_report[:request][:params]).to be_eql(params)
       end
+
+      it 'appears in the sent payload when the accepts header contains json' do
+        expect do
+          post '/crash_post', params, { 'ACCEPT' => 'application/vnd.github.v3+json' }
+        end.to raise_error(exception)
+
+        expect(Rollbar.last_report[:request][:params]).to be_eql(params)
+      end
     end
 
     it 'resets the notifier in every request' do

data/spec/rollbar/scrubbers/url_spec.rb

@@ -98,6 +98,14 @@ describe Rollbar::Scrubbers::URL do
           expect(subject.call(url)).to match(expected_url)
         end
       end
+
+      context 'with malformed URL or not able to be parsed' do
+        let(:url) { '\this\is\not\a\valid\url' }
+
+        it 'return the same url' do
+          expect(subject.call(url)).to be_eql(url)
+        end
+      end
     end
   end
 end

metadata

@@ -1,209 +1,238 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
+  prerelease: 
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: girl_friday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: sucker_punch
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: genspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.14
 description: Easy and powerful exception tracking for Ruby
@@ -214,8 +243,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -383,26 +412,27 @@ files:
 homepage: https://rollbar.com
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Reports exceptions to Rollbar
 test_files:
 - spec/cacert.pem

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 624449078b1bb27b9cc3823079379c16f911a436
-  data.tar.gz: 9b8264e3a4b51ff029f9bc8911d0acc3611ba5a3
-SHA512:
-  metadata.gz: 4703b2a859825b5b23f682e9e0b3d5e784c1e3f0448e31716d254a1b8ef39295f456b630dfc94589bf866e96101e7a1b9883e7ec0a20caa466a92190de001686
-  data.tar.gz: ebe79ef4941d4bcc616e4c353c2eff00c19e049128357fe6245f3d451cad2d7e52f6cd335a5b6bea3285924073738f509726f2735ce78847b3ebd0479325c2f4