rollbar 2.4.0 → 2.5.0

data/spec/controllers/home_controller_spec.rb

@@ -67,10 +67,9 @@ describe HomeController do
         }
 
         filtered = controller.send( :rollbar_headers, headers )
-        filtered.should == {
-          "Authorization" => "*********",
-          "User-Agent" => "spec"
-        }
+
+        expect(filtered['Authorization']).to match(/\**/)
+        expect(filtered['User-Agent']).to be_eql('spec')
       end
 
       it 'should filter custom headers' do
@@ -85,11 +84,9 @@ describe HomeController do
         }
 
         filtered = controller.send( :rollbar_headers, headers )
-        filtered.should == {
-          "Auth" => "**********",
-          "Token" => "***********",
-          "Content-Type" => "text/html"
-        }
+        expect(filtered['Auth']).to match(/\**/)
+        expect(filtered['Token']).to match(/\**/)
+        expect(filtered['Content-Type']).to be_eql('text/html')
       end
 
     end
@@ -188,11 +185,11 @@ describe HomeController do
 
       filtered = Rollbar.last_report[:request][:params]
 
-      filtered["passwd"].should == "******"
-      filtered["password"].should == "******"
-      filtered["secret"].should == "******"
-      filtered["notpass"].should == "visible"
-      filtered["secret_token"].should == "*" * 32
+      expect(filtered["passwd"]).to match(/\**/)
+      expect(filtered["password"]).to match(/\**/)
+      expect(filtered["secret"]).to match(/\**/)
+      expect(filtered["notpass"]).to match(/\**/)
+      expect(filtered["secret_token"]).to match(/\**/)
     end
 
     it "should scrub custom scrub_fields" do
@@ -214,9 +211,9 @@ describe HomeController do
       filtered["passwd"].should == "visible"
       # config.filter_parameters is set to [:password] in
       # spec/dummyapp/config/application.rb
-      filtered["password"].should == "*******"
-      filtered["secret"].should == "******"
-      filtered["notpass"].should == "******"
+      expect(filtered["password"]).to match(/\**/)
+      expect(filtered["secret"]).to match(/\**/)
+      expect(filtered["notpass"]).to match(/\**/)
     end
   end
 
@@ -391,6 +388,30 @@ describe HomeController do
     end
   end
 
+  context 'with params to be scrubed from URL', :type => :request do
+    next unless Rollbar::LanguageSupport.can_scrub_url?
+
+    before do
+      Rollbar.configure do |config|
+        config.scrub_fields = [:password]
+      end
+    end
+
+    let(:headers) do
+      {
+        'ORIGINAL_FULLPATH' => '/cause_exception?password=my-secret-password'
+      }
+    end
+
+    it 'scrubs sensible data from URL' do
+      expect { get '/cause_exception', { :password => 'my-secret-password' }, headers }.to raise_exception
+
+      request_data = Rollbar.last_report[:request]
+
+      expect(request_data[:url]).to match('http:\/\/www.example.com\/cause_exception\?password=\*{3,8}')
+    end
+  end
+
   after(:each) do
     Rollbar.configure do |config|
       config.logger = ::Rails.logger

data/spec/rollbar/json_spec.rb

@@ -24,6 +24,11 @@ module MultiJson
   end
 end
 
+module MissingCustomOptions
+  # Consider the fact that there's MultiJson::Adapters::Yajl but not
+  # Rollbar::JSON::Yajl, it should not look for ::Yajl but only
+  # Rollbar::JSON::Yajl.
+end
 
 describe Rollbar::JSON do
   let(:payload) do

