fix: use content-type to detect json

rollbar · Jun 14, 2019 · 3eaa223 · 3eaa223
1 parent fd46a16
commit 3eaa223
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/lib/rollbar/request_data_extractor.rb b/lib/rollbar/request_data_extractor.rb
@@ -210,8 +210,7 @@ def rollbar_raw_body_params(rack_req)
     def json_request?(rack_req)
       json_regex = /\bjson\b/
 
-      !!(rack_req.env['CONTENT_TYPE'] =~ json_regex ||
-         rack_req.env['HTTP_ACCEPT'] =~ json_regex)
+      !!(rack_req.env['CONTENT_TYPE'] =~ json_regex)
     end
 
     def rollbar_route_params(env)

diff --git a/spec/rollbar/request_data_extractor_spec.rb b/spec/rollbar/request_data_extractor_spec.rb
@@ -228,6 +228,22 @@ class ExtractorDummy
       end
     end
 
+    context 'with form POST body (non-json)' do
+      let(:body) { 'foo=1&bar=2' }
+      let(:env) do
+        Rack::MockRequest.env_for('/?foo=bar',
+                                  'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+                                  'HTTP_ACCEPT' => 'application/json',
+                                  :input => body,
+                                  :method => 'POST')
+      end
+
+      it 'skips extracting the body' do
+        result = subject.extract_request_data_from_rack(env)
+        expect(result[:body]).to be_eql('{}')
+      end
+    end
+
     context 'with JSON POST body' do
       let(:params) { { 'key' => 'value' } }
       let(:body) { params.to_json }
@@ -254,6 +270,8 @@ class ExtractorDummy
         result = subject.extract_request_data_from_rack(env)
         expect(result[:body]).to be_eql(body)
       end
+
+
     end
 
     context 'with JSON DELETE body' do