Proxy handler config bug. Closes #1517

hapijs · Mar 24, 2014 · 8145ee9 · 8145ee9
1 parent 5f30d64
commit 8145ee9
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 1 deletion.
diff --git a/lib/proxy.js b/lib/proxy.js
@@ -14,7 +14,7 @@ var internals = {};
 
 exports.handler = function (route, options) {
 
-    Utils.assert(!route.payload || ((route.payload.output === 'data' || route.payload.output === 'stream') && !route.payload.parse), 'Cannot proxy if payload is parsed or if output is not stream or data');
+    Utils.assert(!route.settings.payload || ((route.settings.payload.output === 'data' || route.settings.payload.output === 'stream') && !route.settings.payload.parse), 'Cannot proxy if payload is parsed or if output is not stream or data');
     var settings = Utils.applyToDefaults(Defaults.proxy, options);
     settings.mapUri = options.mapUri || internals.mapUri(options.protocol, options.host, options.port, options.uri);
 

diff --git a/test/auth.js b/test/auth.js
@@ -303,6 +303,29 @@ describe('Auth', function () {
         });
     });
 
+    it('errors on missing scope using arrays', function (done) {
+
+        var server = new Hapi.Server();
+        server.auth.scheme('custom', internals.implementation);
+        server.auth.strategy('default', 'custom', true, { users: { steve: { scope: ['a', 'b'] } } });
+        server.route({
+            method: 'GET',
+            path: '/',
+            config: {
+                handler: function (request, reply) { reply(request.auth.credentials.user); },
+                auth: {
+                    scope: ['c', 'd']
+                }
+            }
+        });
+
+        server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res) {
+
+            expect(res.statusCode).to.equal(403);
+            done();
+        });
+    });
+
     it('matches tos', function (done) {
 
         var server = new Hapi.Server();

diff --git a/test/proxy.js b/test/proxy.js
@@ -56,6 +56,27 @@ describe('Proxy', function () {
         });
     });
 
+    it('throws when used with explicit route payload config other than data or steam', function (done) {
+
+        var server = new Hapi.Server();
+        expect(function () {
+
+            server.route({
+                method: 'POST',
+                path: '/',
+                config: {
+                    handler: {
+                        proxy: { host: 'example.com' }
+                    },
+                    payload: {
+                        output: 'file'
+                    }
+                }
+            });
+        }).to.throw('Cannot proxy if payload is parsed or if output is not stream or data');
+        done();
+    });
+
     it('overrides maxSockets', function (done) {
 
         var server = new Hapi.Server({ maxSockets: 1 });