rollbar 2.12.0 → 2.13.0

data/spec/delayed/backend/test.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'delayed_job'
 require 'delayed/backend/base'
 
 # This code is taken from delayed_job/spec/delayed/backend/test.rb.

data/spec/requests/home_spec.rb

@@ -32,7 +32,7 @@ describe HomeController do
       ActionDispatch::Cookies::CookieJar.send(:define_method, cookie_method_name, broken_cookie_method)
     end
 
-    after(:each) do
+    after do
       ActionDispatch::Cookies::CookieJar.send(:define_method, cookie_method_name, original_cookie_method)
     end
 

data/spec/rollbar/configuration_spec.rb

@@ -21,4 +21,26 @@ describe Rollbar::Configuration do
       expect(subject.async_handler).to be_eql(Rollbar::Delay::Resque)
     end
   end
+
+  describe '#merge' do
+    it 'returns a new object with overrided values' do
+      subject.environment = 'foo'
+
+      new_config = subject.merge(:environment => 'bar')
+
+      expect(new_config).not_to be(subject)
+      expect(new_config.environment).to be_eql('bar')
+    end
+  end
+
+  describe '#merge!' do
+    it 'returns the same object with overrided values' do
+      subject.environment = 'foo'
+
+      new_config = subject.merge!(:environment => 'bar')
+
+      expect(new_config).to be(subject)
+      expect(new_config.environment).to be_eql('bar')
+    end
+  end
 end

data/spec/rollbar/item/backtrace_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'tempfile'
+require 'rollbar/item/backtrace'
+
+describe Rollbar::Item::Backtrace do
+  describe '#get_file_lines' do
+    subject { described_class.new(exception) }
+
+    let(:exception) { Exception.new }
+    let(:file) { Tempfile.new('foo') }
+
+    before do
+      File.open(file.path, 'w') do |f|
+        f << "foo\nbar"
+      end
+    end
+
+    it 'returns the lines of the file' do
+      lines = subject.get_file_lines(file.path)
+
+      expect(lines.size).to be_eql(2)
+      expect(lines[0]).to be_eql('foo')
+      expect(lines[1]).to be_eql('bar')
+    end
+  end
+end

data/spec/rollbar/item/frame_spec.rb

