mirror of https://github.com/actions/toolkit
parent
8d92c9c903
commit
1f4b3fac06
|
@ -223,29 +223,19 @@ describe('proxy', () => {
|
|||
expect(_proxyConnects).toEqual(['httpbin.org:443'])
|
||||
})
|
||||
|
||||
it('HttpClient bypasses proxy for loopback addresses (localhost, ::1, 127.*)', async () => {
|
||||
// setup a server listening on localhost:8091
|
||||
var server = http.createServer(function (request, response) {
|
||||
response.writeHead(200);
|
||||
request.pipe(response);
|
||||
});
|
||||
await server.listen(8091)
|
||||
try {
|
||||
process.env['http_proxy'] = _proxyUrl
|
||||
it('HttpClient does basic https get request when bypass proxy', async () => {
|
||||
process.env['https_proxy'] = _proxyUrl
|
||||
process.env['no_proxy'] = 'httpbin.org'
|
||||
const httpClient = new httpm.HttpClient()
|
||||
const res: httpm.HttpClientResponse = await httpClient.get(
|
||||
'http://localhost:8091'
|
||||
'https://httpbin.org/get'
|
||||
)
|
||||
expect(res.message.statusCode).toBe(200)
|
||||
const body: string = await res.readBody()
|
||||
expect(body).toEqual('');
|
||||
// proxy at _proxyUrl was ignored
|
||||
expect(_proxyConnects).toEqual(undefined)
|
||||
}
|
||||
finally {
|
||||
await server.close()
|
||||
}
|
||||
})
|
||||
const obj = JSON.parse(body)
|
||||
expect(obj.url).toBe('https://httpbin.org/get')
|
||||
expect(_proxyConnects).toHaveLength(0)
|
||||
})
|
||||
|
||||
it('proxyAuth not set in tunnel agent when authentication is not provided', async () => {
|
||||
process.env['https_proxy'] = 'http://127.0.0.1:8080'
|
||||
|
|
|
@ -25,11 +25,6 @@ export function checkBypass(reqUrl: URL): boolean {
|
|||
return false
|
||||
}
|
||||
|
||||
const reqHost = reqUrl.hostname
|
||||
if (isLoopbackAddress(reqHost)) {
|
||||
return true
|
||||
}
|
||||
|
||||
const noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || ''
|
||||
if (!noProxy) {
|
||||
return false
|
||||
|
@ -71,8 +66,3 @@ export function checkBypass(reqUrl: URL): boolean {
|
|||
|
||||
return false
|
||||
}
|
||||
|
||||
function isLoopbackAddress(host: string): boolean {
|
||||
const hostUpper = host.toUpperCase()
|
||||
return hostUpper === 'LOCALHOST' || hostUpper.startsWith('127.') || hostUpper.startsWith('::1')
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue