Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b01e37c3b5 |
+17
-1
@@ -242,7 +242,7 @@ export async function downloadCacheStorageSDK(
|
|||||||
// If the file exceeds the buffer maximum length (~1 GB on 32-bit systems and ~2 GB
|
// If the file exceeds the buffer maximum length (~1 GB on 32-bit systems and ~2 GB
|
||||||
// on 64-bit systems), split the download into multiple segments
|
// on 64-bit systems), split the download into multiple segments
|
||||||
// ~2 GB = 2147483647, beyond this, we start getting out of range error. So, capping it accordingly.
|
// ~2 GB = 2147483647, beyond this, we start getting out of range error. So, capping it accordingly.
|
||||||
const maxSegmentSize = Math.min(2147483647, buffer.constants.MAX_LENGTH)
|
const maxSegmentSize = Math.min(102760447, buffer.constants.MAX_LENGTH)
|
||||||
const downloadProgress = new DownloadProgress(contentLength)
|
const downloadProgress = new DownloadProgress(contentLength)
|
||||||
|
|
||||||
const fd = fs.openSync(archivePath, 'w')
|
const fd = fs.openSync(archivePath, 'w')
|
||||||
@@ -275,7 +275,23 @@ export async function downloadCacheStorageSDK(
|
|||||||
'Aborting cache download as the download time exceeded the timeout.'
|
'Aborting cache download as the download time exceeded the timeout.'
|
||||||
)
|
)
|
||||||
} else if (Buffer.isBuffer(result)) {
|
} else if (Buffer.isBuffer(result)) {
|
||||||
|
core.info(
|
||||||
|
`Segment offset before writing result to the file ${downloadProgress.segmentOffset}`
|
||||||
|
)
|
||||||
|
core.info(
|
||||||
|
`Download progress object before writing result ${JSON.stringify(
|
||||||
|
downloadProgress
|
||||||
|
)}`
|
||||||
|
)
|
||||||
fs.writeFileSync(fd, result)
|
fs.writeFileSync(fd, result)
|
||||||
|
core.info(
|
||||||
|
`Segment offset after writing result to the file ${downloadProgress.segmentOffset}`
|
||||||
|
)
|
||||||
|
core.info(
|
||||||
|
`Download progress object after writing result ${JSON.stringify(
|
||||||
|
downloadProgress
|
||||||
|
)}`
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -237,31 +237,6 @@ describe('proxy', () => {
|
|||||||
expect(_proxyConnects).toHaveLength(0)
|
expect(_proxyConnects).toHaveLength(0)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('HttpClient bypasses proxy for loopback addresses (localhost, ::1, 127.*)', async () => {
|
|
||||||
// setup a server listening on localhost:8091
|
|
||||||
const server = http.createServer((request, response) => {
|
|
||||||
response.writeHead(200)
|
|
||||||
request.pipe(response)
|
|
||||||
})
|
|
||||||
server.listen(8091)
|
|
||||||
try {
|
|
||||||
process.env['http_proxy'] = _proxyUrl
|
|
||||||
const httpClient = new httpm.HttpClient()
|
|
||||||
let res = await httpClient.get('http://localhost:8091')
|
|
||||||
expect(res.message.statusCode).toBe(200)
|
|
||||||
res = await httpClient.get('http://127.0.0.1:8091')
|
|
||||||
expect(res.message.statusCode).toBe(200)
|
|
||||||
|
|
||||||
// no support for ipv6 for now
|
|
||||||
expect(httpClient.get('http://[::1]:8091')).rejects.toThrow()
|
|
||||||
|
|
||||||
// proxy at _proxyUrl was ignored
|
|
||||||
expect(_proxyConnects).toEqual([])
|
|
||||||
} finally {
|
|
||||||
server.close()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
it('proxyAuth not set in tunnel agent when authentication is not provided', async () => {
|
it('proxyAuth not set in tunnel agent when authentication is not provided', async () => {
|
||||||
process.env['https_proxy'] = 'http://127.0.0.1:8080'
|
process.env['https_proxy'] = 'http://127.0.0.1:8080'
|
||||||
const httpClient = new httpm.HttpClient()
|
const httpClient = new httpm.HttpClient()
|
||||||
|
|||||||
@@ -25,11 +25,6 @@ export function checkBypass(reqUrl: URL): boolean {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
const reqHost = reqUrl.hostname
|
|
||||||
if (isLoopbackAddress(reqHost)) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
const noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || ''
|
const noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || ''
|
||||||
if (!noProxy) {
|
if (!noProxy) {
|
||||||
return false
|
return false
|
||||||
@@ -71,13 +66,3 @@ export function checkBypass(reqUrl: URL): boolean {
|
|||||||
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
function isLoopbackAddress(host: string): boolean {
|
|
||||||
const hostLower = host.toLowerCase()
|
|
||||||
return (
|
|
||||||
hostLower === 'localhost' ||
|
|
||||||
hostLower.startsWith('127.') ||
|
|
||||||
hostLower.startsWith('[::1]') ||
|
|
||||||
hostLower.startsWith('[0:0:0:0:0:0:0:1]')
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user