data/spec/rollbar/request_data_extractor_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+require 'rack/mock'
+
+require 'rollbar/request_data_extractor'
+
+class ExtractorDummy
+  include Rollbar::RequestDataExtractor
+end
+
+describe Rollbar::RequestDataExtractor do
+  subject { ExtractorDummy.new }
+
+  let(:env) do
+    Rack::MockRequest.env_for('/', 'HTTP_HOST' => 'localhost:81', 'HTTP_X_FORWARDED_HOST' => 'example.org:9292')
+  end
+
+  describe '#extract_request_data_from_rack' do
+    let(:scrubber) { double }
+
+    it 'returns a Hash object' do
+      scrubber_config = {
+        :scrub_fields => kind_of(Array),
+        :scrub_user => Rollbar.configuration.scrub_user,
+        :scrub_password => Rollbar.configuration.scrub_password,
+        :randomize_scrub_length => Rollbar.configuration.randomize_scrub_length
+      }
+      expect(Rollbar::Scrubbers::URL).to receive(:new).with(scrubber_config).and_return(scrubber)
+      expect(scrubber).to receive(:call).with(kind_of(String))
+
+      result = subject.extract_request_data_from_rack(env)
+
+      expect(result).to be_kind_of(Hash)
+    end
+  end
+
+  describe '#rollbar_scrubbed_value' do
+    context 'with random scrub length' do
+      before do
+        allow(Rollbar.configuration).to receive(:randomize_scrub_length).and_return(true)
+      end
+
+      let(:value) { 'herecomesaverylongvalue' }
+
+      it 'randomizes the scrubbed string' do
+        expect(subject.rollbar_scrubbed(value)).to match(/\*{3,8}/)
+      end
+    end
+
+    context 'with no-random scrub length' do
+      before do
+        allow(Rollbar.configuration).to receive(:randomize_scrub_length).and_return(false)
+      end
+
+      let(:value) { 'herecomesaverylongvalue' }
+
+      it 'randomizes the scrubbed string' do
+        expect(subject.rollbar_scrubbed(value)).to match(/\*{#{value.length}}/)
+      end
+    end
+  end
+end

data/spec/rollbar/scrubbers/url_spec.rb

@@ -0,0 +1,103 @@
+require 'spec_helper'
+require 'rollbar/language_support'
+require 'rollbar/scrubbers/url'
+
+describe Rollbar::Scrubbers::URL do
+  let(:options) do
+    { :scrub_fields => [:password, :secret],
+      :scrub_user => false,
+      :scrub_password => false,
+      :randomize_scrub_length => true
+    }
+  end
+
+  subject { described_class.new(options) }
+
+  describe '#call' do
+    context 'cannot scrub URLs' do
+      next if Rollbar::LanguageSupport.can_scrub_url?
+
+      let(:url) { 'http://user:password@foo.com/some-interesting-path#fragment' }
+
+      it 'returns the URL without any change' do
+        expect(subject.call(url)).to be_eql(url)
+      end
+    end
+
+    context 'with ruby different from 1.8' do
+      next unless Rollbar::LanguageSupport.can_scrub_url?
+
+      context 'without data to be scrubbed' do
+        let(:url) { 'http://user:password@foo.com/some-interesting-path#fragment' }
+
+        it 'returns the URL without any change' do
+          expect(subject.call(url)).to be_eql(url)
+        end
+
+        context 'with arrays in params' do
+          let(:url) { 'http://user:password@foo.com/some-interesting-path?foo[]=1&foo[]=2' }
+
+          it 'returns the URL without any change' do
+            expect(subject.call(url)).to be_eql(url)
+          end
+        end
+      end
+
+      context 'scrubbing user and password' do
+        let(:options) do
+          {
+            :scrub_fields => [],
+            :scrub_password => true,
+            :scrub_user => true
+          }
+        end
+
+        let(:url) { 'http://user:password@foo.com/some-interesting-path#fragment' }
+
+        it 'returns the URL without any change' do
+          expected_url = /http:\/\/\*{3,8}:\*{3,8}@foo.com\/some-interesting\-path#fragment/
+
+          expect(subject.call(url)).to match(expected_url)
+        end
+      end
+
+      context 'with params to be filtered' do
+        let(:url) { 'http://foo.com/some-interesting-path?foo=bar&password=mypassword&secret=somevalue#fragment' }
+
+        it 'returns the URL with some params filtered' do
+          expected_url = /http:\/\/foo.com\/some-interesting-path\?foo=bar&password=\*{3,8}&secret=\*{3,8}#fragment/
+
+          expect(subject.call(url)).to match(expected_url)
+        end
+
+        context 'having array params' do
+          let(:url) { 'http://foo.com/some-interesting-path?foo=bar&password[]=mypassword&password[]=otherpassword&secret=somevalue#fragment' }
+
+          it 'returns the URL with some params filtered' do
+            expected_url = /http:\/\/foo.com\/some-interesting-path\?foo=bar&password\[\]=\*{3,8}&password\[\]=\*{3,8}&secret=\*{3,8}#fragment/
+
+            expect(subject.call(url)).to match(expected_url)
+          end
+        end
+      end
+
+      context 'with no-random scrub length' do
+        let(:options) do
+          { :scrub_fields => [:password, :secret],
+            :scrub_user => false,
+            :scrub_password => false,
+            :randomize_scrub_length => false
+          }
+        end
+        let(:password) { 'longpasswordishere' }
+        let(:url) { "http://foo.com/some-interesting-path?foo=bar&password=#{password}#fragment" }
+
+        it 'scrubs with same length than the scrubbed param' do
+          expected_url = /http:\/\/foo.com\/some-interesting-path\?foo=bar&password=\*{#{password.length}}#fragment/
+
+          expect(subject.call(url)).to match(expected_url)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,221 +1,217 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rollbar
-version: !ruby/object:Gem::Version
-  version: 2.4.0
+version: !ruby/object:Gem::Version 
+  hash: 27
+  prerelease: 
+  segments: 
+  - 2
+  - 5
+  - 0
+  version: 2.5.0
 platform: ruby
-authors:
+authors: 
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2015-10-24 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.0
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 2
+        - 14
+        - 0
         version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: girl_friday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: girl_friday
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 11
+        - 1
         version: 0.11.1
-- !ruby/object:Gem::Dependency
-  name: sucker_punch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.13.0
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: genspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.8
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 2
+        - 8
         version: 0.2.8
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: resque
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: delayed_job
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: delayed_job
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: redis
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.12.14
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 12
+        - 14
         version: 2.12.14
+  type: :development
+  version_requirements: *id012
 description: Easy and powerful exception tracking for Ruby
-email:
+email: 
 - support@rollbar.com
-executables:
+executables: 
 - rollbar-rails-runner
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".travis.yml"
+
+files: 
+- .gitignore
+- .travis.yml
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -257,6 +253,7 @@ files:
 - lib/rollbar/json.rb
 - lib/rollbar/json/default.rb
 - lib/rollbar/json/oj.rb
+- lib/rollbar/language_support.rb
 - lib/rollbar/logger_proxy.rb
 - lib/rollbar/middleware/rack/builder.rb
 - lib/rollbar/middleware/rack/test_session.rb
@@ -270,6 +267,8 @@ files:
 - lib/rollbar/rake.rb
 - lib/rollbar/rake_tasks.rb
 - lib/rollbar/request_data_extractor.rb
+- lib/rollbar/scrubbers.rb
+- lib/rollbar/scrubbers/url.rb
 - lib/rollbar/sidekiq.rb
 - lib/rollbar/tasks/rollbar.cap
 - lib/rollbar/truncation.rb
@@ -282,6 +281,7 @@ files:
 - lib/rollbar/util/hash.rb
 - lib/rollbar/version.rb
 - rollbar.gemspec
+- spec/cacert.pem
 - spec/controllers/home_controller_spec.rb
 - spec/delay/sidekiq_spec.rb
 - spec/delay/sucker_punch_spec.rb
@@ -358,6 +358,8 @@ files:
 - spec/rollbar/middleware/rack/builder_spec.rb
 - spec/rollbar/middleware/sinatra_spec.rb
 - spec/rollbar/rake_spec.rb
+- spec/rollbar/request_data_extractor_spec.rb
+- spec/rollbar/scrubbers/url_spec.rb
 - spec/rollbar/sidekiq_spec.rb
 - spec/rollbar/truncation/frames_strategy_spec.rb
 - spec/rollbar/truncation/min_body_strategy_spec.rb
@@ -374,31 +376,42 @@ files:
 - spec/support/helpers.rb
 - spec/support/notifier_helpers.rb
 - spec/support/shared_contexts.rb
+has_rdoc: true
 homepage: https://rollbar.com
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Reports exceptions to Rollbar
-test_files:
+test_files: 
+- spec/cacert.pem
 - spec/controllers/home_controller_spec.rb
 - spec/delay/sidekiq_spec.rb
 - spec/delay/sucker_punch_spec.rb
@@ -475,6 +488,8 @@ test_files:
 - spec/rollbar/middleware/rack/builder_spec.rb
 - spec/rollbar/middleware/sinatra_spec.rb
 - spec/rollbar/rake_spec.rb
+- spec/rollbar/request_data_extractor_spec.rb
+- spec/rollbar/scrubbers/url_spec.rb
 - spec/rollbar/sidekiq_spec.rb
 - spec/rollbar/truncation/frames_strategy_spec.rb
 - spec/rollbar/truncation/min_body_strategy_spec.rb