Don't send along an '<unavailable>' body for GET/HEAD requests

getsentry · Nov 5, 2015 · 0476a6e · 0476a6e
1 parent 08bb6c5
commit 0476a6e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/lib/parsers.js b/lib/parsers.js
@@ -124,9 +124,17 @@ module.exports.parseRequest = function parseRequest(req, kwargs) {
     //   express: req.body
     //   koa: req.body
     //
-    var data = req.body || '<unavailable>';
-    // Make sure the request body is a string
-    if ( {}.toString.call(data) !== '[object String]' ) data = JSON.stringify(data);
+    var data = req.body;
+    if (['GET', 'HEAD'].indexOf(method) === -1) {
+        if (typeof data === 'undefined') {
+            data = '<unavailable>';
+        }
+    }
+
+    if (data && {}.toString.call(data) !== '[object String]') {
+        // Make sure the request body is a string
+        data = JSON.stringify(data);
+    }
 
     // client ip:
     //

diff --git a/test/raven.parsers.js b/test/raven.parsers.js
@@ -356,22 +356,33 @@ describe('raven.parsers', function(){
 
       it('should fallback to <unavailable> if body is not available', function(){
         var mockReq = {
-          method: 'GET',
+          method: 'POST',
           hostname: 'mattrobenolt.com',
           url: '/some/path?key=value',
-          body: ''
         };
 
         var parsed = raven.parsers.parseRequest(mockReq);
 
         parsed['request'].data.should.equal('<unavailable>');
       });
 
-      it('should make sure that body is a string', function(){
+      it('should not fallback to <unavailable> if GET', function(){
         var mockReq = {
           method: 'GET',
           hostname: 'mattrobenolt.com',
           url: '/some/path?key=value',
+        };
+
+        var parsed = raven.parsers.parseRequest(mockReq);
+
+        (typeof parsed['request'].data === 'undefined').should.be.ok;
+      });
+
+      it('should make sure that body is a string', function(){
+        var mockReq = {
+          method: 'POST',
+          hostname: 'mattrobenolt.com',
+          url: '/some/path?key=value',
           body: {'foo': true}
         };