mirror of https://github.com/actions/toolkit
Prepend http:// to http(s)_proxy env if missing (#1439)
* Prepend http:// to http(s)_proxy env if missing * Formatting * Fix lintingpull/1443/merge @actions/artifact@1.1.1
parent
a6bf8726aa
commit
91d3933eb5
|
@ -91,6 +91,12 @@ describe('proxy', () => {
|
||||||
expect(proxyUrl).toBeDefined()
|
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', () => {
|
it('checkBypass returns true if host as no_proxy list', () => {
|
||||||
process.env['no_proxy'] = 'myserver'
|
process.env['no_proxy'] = 'myserver'
|
||||||
const bypass = pm.checkBypass(new URL('https://myserver'))
|
const bypass = pm.checkBypass(new URL('https://myserver'))
|
||||||
|
|
|
@ -14,7 +14,12 @@ export function getProxyUrl(reqUrl: URL): URL | undefined {
|
||||||
})()
|
})()
|
||||||
|
|
||||||
if (proxyVar) {
|
if (proxyVar) {
|
||||||
|
try {
|
||||||
return new URL(proxyVar)
|
return new URL(proxyVar)
|
||||||
|
} catch {
|
||||||
|
if (!proxyVar.startsWith('http://') && !proxyVar.startsWith('https://'))
|
||||||
|
return new URL(`http://${proxyVar}`)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
return undefined
|
return undefined
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue