Use ACCEPT header to check json requests

lib/rollbar/request_data_extractor.rb

@@ -137,7 +137,7 @@ 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
+      return {} unless json_request?(rack_req)
 
       Rollbar::JSON.load(rack_req.body.read)
     rescue
@@ -146,6 +146,11 @@ def rollbar_raw_body_params(rack_req)
       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

spec/controllers/home_controller_spec.rb

@@ -388,6 +388,18 @@
     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?
 

spec/dummyapp/config/routes.rb

@@ -4,7 +4,7 @@
     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]

spec/rollbar/middleware/sinatra_spec.rb

@@ -144,13 +144,21 @@ def app
         }
       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