@@ -0,0 +1,267 @@
+require 'spec_helper'
+require 'tempfile'
+require 'rollbar/item/backtrace'
+require 'rollbar/item/frame'
+
+describe Rollbar::Item::Frame do
+  subject { described_class.new(backtrace, frame, options) }
+
+  let(:backtrace) { double('backtrace') }
+  let(:options) { {} }
+
+  describe '#to_h' do
+    context 'with a frame that is not a valid frame' do
+      let(:frame) { 'this frame is not valid' }
+
+      it 'return an unknown frame value' do
+        expected_result = {
+          :filename => '<unknown>',
+          :lineno => 0,
+          :method => frame
+        }
+
+        result = subject.to_h
+        expect(result).to be_eql(expected_result)
+      end
+    end
+
+    context 'with valid frame' do
+      let(:file) do
+        <<-END
+foo1
+foo2
+foo3
+foo4
+foo5
+foo6
+foo7
+foo8
+foo9
+foo10
+foo11
+foo12
+foo13
+        END
+      end
+      let(:filepath) do
+        '/var/www/rollbar/playground/rails4.2/vendor/bundle/gems/actionpack-4.2.0/lib/action_controller/metal/implicit_render.rb'
+      end
+      let(:frame) do
+        "#{filepath}:7:in `send_action'"
+      end
+      let(:options) do
+        { :configuration => configuration }
+      end
+
+      before do
+        allow(backtrace).to receive(:get_file_lines).with(filepath).and_return(file.split("\n"))
+      end
+
+      context 'with send_extra_frame_data = :none' do
+        let(:configuration) do
+          double('configuration',
+                 :send_extra_frame_data => :none,
+                 :root => '/var/www')
+        end
+
+        it 'just return the filename, lineno and method' do
+          expected_result = {
+            :filename => filepath,
+            :lineno => 7,
+            :method => 'send_action'
+          }
+
+          expect(subject.to_h).to be_eql(expected_result)
+        end
+      end
+
+      context 'with send_extra_frame_data = :all' do
+        let(:configuration) do
+          double('configuration',
+                 :send_extra_frame_data => :all,
+                 :root => '/var/www')
+        end
+
+        it 'returns also code and context' do
+          expected_result = {
+            :filename => filepath,
+            :lineno => 7,
+            :method => 'send_action',
+            :code => 'foo7',
+            :context => {
+              :pre => %w(foo3 foo4 foo5 foo6),
+              :post => %w(foo8 foo9 foo10 foo11)
+            }
+          }
+
+          expect(subject.to_h).to be_eql(expected_result)
+        end
+
+        context 'if there is not lines in the file' do
+          let(:file) do
+            ''
+          end
+          it 'just returns the basic data' do
+            expected_result = {
+              :filename => filepath,
+              :lineno => 7,
+              :method => 'send_action'
+            }
+
+            expect(subject.to_h).to be_eql(expected_result)
+          end
+        end
+
+        context 'if the file couldnt be read' do
+          before do
+            allow(backtrace).to receive(:get_file_lines).with(filepath).and_return(nil)
+          end
+
+          it 'just returns the basic data' do
+            expected_result = {
+              :filename => filepath,
+              :lineno => 7,
+              :method => 'send_action'
+            }
+
+            expect(subject.to_h).to be_eql(expected_result)
+          end
+        end
+      end
+
+      context 'with send_extra_frame_data = :app' do
+        context 'with frame outside the root' do
+          let(:configuration) do
+            double('configuration',
+                   :send_extra_frame_data => :app,
+                   :root => '/outside/project',
+                   :project_gem_paths => [])
+          end
+
+          it 'just returns the basic frame data' do
+            expected_result = {
+              :filename => filepath,
+              :lineno => 7,
+              :method => 'send_action'
+            }
+
+            expect(subject.to_h).to be_eql(expected_result)
+          end
+        end
+
+        context 'with frame inside project_gem_paths' do
+          let(:configuration) do
+            double('configuration',
+                   :send_extra_frame_data => :app,
+                   :root => '/var/outside/',
+                   :project_gem_paths => ['/var/www/'])
+          end
+
+          it 'returns also context and code data' do
+            expected_result = {
+              :filename => filepath,
+              :lineno => 7,
+              :method => 'send_action',
+              :code => 'foo7',
+              :context => {
+                :pre => %w(foo3 foo4 foo5 foo6),
+                :post => %w(foo8 foo9 foo10 foo11)
+              }
+            }
+
+            expect(subject.to_h).to be_eql(expected_result)
+          end
+        end
+
+        context 'and frame inside app root' do
+          let(:configuration) do
+            double('configuration',
+                   :send_extra_frame_data => :app,
+                   :root => '/var/www',
+                   :project_gem_paths => [])
+          end
+
+          it 'returns also the context and code data' do
+            expected_result = {
+              :filename => filepath,
+              :lineno => 7,
+              :method => 'send_action',
+              :code => 'foo7',
+              :context => {
+                :pre => %w(foo3 foo4 foo5 foo6),
+                :post => %w(foo8 foo9 foo10 foo11)
+              }
+            }
+
+            expect(subject.to_h).to be_eql(expected_result)
+          end
+
+          context 'but inside Gem.path' do
+            let(:configuration) do
+              double('configuration',
+                     :send_extra_frame_data => :app,
+                     :root => '/var/www/',
+                     :project_gem_paths => [])
+            end
+
+            before do
+              allow(Gem).to receive(:path).and_return(['/var/www/rollbar'])
+            end
+
+            it 'just returns also the basic data' do
+              expected_result = {
+                :filename => filepath,
+                :lineno => 7,
+                :method => 'send_action'
+              }
+
+              expect(subject.to_h).to be_eql(expected_result)
+            end
+          end
+
+          context 'having less pre lines than maximum' do
+            let(:frame) do
+              "#{filepath}:3:in `send_action'"
+            end
+
+            it 'returns up to 2 pre lines' do
+              expected_result = {
+                :filename => filepath,
+                :lineno => 3,
+                :method => 'send_action',
+                :code => 'foo3',
+                :context => {
+                  :pre => %w(foo1 foo2),
+                  :post => %w(foo4 foo5 foo6 foo7)
+                }
+              }
+
+              expect(subject.to_h).to be_eql(expected_result)
+            end
+          end
+
+          context 'having less post lines than maximum' do
+            let(:frame) do
+              "#{filepath}:11:in `send_action'"
+            end
+
+            it 'returns up to 2 post lines' do
+              expected_result = {
+                :filename => filepath,
+                :lineno => 11,
+                :method => 'send_action',
+                :code => 'foo11',
+                :context => {
+                  :pre => %w(foo7 foo8 foo9 foo10),
+                  :post => %w(foo12 foo13)
+                }
+              }
+
+              expect(subject.to_h).to be_eql(expected_result)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/rollbar/item_spec.rb

@@ -646,11 +646,36 @@ describe Rollbar::Item do
       end
 
       it 'calls Notifier#send_failsafe and logs the error' do
-        expect(notifier).to receive(:send_failsafe)
-        expect(logger).to receive(:error)
+        original_size = Rollbar::JSON.dump(payload).bytesize
+        final_size = Rollbar::Truncation.truncate(payload.clone).bytesize
+        # final_size = original_size
+        rollbar_message = "Could not send payload due to it being too large after truncating attempts. Original size: #{original_size} Final size: #{final_size}"
+        uuid = payload['data']['uuid']
+        host = payload['data']['server']['host']
+        log_message = "[Rollbar] Payload too large to be sent for UUID #{uuid}: #{Rollbar::JSON.dump(payload)}"
+
+        expect(notifier).to receive(:send_failsafe).with(rollbar_message, nil, uuid, host)
+        expect(logger).to receive(:error).with(log_message)
 
         item.dump
       end
