fix(proxy): use https agent for https protocol

karma-runner · May 25, 2020 · 15590a7 · 15590a7
1 parent 96c4351
commit 15590a7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/lib/middleware/proxy.js b/lib/middleware/proxy.js
@@ -1,5 +1,6 @@
 const url = require('url')
-const http = require('http')
+const { Agent: httpAgent } = require('http')
+const { Agent: httpsAgent } = require('https')
 const httpProxy = require('http-proxy')
 const _ = require('lodash')
 
@@ -43,7 +44,8 @@ function parseProxyConfig (proxies, config) {
       port = config.port
     }
     const changeOrigin = proxyConfiguration.changeOrigin || false
-    const keepAliveAgent = new http.Agent({ keepAlive: true })
+    const Agent = https ? httpsAgent : httpAgent
+    const keepAliveAgent = new Agent({ keepAlive: true })
     const proxy = httpProxy.createProxyServer({
       target: { host: hostname, port, https, protocol },
       xfwd: true,

diff --git a/test/unit/middleware/proxy.spec.js b/test/unit/middleware/proxy.spec.js
@@ -353,12 +353,23 @@ describe('middleware.proxy', () => {
     expect(m.parseProxyConfig({})).to.deep.equal([])
   })
 
-  it('should use agent with keepAlive=true', () => {
+  it('should use http agent with keepAlive=true', () => {
     const proxy = { '/base': 'http://localhost:8000/proxy' }
     const parsedProxyConfig = m.parseProxyConfig(proxy, {})
     expect(parsedProxyConfig).to.have.length(1)
     expect(parsedProxyConfig[0].proxy.options.agent).to.containSubset({
-      keepAlive: true
+      keepAlive: true,
+      protocol: 'http:'
+    })
+  })
+
+  it('should use https agent with keepAlive=true', () => {
+    const proxy = { '/base': 'https://localhost:8000/proxy' }
+    const parsedProxyConfig = m.parseProxyConfig(proxy, {})
+    expect(parsedProxyConfig).to.have.length(1)
+    expect(parsedProxyConfig[0].proxy.options.agent).to.containSubset({
+      keepAlive: true,
+      protocol: 'https:'
     })
   })
 })