Correct proxy error codes.

Author: RubenVerborgh

lib/handlers/proxy.js

@@ -36,22 +36,15 @@ function extractProxyConfig (req, res, next) {
   // Retrieve and validate the destination URL
   const uri = req.query.uri
   debug.settings(`Proxy request for ${uri}`)
-  if (!uri) {
-    return res.status(400)
-      .send('Proxy has no uri param ')
-  }
   if (!validUrl.isUri(uri)) {
-    return res.status(406)
-      .send('The uri passed is not valid')
+    return res.status(400).send(`Invalid URL passed: ${uri || '(none)'}`)
   }
 
   // Ensure the host is not a local IP
   // TODO: guard against hostnames such as 'localhost' as well
   const { protocol, host, hostname, path } = url.parse(uri)
   if (isIp(hostname) && LOCAL_IP_RANGES.some(r => ipRange(hostname, r))) {
-    return res
-      .status(406)
-      .send('Cannot proxy this IP')
+    return res.status(400).send(`Cannot proxy ${uri}`)
   }
 
   // Add the proxy configuration to the request

test/integration/proxy.js

@@ -20,20 +20,34 @@ describe('proxy', () => {
       .expect(200, done)
   })
 
-  it('should return error on local network requests', (done) => {
+  it('should return 400 when the uri parameter is missing', (done) => {
+    nock('https://192.168.0.0').get('/').reply(200)
+    server.get('/proxy')
+      .expect('Invalid URL passed: (none)')
+      .expect(400)
+      .end(done)
+  })
+
+  it('should return 400 on local network requests', (done) => {
     nock('https://192.168.0.0').get('/').reply(200)
     server.get('/proxy?uri=https://192.168.0.0/')
-      .expect(406, done)
+      .expect('Cannot proxy https://192.168.0.0/')
+      .expect(400)
+      .end(done)
   })
 
-  it('should return error on invalid uri', (done) => {
+  it('should return 400 on invalid uri', (done) => {
     server.get('/proxy?uri=HELLOWORLD')
-      .expect(406, done)
+      .expect('Invalid URL passed: HELLOWORLD')
+      .expect(400)
+      .end(done)
   })
 
-  it('should return error on relative paths', (done) => {
+  it('should return 400 on relative paths', (done) => {
     server.get('/proxy?uri=../')
-      .expect(406, done)
+      .expect('Invalid URL passed: ../')
+      .expect(400)
+      .end(done)
   })
 
   it('should return the same headers of proxied request', (done) => {