rollbar 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 848cb96180e379178a47ca132eb966b8564907f6
-  data.tar.gz: 59a914a93b7358d55000ab5ed4c56ec66bff6661
+  metadata.gz: 76e11bf57c6ee70f276c3434d3e28c529db808cb
+  data.tar.gz: 676d76874780fc5656d1648c7ae156592308d50d
 SHA512:
-  metadata.gz: 6548900e375f976d9a07bd1a9c3c466315ce71eebd076c67f008926fc697a3dbdceacca958ff3cae0dd7d6c435af43fd3be89bf29ac53ef139d134458488a2ff
-  data.tar.gz: f4cae49db511b1ee6ec231eabde6090e5a37344b4f25d23bc5adee7815d3bb8db77fcd2db3d810ecc521f36ed89bd94b5b20e2402127029327784c1a0031b39b
+  metadata.gz: 049de0ce6da8c17708748cde99eb4c183caa8614eff619400ea019be2b1531edfd34a50fdb842f67063d71cd12c05c4e5b2b9ce8db5ad93d53726cc0d8758b79
+  data.tar.gz: 85d20e995d647bef3ec5eb4996de93147c7562a33ed03874f3e60ed5157c1d297f8ab82d8597e30bae6a8733cdd7b02beb900e2b2ade04d99df52b1b7f52f829

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+**1.2.5**
+- Fix issues handling hashes, arrays, and other values as the raw POST body. See [#153](https://github.com/rollbar/rollbar-gem/pull/153)
+
 **1.2.4**
 - Fix issue where requiring 'rack' unnecessarily broke things in non-rack apps. See [#150](https://github.com/rollbar/rollbar-gem/pull/150)
 

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v1.1.0)](https://travis-ci.org/rollbar/rollbar-gem/branches)
+# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v1.2.5)](https://travis-ci.org/rollbar/rollbar-gem/branches)
 
 <!-- RemoveNext -->
 Ruby gem for reporting exceptions, errors, and log messages to [Rollbar](https://rollbar.com).
@@ -9,7 +9,7 @@ Ruby gem for reporting exceptions, errors, and log messages to [Rollbar](https:/
 
 Add this line to your application's Gemfile:
 
-    gem 'rollbar', '~> 1.1.0'
+    gem 'rollbar', '~> 1.2.5'
 
 And then execute:
 

data/lib/rollbar/request_data_extractor.rb

@@ -21,12 +21,12 @@ module Rollbar
       request_params = rollbar_filtered_params(sensitive_params, rollbar_request_params(env))
       get_params = rollbar_filtered_params(sensitive_params, rollbar_get_params(rack_req))
       post_params = rollbar_filtered_params(sensitive_params, rollbar_post_params(rack_req))
-      raw_post_params = rollbar_filtered_params(sensitive_params, rollbar_raw_post_params(rack_req))
+      raw_body_params = rollbar_filtered_params(sensitive_params, mergeable_raw_body_params(rack_req))
       cookies = rollbar_filtered_params(sensitive_params, rollbar_request_cookies(rack_req))
       session = rollbar_filtered_params(sensitive_params, env['rack.session.options'])
       route_params = rollbar_filtered_params(sensitive_params, rollbar_route_params(env))
 
-      params = request_params.merge(get_params).merge(post_params).merge(raw_post_params)
+      params = request_params.merge(get_params).merge(post_params).merge(raw_body_params)
 
       data = {
         :params => params,
@@ -48,6 +48,18 @@ module Rollbar
 
     private
 
+    def mergeable_raw_body_params(rack_req)
+      raw_body_params = rollbar_raw_body_params(rack_req)
+
+      if raw_body_params.is_a?(Hash)
+        raw_body_params
+      elsif raw_body_params.is_a?(Array)
+        { 'body.multi' => raw_body_params }
+      else
+        { 'body.value' => raw_body_params }
+      end
+    end
+
     def rollbar_request_method(env)
       env['REQUEST_METHOD'] || env[:method]
     end
@@ -100,7 +112,10 @@ module Rollbar
       {}
     end
 
-    def rollbar_raw_post_params(rack_req)
+    def rollbar_raw_body_params(rack_req)
+      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
 
       MultiJson.decode(rack_req.body.read)
@@ -115,8 +130,11 @@ module Rollbar
     end
 
     def rollbar_route_params(env)
+      return {} unless defined?(Rails)
+
       begin
         route = ::Rails.application.routes.recognize_path(env['PATH_INFO'])
+
         {
           :controller => route[:controller],
           :action => route[:action],
@@ -136,30 +154,28 @@ module Rollbar
     def rollbar_filtered_params(sensitive_params, params)
       sensitive_params_regexp = Regexp.new(sensitive_params.map{ |val| Regexp.escape(val.to_s).to_s }.join('|'), true)
 
-      if params.nil?
-        {}
-      else
-        params.to_hash.inject({}) do |result, (key, value)|
-          if sensitive_params_regexp =~ key.to_s
-            result[key] = rollbar_scrubbed(value)
-          elsif value.is_a?(Hash)
-            result[key] = rollbar_filtered_params(sensitive_params, value)
-          elsif value.is_a?(Array)
-            result[key] = value.map do |v|
-              v.is_a?(Hash) ? rollbar_filtered_params(sensitive_params, v) : v
-            end
-          elsif ATTACHMENT_CLASSES.include?(value.class.name)
-            result[key] = {
-              :content_type => value.content_type,
-              :original_filename => value.original_filename,
-              :size => value.tempfile.size
-            } rescue 'Uploaded file'
-          else
-            result[key] = value
-          end
+      return {} unless params
 
-          result
+      params.to_hash.inject({}) do |result, (key, value)|
+        if sensitive_params_regexp =~ key.to_s
+          result[key] = rollbar_scrubbed(value)
+        elsif value.is_a?(Hash)
+          result[key] = rollbar_filtered_params(sensitive_params, value)
+        elsif value.is_a?(Array)
+          result[key] = value.map do |v|
+            v.is_a?(Hash) ? rollbar_filtered_params(sensitive_params, v) : v
+          end
+        elsif ATTACHMENT_CLASSES.include?(value.class.name)
+          result[key] = {
+            :content_type => value.content_type,
+            :original_filename => value.original_filename,
+            :size => value.tempfile.size
+          } rescue 'Uploaded file'
+        else
+          result[key] = value
         end
+
+        result
       end
     end
 

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

data/spec/rollbar/middleware/rack/builder_spec.rb

@@ -56,17 +56,33 @@ describe Rollbar::Middleware::Rack::Builder do
 
       expect(Rollbar.last_report[:request][:params]).to be_eql(params)
     end
+  end
+
+  context 'with array POST parameters' do
+    let(:params) do
+      [{ :key => 'value'}, 'string', 10]
+    end
+
+    it 'sends a body.multi key in params' do
+      expect do
+        request.post('/will_crash', :input => params.to_json, 'CONTENT_TYPE' => 'application/json')
+      end.to raise_error(exception)
+
+      reported_params = Rollbar.last_report[:request][:params]
+      expect(reported_params['body.multi']).to be_eql([{'key' => 'value'}, 'string', 10])
+    end
+  end
 
-    context 'with crashing payload' do
-      let(:body) { 'this is not a valid json' }
+  context 'with not array or hash POST parameters' do
+    let(:params) { 1000 }
 
-      it 'returns {} and doesnt raise' do
-        expect do
-          request.post('/dont_crash', :input => body, 'CONTENT_TYPE' => 'application/json')
-        end.to raise_error(exception)
+    it 'sends a body.multi key in params' do
+      expect do
+        request.post('/will_crash', :input => params.to_json, 'CONTENT_TYPE' => 'application/json')
+      end.to raise_error(exception)
 
-        expect(Rollbar.last_report[:request][:params]).to be_eql({})
-      end
+      reported_params = Rollbar.last_report[:request][:params]
+      expect(reported_params['body.value']).to be_eql(1000)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json