From f71253fee3c03493b0d84195f0e25a0f228e8be9 Mon Sep 17 00:00:00 2001 From: Nikolai Laevskii Date: Mon, 22 May 2023 11:02:56 +0200 Subject: [PATCH] Change to @action/http-client version to the one that was used in the most recent build --- dist/cache-save/index.js | 17 +---------------- dist/setup/index.js | 17 +---------------- package-lock.json | 14 +++++++------- package.json | 2 +- 4 files changed, 10 insertions(+), 40 deletions(-) diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js index e729033..b3e751d 100644 --- a/dist/cache-save/index.js +++ b/dist/cache-save/index.js @@ -7195,10 +7195,6 @@ function checkBypass(reqUrl) { if (!reqUrl.hostname) { 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; @@ -7224,24 +7220,13 @@ function checkBypass(reqUrl) { .split(',') .map(x => x.trim().toUpperCase()) .filter(x => x)) { - if (upperNoProxyItem === '*' || - upperReqHosts.some(x => x === upperNoProxyItem || - x.endsWith(`.${upperNoProxyItem}`) || - (upperNoProxyItem.startsWith('.') && - x.endsWith(`${upperNoProxyItem}`)))) { + if (upperReqHosts.some(x => x === upperNoProxyItem)) { return true; } } return false; } exports.checkBypass = checkBypass; -function isLoopbackAddress(host) { - const hostLower = host.toLowerCase(); - return (hostLower === 'localhost' || - hostLower.startsWith('127.') || - hostLower.startsWith('[::1]') || - hostLower.startsWith('[0:0:0:0:0:0:0:1]')); -} //# sourceMappingURL=proxy.js.map /***/ }), diff --git a/dist/setup/index.js b/dist/setup/index.js index 04c3a00..70c6fe2 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -8382,10 +8382,6 @@ function checkBypass(reqUrl) { if (!reqUrl.hostname) { 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; @@ -8411,24 +8407,13 @@ function checkBypass(reqUrl) { .split(',') .map(x => x.trim().toUpperCase()) .filter(x => x)) { - if (upperNoProxyItem === '*' || - upperReqHosts.some(x => x === upperNoProxyItem || - x.endsWith(`.${upperNoProxyItem}`) || - (upperNoProxyItem.startsWith('.') && - x.endsWith(`${upperNoProxyItem}`)))) { + if (upperReqHosts.some(x => x === upperNoProxyItem)) { return true; } } return false; } exports.checkBypass = checkBypass; -function isLoopbackAddress(host) { - const hostLower = host.toLowerCase(); - return (hostLower === 'localhost' || - hostLower.startsWith('127.') || - hostLower.startsWith('[::1]') || - hostLower.startsWith('[0:0:0:0:0:0:0:1]')); -} //# sourceMappingURL=proxy.js.map /***/ }), diff --git a/package-lock.json b/package-lock.json index bb88a2c..40945f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "semver": "^7.1.3" }, "devDependencies": { - "@actions/http-client": "^2.1.0", + "@actions/http-client": "^2.0.1", "@types/jest": "^27.0.2", "@types/node": "^16.11.25", "@types/semver": "^7.1.0", @@ -106,9 +106,9 @@ } }, "node_modules/@actions/http-client": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz", - "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz", + "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==", "dependencies": { "tunnel": "^0.0.6" } @@ -6952,9 +6952,9 @@ } }, "@actions/http-client": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz", - "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz", + "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==", "requires": { "tunnel": "^0.0.6" } diff --git a/package.json b/package.json index f82aaf4..8fe8b75 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "semver": "^7.1.3" }, "devDependencies": { - "@actions/http-client": "^2.1.0", + "@actions/http-client": "^2.0.1", "@types/jest": "^27.0.2", "@types/node": "^16.11.25", "@types/semver": "^7.1.0",