Prepend http:// to http(s)_proxy env if missing (#1439)

* Prepend http:// to http(s)_proxy env if missing * Formatting * Fix linting
actions · Jun 22, 2023 · 91d3933 · 91d3933
1 parent a6bf872
commit 91d3933
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/http-client/__tests__/proxy.test.ts b/packages/http-client/__tests__/proxy.test.ts
@@ -91,6 +91,12 @@ describe('proxy', () => {
     expect(proxyUrl).toBeDefined()
   })
 
+  it('getProxyUrl returns proxyUrl if http_proxy has no protocol', () => {
+    process.env['http_proxy'] = 'myproxysvr'
+    const proxyUrl = pm.getProxyUrl(new URL('http://github.com'))
+    expect(proxyUrl?.toString()).toBe('http://myproxysvr/')
+  })
+
   it('checkBypass returns true if host as no_proxy list', () => {
     process.env['no_proxy'] = 'myserver'
     const bypass = pm.checkBypass(new URL('https://myserver'))

diff --git a/packages/http-client/src/proxy.ts b/packages/http-client/src/proxy.ts
@@ -14,7 +14,12 @@ export function getProxyUrl(reqUrl: URL): URL | undefined {
   })()
 
   if (proxyVar) {
-    return new URL(proxyVar)
+    try {
+      return new URL(proxyVar)
+    } catch {
+      if (!proxyVar.startsWith('http://') && !proxyVar.startsWith('https://'))
+        return new URL(`http://${proxyVar}`)
+    }
   } else {
     return undefined
   }