Remove x-forwarded-* header support

This should be moved to the middleware layer instead, delegating
`X-Forwarded-For` to `req.ip` and `X-Forwarded-Proto` to `req.secure`.

Author: Rui Marinho

lib/parsers.js

@@ -88,9 +88,7 @@ module.exports.parseRequest = function parseRequest(req, kwargs) {
     //   express: req.protocol
     //   koa: req.protocol
     //
-    var protocol = ('https' === req.protocol || true === req.secure || true === (req.socket || {}).encrypted ||
-            ('https' === (headers['x-forwarded-proto'] || '').split(/\s*,\s*/)[0])) ||
-            ('443' === headers['x-forwarded-port'] || '') ? 'https' : 'http';
+    var protocol = ('https' === req.protocol || true === req.secure || true === (req.socket || {}).encrypted) ? 'https' : 'http';
 
     // url (including path and query string):
     //
@@ -133,7 +131,7 @@ module.exports.parseRequest = function parseRequest(req, kwargs) {
     //   express: req.ip
     //   koa: req.ip
     //
-    var ip = req.ip || (headers['x-forwarded-for'] || '').split(/\s*,\s*/)[0] || (req.connection || {}).remoteAddress;
+    var ip = req.ip || (req.connection || {}).remoteAddress;
 
     // http interface
     var http = {

test/raven.parsers.js

@@ -120,15 +120,15 @@ describe('raven.parsers', function(){
       });
     });
 
-    describe('`https` detection', function() {
-      it('should detect https via `req.secure`', function(){
+    describe('`protocol` detection', function() {
+      it('should detect protocol via `req.protocol`', function(){
         var mockReq = {
           method: 'GET',
           url: '/some/path?key=value',
           headers: {
             host: 'mattrobenolt.com',
           },
-          secure: true,
+          protocol: 'https',
           socket: {
             encrypted: false
           }
@@ -139,14 +139,14 @@ describe('raven.parsers', function(){
         parsed['sentry.interfaces.Http'].url.should.equal('https://mattrobenolt.com/some/path?key=value');
       });
 
-      it('should detect https via `req.protocol`', function(){
+      it('should detect protocol via `req.secure`', function(){
         var mockReq = {
           method: 'GET',
           url: '/some/path?key=value',
           headers: {
             host: 'mattrobenolt.com',
           },
-          protocol: 'https',
+          secure: true,
           socket: {
             encrypted: false
           }
@@ -157,7 +157,7 @@ describe('raven.parsers', function(){
         parsed['sentry.interfaces.Http'].url.should.equal('https://mattrobenolt.com/some/path?key=value');
       });
 
-      it('should detect https via `req.socket.encrypted`', function(){
+      it('should detect protocol via `req.socket.encrypted`', function(){
         var mockReq = {
           method: 'GET',
           url: '/some/path?key=value',
@@ -173,41 +173,6 @@ describe('raven.parsers', function(){
 
         parsed['sentry.interfaces.Http'].url.should.equal('https://mattrobenolt.com/some/path?key=value');
       });
-
-      it('should detect https via `x-forwarded-proto`', function(){
-        var mockReq = {
-          method: 'GET',
-          url: '/some/path?key=value',
-          headers: {
-            host: 'mattrobenolt.com',
-            'x-forwarded-proto': 'https'
-          },
-          socket: {
-            encrypted: false
-          }
-        };
-
-        var parsed = raven.parsers.parseRequest(mockReq);
-
-        parsed['sentry.interfaces.Http'].url.should.equal('https://mattrobenolt.com/some/path?key=value');
-      });
-
-      it('should detect https via `x-forwarded-port`', function(){
-        var mockReq = {
-          method: 'GET',
-          url: '/some/path?key=value',
-          headers: {
-            host: 'mattrobenolt.com',
-            'x-forwarded-port': '443'
-          },
-          socket: {
-            encrypted: false
-          }
-        };
-
-        var parsed = raven.parsers.parseRequest(mockReq);
-        parsed['sentry.interfaces.Http'].url.should.equal('https://mattrobenolt.com/some/path?key=value');
-      });
     });
 
     describe('`cookie` detection', function() {
@@ -339,36 +304,6 @@ describe('raven.parsers', function(){
         parsed['sentry.interfaces.Http'].env.REMOTE_ADDR.should.equal('69.69.69.69');
       });
 
-      it('should detect ip via single hop `x-forwarded-for`', function(){
-        var mockReq = {
-          method: 'GET',
-          url: '/some/path?key=value',
-          headers: {
-            host: 'mattrobenolt.com',
-            'x-forwarded-for': '69.69.69.69'
-          }
-        };
-
-        var parsed = raven.parsers.parseRequest(mockReq);
-
-        parsed['sentry.interfaces.Http'].env.REMOTE_ADDR.should.equal('69.69.69.69');
-      });
-
-      it('should detect ip via multiple hops `x-forwarded-for`', function(){
-        var mockReq = {
-          method: 'GET',
-          url: '/some/path?key=value',
-          headers: {
-            host: 'mattrobenolt.com',
-            'x-forwarded-for': '1.2.3.4, 5.6.7.8, 69.69.69.69'
-          }
-        };
-
-        var parsed = raven.parsers.parseRequest(mockReq);
-
-        parsed['sentry.interfaces.Http'].env.REMOTE_ADDR.should.equal('1.2.3.4');
-      });
-
       it('should detect ip via `req.connection.remoteAddress`', function(){
         var mockReq = {
           method: 'GET',