diff --git a/dist/index.js b/dist/index.js index ab67ae5..7b31bd9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1115,7 +1115,7 @@ class GitConfigHelper { repository: httpsMatch[3] }; } - const sshUrlPattern = new RegExp('^git@(.+?):(.+/.+)\\.git$', 'i'); + const sshUrlPattern = new RegExp('^.+@(.+?):(.+/.+)\\.git$', 'i'); const sshMatch = remoteUrl.match(sshUrlPattern); if (sshMatch) { return { @@ -4402,7 +4402,7 @@ class HttpClient { } const usingSsl = parsedUrl.protocol === 'https:'; proxyAgent = new undici_1.ProxyAgent(Object.assign({ uri: proxyUrl.href, pipelining: !this._keepAlive ? 0 : 1 }, ((proxyUrl.username || proxyUrl.password) && { - token: `${proxyUrl.username}:${proxyUrl.password}` + token: `Basic ${Buffer.from(`${proxyUrl.username}:${proxyUrl.password}`).toString('base64')}` }))); this._proxyAgentDispatcher = proxyAgent; if (usingSsl && this._ignoreSslError) { @@ -4516,11 +4516,11 @@ function getProxyUrl(reqUrl) { })(); if (proxyVar) { try { - return new URL(proxyVar); + return new DecodedURL(proxyVar); } catch (_a) { if (!proxyVar.startsWith('http://') && !proxyVar.startsWith('https://')) - return new URL(`http://${proxyVar}`); + return new DecodedURL(`http://${proxyVar}`); } } else { @@ -4579,6 +4579,19 @@ function isLoopbackAddress(host) { hostLower.startsWith('[::1]') || hostLower.startsWith('[0:0:0:0:0:0:0:1]')); } +class DecodedURL extends URL { + constructor(url, base) { + super(url, base); + this._decodedUsername = decodeURIComponent(super.username); + this._decodedPassword = decodeURIComponent(super.password); + } + get username() { + return this._decodedUsername; + } + get password() { + return this._decodedPassword; + } +} //# sourceMappingURL=proxy.js.map /***/ }), @@ -35689,7 +35702,8 @@ __nccwpck_require__.r(__webpack_exports__); // EXPORTS __nccwpck_require__.d(__webpack_exports__, { - "default": () => (/* binding */ pLimit) + "default": () => (/* binding */ pLimit), + limitFunction: () => (/* binding */ limitFunction) }); ;// CONCATENATED MODULE: ./node_modules/yocto-queue/index.js @@ -35865,6 +35879,13 @@ function pLimit(concurrency) { return generator; } +function limitFunction(function_, option) { + const {concurrency} = option; + const limit = pLimit(concurrency); + + return (...arguments_) => limit(() => function_(...arguments_)); +} + function validateConcurrency(concurrency) { if (!((Number.isInteger(concurrency) || concurrency === Number.POSITIVE_INFINITY) && concurrency > 0)) { throw new TypeError('Expected `concurrency` to be a number from 1 and up');