actions
/
toolkit
mirror of https://github.com/actions/toolkit
1
0
Fork 0
Code

Support '*' wildcard (#1355)

pull/1005/merge
Ferenc Hammerl 2023-03-06 11:02:29 +01:00 committed by GitHub
parent 1f4b3fac06
commit d47e0bac60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/http-client/__tests__/proxy.test.ts
View File

@ -176,11 +176,16 @@ describe('proxy', () => {
expect(bypass).toBeTruthy() expect(bypass).toBeTruthy()
}) })
// Do not match wildcard ("*") as per https://github.com/actions/runner/blob/97195bad5870e2ad0915ebfef1616083aacf5818/docs/adrs/0263-proxy-support.md
it('checkBypass returns true if no_proxy is "*"', () => { it('checkBypass returns true if no_proxy is "*"', () => {
process.env['no_proxy'] = '*' process.env['no_proxy'] = '*'
const bypass = pm.checkBypass(new URL('https://anything.whatsoever.com')) const bypass = pm.checkBypass(new URL('https://anything.whatsoever.com'))
expect(bypass).toBeFalsy() expect(bypass).toBeTruthy()
})
it('checkBypass returns true if no_proxy contains comma separated "*"', () => {
process.env['no_proxy'] = 'domain.com,* , example.com'
const bypass = pm.checkBypass(new URL('https://anything.whatsoever.com'))
expect(bypass).toBeTruthy()
}) })
it('HttpClient does basic http get request through proxy', async () => { it('HttpClient does basic http get request through proxy', async () => {

1
packages/http-client/src/proxy.ts
View File

@ -52,6 +52,7 @@ export function checkBypass(reqUrl: URL): boolean {
.map(x => x.trim().toUpperCase()) .map(x => x.trim().toUpperCase())
.filter(x => x)) { .filter(x => x)) {
if ( if (
upperNoProxyItem === '*' ||
upperReqHosts.some( upperReqHosts.some(
x => x =>
x === upperNoProxyItem || x === upperNoProxyItem ||