Merge pull request #208 from krakenjs/trust-proxy-fn-fix

Adding fix and regression test for `trust proxy fn` clobbering

Author: Poornima Venkat

lib/settings.js

@@ -30,6 +30,7 @@ module.exports = function settings(app, options) {
         app.settings = app.locals.settings = config.get('express');
         app.set('env', config.get('env:env'));
         app.set('view', config.get('express:view') ? require(config.get('express:view')) : View);
+        app.set('trust proxy', config.get('express:trust proxy'));
         app.kraken = config;
 
         // If options.mountpath was set, override config settings.

test/fixtures/settings/routes.js

@@ -2,5 +2,14 @@
 
 
 module.exports = function (router) {
-    // noop
-};
+
+    router.get('/ip', function (req, res) {
+      var ip, err;
+
+      try {
+        ip = req.ip;
+      } catch (e) {}
+
+      res.send( ip ? 201 : 500);
+    });
+};

test/settings.js

@@ -5,6 +5,7 @@ var test = require('tape');
 var path = require('path');
 var util = require('util');
 var express = require('express');
+var request = require('supertest');
 var kraken = require('../');
 
 
@@ -39,4 +40,38 @@ test('settings', function (t) {
         app.use(kraken(options));
     });
 
-});
+
+
+    t.test('should not clobber `trust proxy fn`', function (t) {
+        // bug introduced by:
+        // visionmedia/express@566720
+        // expressjs/proxy-addr@7a7a7e
+        var options, app;
+
+        function start() {
+            var server;
+
+            function done(err) {
+                t.error(err);
+                t.end();
+            }
+
+            server = request(app).get('/ip').expect(201, done);
+        }
+
+        options = {
+            basedir: path.join(__dirname, 'fixtures', 'settings'),
+            onconfig: function (settings, cb) {
+                settings.set('express:trust proxy', false);
+                cb(null, settings);
+            }
+        };
+
+        app = express();
+        app.use(kraken(options));
+        app.on('start', start);
+        app.on('error', t.error.bind(t));
+
+    });
+
+});