Fix #160 Can't proxy request when target server is HTTPS

Author: typicode

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## Unreleased
+
+* Fix proxying to `https` target `hotel add https://example.com`
+* Log proxy errors
+
 ## 0.5.13
 
 * Fix `hotel add` CLI bug

src/daemon/group.js

@@ -24,7 +24,9 @@ class Group extends EventEmitter {
     super()
 
     this._list = {}
-    this._proxy = httpProxy.createProxyServer({ xfwd: true })
+    this._proxy = httpProxy.createProxyServer({
+      xfwd: true
+    })
     this._proxy.on('error', this.handleProxyError)
   }
 
@@ -281,8 +283,16 @@ class Group extends EventEmitter {
 
     // Make sure to send only one response
     const send = once(() => {
-      util.log(`Proxy http://${hostname} to ${item.target}`)
-      this._proxy.web(req, res, { target: item.target })
+      const isHTTPS = /^https:\/\//.test(item.target)
+      util.log(
+        `Proxy http://${hostname} to ${item.target}`,
+        isHTTPS ? '(changeOrigin: true)' : ''
+      )
+      this._proxy.web(req, res, {
+        target: item.target,
+        // https won't work if host doesn't match certificate, so we're changing it
+        changeOrigin: isHTTPS
+      })
     })
 
     if (item.start) {

test/daemon/app.js

@@ -33,7 +33,7 @@ test.before(() => {
   // Fake server to respond to URL
   http.createServer((req, res) => {
     res.statusCode = 200
-    res.end('ok')
+    res.end(`ok - host: ${req.headers.host}`)
   }).listen(4000)
 
   // Add server
@@ -72,6 +72,9 @@ test.before(() => {
   // Add URL
   servers.add('http://localhost:4000', { n: 'proxy' })
 
+  // Add https URL
+  servers.add('https://jsonplaceholder.typicode.com', { n: 'proxy-with-https-target' })
+
   // Add unavailable URL
   servers.add('http://localhost:4100', { n: 'unavailable-proxy' })
 
@@ -101,12 +104,16 @@ test.cb('GET http://hotel.dev/index.html should serve index.html', (t) => {
     .expect(200, t.end)
 })
 
-test.cb('GET http://node.dev should proxy request', (t) => {
-  request(app)
-    .get('/')
-    .set('Host', 'node.dev')
-    .expect(200, /Hello World/, t.end)
-})
+test.cb(
+  'GET http://node.dev should proxy request and host should be node.dev',
+  (t) => {
+    request(app)
+      .get('/')
+      .set('Host', 'node.dev')
+      .expect(/host: node.dev/)
+      .expect(200, /Hello World/, t.end)
+  }
+)
 
 test.cb('GET http://subdomain.node.dev should proxy request', (t) => {
   request(app)
@@ -136,10 +143,20 @@ test.cb('GET http://failing.dev should return 502', (t) => {
     .expect(502, t.end)
 })
 
-test.cb('GET http://proxy.dev should return 502', (t) => {
+test.cb(
+  'GET http://proxy.dev should return 200 and host should be proxy.dev',
+  (t) => {
+    request(app)
+      .get('/')
+      .set('Host', 'proxy.dev')
+      .expect(200, /host: proxy.dev/, t.end)
+  }
+)
+
+test.cb('GET http://proxy-with-https-target.dev should return 200', (t) => {
   request(app)
     .get('/')
-    .set('Host', 'proxy.dev')
+    .set('Host', 'proxy-with-https-target.dev')
     .expect(200, t.end)
 })
 
@@ -166,7 +183,7 @@ test.cb('GET /_/servers', t => {
     .get('/_/servers')
     .expect(200, (err, res) => {
       if (err) return t.end(err)
-      t.is(Object.keys(res.body).length, 8, 'got wrong number of servers')
+      t.is(Object.keys(res.body).length, 9, 'got wrong number of servers')
       t.end()
     })
 })

test/fixtures/app/index.js

@@ -7,7 +7,8 @@ http.createServer(function (req, res) {
     'Hello World',
     process.env.FOO,
     process.env.HTTP_PROXY,
-    'x-forwarded-host: ' + req.headers['x-forwarded-host']
+    'x-forwarded-host: ' + req.headers['x-forwarded-host'],
+    'host: ' + req.headers.host
   ].join(' '))
 }).listen(process.env.PORT, '127.0.0.1')