+
+      context 'with missing server data' do
+        it 'calls Notifier#send_failsafe and logs the error' do
+          payload['data'].delete('server')
+          original_size = Rollbar::JSON.dump(payload).bytesize
+          final_size = Rollbar::Truncation.truncate(payload.clone).bytesize
+          # final_size = original_size
+          rollbar_message = "Could not send payload due to it being too large after truncating attempts. Original size: #{original_size} Final size: #{final_size}"
+          uuid = payload['data']['uuid']
+          log_message = "[Rollbar] Payload too large to be sent for UUID #{uuid}: #{Rollbar::JSON.dump(payload)}"
+
+          expect(notifier).to receive(:send_failsafe).with(rollbar_message, nil, uuid, nil)
+          expect(logger).to receive(:error).with(log_message)
+
+          item.dump
+        end
+      end
     end
   end
 end

data/spec/rollbar/middleware/js_spec.rb

@@ -107,6 +107,10 @@ END
         before do
           Object.const_set('SecureHeaders', Module.new)
           SecureHeaders.const_set('VERSION', '3.0.0')
+          SecureHeaders.const_set('Configuration', Module.new {
+            def self.get
+            end
+          })
           allow(SecureHeaders).to receive(:content_security_policy_script_nonce) { 'lorem-ipsum-nonce' }
         end
 
@@ -115,13 +119,32 @@ END
         end
 
         it 'renders the snippet and config in the response with nonce in script tag when SecureHeaders installed' do
+          secure_headers_config = double(:configuration, :current_csp => {})
+          allow(SecureHeaders::Configuration).to receive(:get).and_return(secure_headers_config)
           res_status, res_headers, response = subject.call(env)
+
           new_body = response.body.join
 
           expect(new_body).to include('<script type="text/javascript" nonce="lorem-ipsum-nonce">')
           expect(new_body).to include("var _rollbarConfig = #{config[:options].to_json};")
           expect(new_body).to include(snippet)
         end
+
+        it 'renders the snippet in the response without nonce if SecureHeaders script_src includes \'unsafe-inline\'' do
+          secure_headers_config = double(:configuration, :current_csp => {
+                                           :script_src => %w('unsafe-inline')
+                                         })
+          allow(SecureHeaders::Configuration).to receive(:get).and_return(secure_headers_config)
+
+          res_status, res_headers, response = subject.call(env)
+          new_body = response.body.join
+
+          expect(new_body).to include('<script type="text/javascript">')
+          expect(new_body).to include("var _rollbarConfig = #{config[:options].to_json};")
+          expect(new_body).to include(snippet)
+
+          SecureHeaders.send(:remove_const, 'Configuration')
+        end
       end
 
       context 'having a html 200 response and SecureHeaders < 3.0.0 defined' do

data/spec/rollbar/middleware/sinatra_spec.rb

@@ -115,7 +115,7 @@ describe Rollbar::Middleware::Sinatra, :reconfigure_notifier => true do
           get '/foo', params
         end.to raise_error(exception)
 
-        expect(Rollbar.last_report[:request][:params]).to be_eql(params)
+        expect(Rollbar.last_report[:request][:GET]).to be_eql(params)
       end
     end
 
@@ -132,7 +132,7 @@ describe Rollbar::Middleware::Sinatra, :reconfigure_notifier => true do
           post '/crash_post', params
         end.to raise_error(exception)
 
-        expect(Rollbar.last_report[:request][:params]).to be_eql(params)
+        expect(Rollbar.last_report[:request][:POST]).to be_eql(params)
       end
     end
 
@@ -149,7 +149,7 @@ describe Rollbar::Middleware::Sinatra, :reconfigure_notifier => true 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)
+        expect(Rollbar.last_report[:request][:body]).to be_eql(params.to_json)
       end
 
       it 'appears in the sent payload when the accepts header contains json' do
@@ -157,16 +157,16 @@ describe Rollbar::Middleware::Sinatra, :reconfigure_notifier => true 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)
+        expect(Rollbar.last_report[:request][:POST]).to be_eql(params)
       end
     end
 
-    it 'resets the notifier in every request' do
+    it 'resets the notifier scope in every request' do
       get '/bar'
-      id1 = Rollbar.notifier.object_id
+      id1 = Rollbar.scope_object.object_id
 
       get '/bar'
-      id2 = Rollbar.notifier.object_id
+      id2 = Rollbar.scope_object.object_id
 
       expect(id1).not_to be_eql(id2)
     end