mirror of
				https://github.com/actions/cache.git
				synced 2025-11-04 13:29:10 +08:00 
			
		
		
		
	Detect uncommitted changes to the dist/ folder (#302)
* Update workflow.yml * Update workflow.yml * Run build * Update workflow.yml * Update workflow.yml * Update workflow.yml
This commit is contained in:
		
							
								
								
									
										101
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										101
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							@@ -2440,7 +2440,9 @@ class BasicCredentialHandler {
 | 
			
		||||
        this.password = password;
 | 
			
		||||
    }
 | 
			
		||||
    prepareRequest(options) {
 | 
			
		||||
        options.headers['Authorization'] = 'Basic ' + Buffer.from(this.username + ':' + this.password).toString('base64');
 | 
			
		||||
        options.headers['Authorization'] =
 | 
			
		||||
            'Basic ' +
 | 
			
		||||
                Buffer.from(this.username + ':' + this.password).toString('base64');
 | 
			
		||||
    }
 | 
			
		||||
    // This handler cannot handle 401
 | 
			
		||||
    canHandleAuthentication(response) {
 | 
			
		||||
@@ -2476,7 +2478,8 @@ class PersonalAccessTokenCredentialHandler {
 | 
			
		||||
    // currently implements pre-authorization
 | 
			
		||||
    // TODO: support preAuth = false where it hooks on 401
 | 
			
		||||
    prepareRequest(options) {
 | 
			
		||||
        options.headers['Authorization'] = 'Basic ' + Buffer.from('PAT:' + this.token).toString('base64');
 | 
			
		||||
        options.headers['Authorization'] =
 | 
			
		||||
            'Basic ' + Buffer.from('PAT:' + this.token).toString('base64');
 | 
			
		||||
    }
 | 
			
		||||
    // This handler cannot handle 401
 | 
			
		||||
    canHandleAuthentication(response) {
 | 
			
		||||
@@ -3603,6 +3606,7 @@ var HttpCodes;
 | 
			
		||||
    HttpCodes[HttpCodes["RequestTimeout"] = 408] = "RequestTimeout";
 | 
			
		||||
    HttpCodes[HttpCodes["Conflict"] = 409] = "Conflict";
 | 
			
		||||
    HttpCodes[HttpCodes["Gone"] = 410] = "Gone";
 | 
			
		||||
    HttpCodes[HttpCodes["TooManyRequests"] = 429] = "TooManyRequests";
 | 
			
		||||
    HttpCodes[HttpCodes["InternalServerError"] = 500] = "InternalServerError";
 | 
			
		||||
    HttpCodes[HttpCodes["NotImplemented"] = 501] = "NotImplemented";
 | 
			
		||||
    HttpCodes[HttpCodes["BadGateway"] = 502] = "BadGateway";
 | 
			
		||||
@@ -3627,8 +3631,18 @@ function getProxyUrl(serverUrl) {
 | 
			
		||||
    return proxyUrl ? proxyUrl.href : '';
 | 
			
		||||
}
 | 
			
		||||
exports.getProxyUrl = getProxyUrl;
 | 
			
		||||
const HttpRedirectCodes = [HttpCodes.MovedPermanently, HttpCodes.ResourceMoved, HttpCodes.SeeOther, HttpCodes.TemporaryRedirect, HttpCodes.PermanentRedirect];
 | 
			
		||||
const HttpResponseRetryCodes = [HttpCodes.BadGateway, HttpCodes.ServiceUnavailable, HttpCodes.GatewayTimeout];
 | 
			
		||||
const HttpRedirectCodes = [
 | 
			
		||||
    HttpCodes.MovedPermanently,
 | 
			
		||||
    HttpCodes.ResourceMoved,
 | 
			
		||||
    HttpCodes.SeeOther,
 | 
			
		||||
    HttpCodes.TemporaryRedirect,
 | 
			
		||||
    HttpCodes.PermanentRedirect
 | 
			
		||||
];
 | 
			
		||||
const HttpResponseRetryCodes = [
 | 
			
		||||
    HttpCodes.BadGateway,
 | 
			
		||||
    HttpCodes.ServiceUnavailable,
 | 
			
		||||
    HttpCodes.GatewayTimeout
 | 
			
		||||
];
 | 
			
		||||
const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD'];
 | 
			
		||||
const ExponentialBackoffCeiling = 10;
 | 
			
		||||
const ExponentialBackoffTimeSlice = 5;
 | 
			
		||||
@@ -3753,18 +3767,22 @@ class HttpClient {
 | 
			
		||||
     */
 | 
			
		||||
    async request(verb, requestUrl, data, headers) {
 | 
			
		||||
        if (this._disposed) {
 | 
			
		||||
            throw new Error("Client has already been disposed.");
 | 
			
		||||
            throw new Error('Client has already been disposed.');
 | 
			
		||||
        }
 | 
			
		||||
        let parsedUrl = url.parse(requestUrl);
 | 
			
		||||
        let info = this._prepareRequest(verb, parsedUrl, headers);
 | 
			
		||||
        // Only perform retries on reads since writes may not be idempotent.
 | 
			
		||||
        let maxTries = (this._allowRetries && RetryableHttpVerbs.indexOf(verb) != -1) ? this._maxRetries + 1 : 1;
 | 
			
		||||
        let maxTries = this._allowRetries && RetryableHttpVerbs.indexOf(verb) != -1
 | 
			
		||||
            ? this._maxRetries + 1
 | 
			
		||||
            : 1;
 | 
			
		||||
        let numTries = 0;
 | 
			
		||||
        let response;
 | 
			
		||||
        while (numTries < maxTries) {
 | 
			
		||||
            response = await this.requestRaw(info, data);
 | 
			
		||||
            // Check if it's an authentication challenge
 | 
			
		||||
            if (response && response.message && response.message.statusCode === HttpCodes.Unauthorized) {
 | 
			
		||||
            if (response &&
 | 
			
		||||
                response.message &&
 | 
			
		||||
                response.message.statusCode === HttpCodes.Unauthorized) {
 | 
			
		||||
                let authenticationHandler;
 | 
			
		||||
                for (let i = 0; i < this.handlers.length; i++) {
 | 
			
		||||
                    if (this.handlers[i].canHandleAuthentication(response)) {
 | 
			
		||||
@@ -3782,21 +3800,32 @@ class HttpClient {
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            let redirectsRemaining = this._maxRedirects;
 | 
			
		||||
            while (HttpRedirectCodes.indexOf(response.message.statusCode) != -1
 | 
			
		||||
                && this._allowRedirects
 | 
			
		||||
                && redirectsRemaining > 0) {
 | 
			
		||||
                const redirectUrl = response.message.headers["location"];
 | 
			
		||||
            while (HttpRedirectCodes.indexOf(response.message.statusCode) != -1 &&
 | 
			
		||||
                this._allowRedirects &&
 | 
			
		||||
                redirectsRemaining > 0) {
 | 
			
		||||
                const redirectUrl = response.message.headers['location'];
 | 
			
		||||
                if (!redirectUrl) {
 | 
			
		||||
                    // if there's no location to redirect to, we won't
 | 
			
		||||
                    break;
 | 
			
		||||
                }
 | 
			
		||||
                let parsedRedirectUrl = url.parse(redirectUrl);
 | 
			
		||||
                if (parsedUrl.protocol == 'https:' && parsedUrl.protocol != parsedRedirectUrl.protocol && !this._allowRedirectDowngrade) {
 | 
			
		||||
                    throw new Error("Redirect from HTTPS to HTTP protocol. This downgrade is not allowed for security reasons. If you want to allow this behavior, set the allowRedirectDowngrade option to true.");
 | 
			
		||||
                if (parsedUrl.protocol == 'https:' &&
 | 
			
		||||
                    parsedUrl.protocol != parsedRedirectUrl.protocol &&
 | 
			
		||||
                    !this._allowRedirectDowngrade) {
 | 
			
		||||
                    throw new Error('Redirect from HTTPS to HTTP protocol. This downgrade is not allowed for security reasons. If you want to allow this behavior, set the allowRedirectDowngrade option to true.');
 | 
			
		||||
                }
 | 
			
		||||
                // we need to finish reading the response before reassigning response
 | 
			
		||||
                // which will leak the open socket.
 | 
			
		||||
                await response.readBody();
 | 
			
		||||
                // strip authorization header if redirected to a different hostname
 | 
			
		||||
                if (parsedRedirectUrl.hostname !== parsedUrl.hostname) {
 | 
			
		||||
                    for (let header in headers) {
 | 
			
		||||
                        // header names are case insensitive
 | 
			
		||||
                        if (header.toLowerCase() === 'authorization') {
 | 
			
		||||
                            delete headers[header];
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                // let's make the request with the new redirectUrl
 | 
			
		||||
                info = this._prepareRequest(verb, parsedRedirectUrl, headers);
 | 
			
		||||
                response = await this.requestRaw(info, data);
 | 
			
		||||
@@ -3847,8 +3876,8 @@ class HttpClient {
 | 
			
		||||
     */
 | 
			
		||||
    requestRawWithCallback(info, data, onResult) {
 | 
			
		||||
        let socket;
 | 
			
		||||
        if (typeof (data) === 'string') {
 | 
			
		||||
            info.options.headers["Content-Length"] = Buffer.byteLength(data, 'utf8');
 | 
			
		||||
        if (typeof data === 'string') {
 | 
			
		||||
            info.options.headers['Content-Length'] = Buffer.byteLength(data, 'utf8');
 | 
			
		||||
        }
 | 
			
		||||
        let callbackCalled = false;
 | 
			
		||||
        let handleResult = (err, res) => {
 | 
			
		||||
@@ -3861,7 +3890,7 @@ class HttpClient {
 | 
			
		||||
            let res = new HttpClientResponse(msg);
 | 
			
		||||
            handleResult(null, res);
 | 
			
		||||
        });
 | 
			
		||||
        req.on('socket', (sock) => {
 | 
			
		||||
        req.on('socket', sock => {
 | 
			
		||||
            socket = sock;
 | 
			
		||||
        });
 | 
			
		||||
        // If we ever get disconnected, we want the socket to timeout eventually
 | 
			
		||||
@@ -3876,10 +3905,10 @@ class HttpClient {
 | 
			
		||||
            // res should have headers
 | 
			
		||||
            handleResult(err, null);
 | 
			
		||||
        });
 | 
			
		||||
        if (data && typeof (data) === 'string') {
 | 
			
		||||
        if (data && typeof data === 'string') {
 | 
			
		||||
            req.write(data, 'utf8');
 | 
			
		||||
        }
 | 
			
		||||
        if (data && typeof (data) !== 'string') {
 | 
			
		||||
        if (data && typeof data !== 'string') {
 | 
			
		||||
            data.on('close', function () {
 | 
			
		||||
                req.end();
 | 
			
		||||
            });
 | 
			
		||||
@@ -3906,31 +3935,34 @@ class HttpClient {
 | 
			
		||||
        const defaultPort = usingSsl ? 443 : 80;
 | 
			
		||||
        info.options = {};
 | 
			
		||||
        info.options.host = info.parsedUrl.hostname;
 | 
			
		||||
        info.options.port = info.parsedUrl.port ? parseInt(info.parsedUrl.port) : defaultPort;
 | 
			
		||||
        info.options.path = (info.parsedUrl.pathname || '') + (info.parsedUrl.search || '');
 | 
			
		||||
        info.options.port = info.parsedUrl.port
 | 
			
		||||
            ? parseInt(info.parsedUrl.port)
 | 
			
		||||
            : defaultPort;
 | 
			
		||||
        info.options.path =
 | 
			
		||||
            (info.parsedUrl.pathname || '') + (info.parsedUrl.search || '');
 | 
			
		||||
        info.options.method = method;
 | 
			
		||||
        info.options.headers = this._mergeHeaders(headers);
 | 
			
		||||
        if (this.userAgent != null) {
 | 
			
		||||
            info.options.headers["user-agent"] = this.userAgent;
 | 
			
		||||
            info.options.headers['user-agent'] = this.userAgent;
 | 
			
		||||
        }
 | 
			
		||||
        info.options.agent = this._getAgent(info.parsedUrl);
 | 
			
		||||
        // gives handlers an opportunity to participate
 | 
			
		||||
        if (this.handlers) {
 | 
			
		||||
            this.handlers.forEach((handler) => {
 | 
			
		||||
            this.handlers.forEach(handler => {
 | 
			
		||||
                handler.prepareRequest(info.options);
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
        return info;
 | 
			
		||||
    }
 | 
			
		||||
    _mergeHeaders(headers) {
 | 
			
		||||
        const lowercaseKeys = obj => Object.keys(obj).reduce((c, k) => (c[k.toLowerCase()] = obj[k], c), {});
 | 
			
		||||
        const lowercaseKeys = obj => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCase()] = obj[k]), c), {});
 | 
			
		||||
        if (this.requestOptions && this.requestOptions.headers) {
 | 
			
		||||
            return Object.assign({}, lowercaseKeys(this.requestOptions.headers), lowercaseKeys(headers));
 | 
			
		||||
        }
 | 
			
		||||
        return lowercaseKeys(headers || {});
 | 
			
		||||
    }
 | 
			
		||||
    _getExistingOrDefaultHeader(additionalHeaders, header, _default) {
 | 
			
		||||
        const lowercaseKeys = obj => Object.keys(obj).reduce((c, k) => (c[k.toLowerCase()] = obj[k], c), {});
 | 
			
		||||
        const lowercaseKeys = obj => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCase()] = obj[k]), c), {});
 | 
			
		||||
        let clientHeader;
 | 
			
		||||
        if (this.requestOptions && this.requestOptions.headers) {
 | 
			
		||||
            clientHeader = lowercaseKeys(this.requestOptions.headers)[header];
 | 
			
		||||
@@ -3968,7 +4000,7 @@ class HttpClient {
 | 
			
		||||
                    proxyAuth: proxyUrl.auth,
 | 
			
		||||
                    host: proxyUrl.hostname,
 | 
			
		||||
                    port: proxyUrl.port
 | 
			
		||||
                },
 | 
			
		||||
                }
 | 
			
		||||
            };
 | 
			
		||||
            let tunnelAgent;
 | 
			
		||||
            const overHttps = proxyUrl.protocol === 'https:';
 | 
			
		||||
@@ -3995,7 +4027,9 @@ class HttpClient {
 | 
			
		||||
            // we don't want to set NODE_TLS_REJECT_UNAUTHORIZED=0 since that will affect request for entire process
 | 
			
		||||
            // http.RequestOptions doesn't expose a way to modify RequestOptions.agent.options
 | 
			
		||||
            // we have to cast it to any and change it directly
 | 
			
		||||
            agent.options = Object.assign(agent.options || {}, { rejectUnauthorized: false });
 | 
			
		||||
            agent.options = Object.assign(agent.options || {}, {
 | 
			
		||||
                rejectUnauthorized: false
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
        return agent;
 | 
			
		||||
    }
 | 
			
		||||
@@ -4056,7 +4090,7 @@ class HttpClient {
 | 
			
		||||
                    msg = contents;
 | 
			
		||||
                }
 | 
			
		||||
                else {
 | 
			
		||||
                    msg = "Failed request: (" + statusCode + ")";
 | 
			
		||||
                    msg = 'Failed request: (' + statusCode + ')';
 | 
			
		||||
                }
 | 
			
		||||
                let err = new Error(msg);
 | 
			
		||||
                // attach statusCode and body obj (if available) to the error object
 | 
			
		||||
@@ -5145,12 +5179,10 @@ function getProxyUrl(reqUrl) {
 | 
			
		||||
    }
 | 
			
		||||
    let proxyVar;
 | 
			
		||||
    if (usingSsl) {
 | 
			
		||||
        proxyVar = process.env["https_proxy"] ||
 | 
			
		||||
            process.env["HTTPS_PROXY"];
 | 
			
		||||
        proxyVar = process.env['https_proxy'] || process.env['HTTPS_PROXY'];
 | 
			
		||||
    }
 | 
			
		||||
    else {
 | 
			
		||||
        proxyVar = process.env["http_proxy"] ||
 | 
			
		||||
            process.env["HTTP_PROXY"];
 | 
			
		||||
        proxyVar = process.env['http_proxy'] || process.env['HTTP_PROXY'];
 | 
			
		||||
    }
 | 
			
		||||
    if (proxyVar) {
 | 
			
		||||
        proxyUrl = url.parse(proxyVar);
 | 
			
		||||
@@ -5162,7 +5194,7 @@ function checkBypass(reqUrl) {
 | 
			
		||||
    if (!reqUrl.hostname) {
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
    let noProxy = process.env["no_proxy"] || process.env["NO_PROXY"] || '';
 | 
			
		||||
    let noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || '';
 | 
			
		||||
    if (!noProxy) {
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
@@ -5183,7 +5215,10 @@ function checkBypass(reqUrl) {
 | 
			
		||||
        upperReqHosts.push(`${upperReqHosts[0]}:${reqPort}`);
 | 
			
		||||
    }
 | 
			
		||||
    // Compare request host against noproxy
 | 
			
		||||
    for (let upperNoProxyItem of noProxy.split(',').map(x => x.trim().toUpperCase()).filter(x => x)) {
 | 
			
		||||
    for (let upperNoProxyItem of noProxy
 | 
			
		||||
        .split(',')
 | 
			
		||||
        .map(x => x.trim().toUpperCase())
 | 
			
		||||
        .filter(x => x)) {
 | 
			
		||||
        if (upperReqHosts.some(x => x === upperNoProxyItem)) {
 | 
			
		||||
            return true;
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										101
									
								
								dist/save/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										101
									
								
								dist/save/index.js
									
									
									
									
										vendored
									
									
								
							@@ -2440,7 +2440,9 @@ class BasicCredentialHandler {
 | 
			
		||||
        this.password = password;
 | 
			
		||||
    }
 | 
			
		||||
    prepareRequest(options) {
 | 
			
		||||
        options.headers['Authorization'] = 'Basic ' + Buffer.from(this.username + ':' + this.password).toString('base64');
 | 
			
		||||
        options.headers['Authorization'] =
 | 
			
		||||
            'Basic ' +
 | 
			
		||||
                Buffer.from(this.username + ':' + this.password).toString('base64');
 | 
			
		||||
    }
 | 
			
		||||
    // This handler cannot handle 401
 | 
			
		||||
    canHandleAuthentication(response) {
 | 
			
		||||
@@ -2476,7 +2478,8 @@ class PersonalAccessTokenCredentialHandler {
 | 
			
		||||
    // currently implements pre-authorization
 | 
			
		||||
    // TODO: support preAuth = false where it hooks on 401
 | 
			
		||||
    prepareRequest(options) {
 | 
			
		||||
        options.headers['Authorization'] = 'Basic ' + Buffer.from('PAT:' + this.token).toString('base64');
 | 
			
		||||
        options.headers['Authorization'] =
 | 
			
		||||
            'Basic ' + Buffer.from('PAT:' + this.token).toString('base64');
 | 
			
		||||
    }
 | 
			
		||||
    // This handler cannot handle 401
 | 
			
		||||
    canHandleAuthentication(response) {
 | 
			
		||||
@@ -3603,6 +3606,7 @@ var HttpCodes;
 | 
			
		||||
    HttpCodes[HttpCodes["RequestTimeout"] = 408] = "RequestTimeout";
 | 
			
		||||
    HttpCodes[HttpCodes["Conflict"] = 409] = "Conflict";
 | 
			
		||||
    HttpCodes[HttpCodes["Gone"] = 410] = "Gone";
 | 
			
		||||
    HttpCodes[HttpCodes["TooManyRequests"] = 429] = "TooManyRequests";
 | 
			
		||||
    HttpCodes[HttpCodes["InternalServerError"] = 500] = "InternalServerError";
 | 
			
		||||
    HttpCodes[HttpCodes["NotImplemented"] = 501] = "NotImplemented";
 | 
			
		||||
    HttpCodes[HttpCodes["BadGateway"] = 502] = "BadGateway";
 | 
			
		||||
@@ -3627,8 +3631,18 @@ function getProxyUrl(serverUrl) {
 | 
			
		||||
    return proxyUrl ? proxyUrl.href : '';
 | 
			
		||||
}
 | 
			
		||||
exports.getProxyUrl = getProxyUrl;
 | 
			
		||||
const HttpRedirectCodes = [HttpCodes.MovedPermanently, HttpCodes.ResourceMoved, HttpCodes.SeeOther, HttpCodes.TemporaryRedirect, HttpCodes.PermanentRedirect];
 | 
			
		||||
const HttpResponseRetryCodes = [HttpCodes.BadGateway, HttpCodes.ServiceUnavailable, HttpCodes.GatewayTimeout];
 | 
			
		||||
const HttpRedirectCodes = [
 | 
			
		||||
    HttpCodes.MovedPermanently,
 | 
			
		||||
    HttpCodes.ResourceMoved,
 | 
			
		||||
    HttpCodes.SeeOther,
 | 
			
		||||
    HttpCodes.TemporaryRedirect,
 | 
			
		||||
    HttpCodes.PermanentRedirect
 | 
			
		||||
];
 | 
			
		||||
const HttpResponseRetryCodes = [
 | 
			
		||||
    HttpCodes.BadGateway,
 | 
			
		||||
    HttpCodes.ServiceUnavailable,
 | 
			
		||||
    HttpCodes.GatewayTimeout
 | 
			
		||||
];
 | 
			
		||||
const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD'];
 | 
			
		||||
const ExponentialBackoffCeiling = 10;
 | 
			
		||||
const ExponentialBackoffTimeSlice = 5;
 | 
			
		||||
@@ -3753,18 +3767,22 @@ class HttpClient {
 | 
			
		||||
     */
 | 
			
		||||
    async request(verb, requestUrl, data, headers) {
 | 
			
		||||
        if (this._disposed) {
 | 
			
		||||
            throw new Error("Client has already been disposed.");
 | 
			
		||||
            throw new Error('Client has already been disposed.');
 | 
			
		||||
        }
 | 
			
		||||
        let parsedUrl = url.parse(requestUrl);
 | 
			
		||||
        let info = this._prepareRequest(verb, parsedUrl, headers);
 | 
			
		||||
        // Only perform retries on reads since writes may not be idempotent.
 | 
			
		||||
        let maxTries = (this._allowRetries && RetryableHttpVerbs.indexOf(verb) != -1) ? this._maxRetries + 1 : 1;
 | 
			
		||||
        let maxTries = this._allowRetries && RetryableHttpVerbs.indexOf(verb) != -1
 | 
			
		||||
            ? this._maxRetries + 1
 | 
			
		||||
            : 1;
 | 
			
		||||
        let numTries = 0;
 | 
			
		||||
        let response;
 | 
			
		||||
        while (numTries < maxTries) {
 | 
			
		||||
            response = await this.requestRaw(info, data);
 | 
			
		||||
            // Check if it's an authentication challenge
 | 
			
		||||
            if (response && response.message && response.message.statusCode === HttpCodes.Unauthorized) {
 | 
			
		||||
            if (response &&
 | 
			
		||||
                response.message &&
 | 
			
		||||
                response.message.statusCode === HttpCodes.Unauthorized) {
 | 
			
		||||
                let authenticationHandler;
 | 
			
		||||
                for (let i = 0; i < this.handlers.length; i++) {
 | 
			
		||||
                    if (this.handlers[i].canHandleAuthentication(response)) {
 | 
			
		||||
@@ -3782,21 +3800,32 @@ class HttpClient {
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            let redirectsRemaining = this._maxRedirects;
 | 
			
		||||
            while (HttpRedirectCodes.indexOf(response.message.statusCode) != -1
 | 
			
		||||
                && this._allowRedirects
 | 
			
		||||
                && redirectsRemaining > 0) {
 | 
			
		||||
                const redirectUrl = response.message.headers["location"];
 | 
			
		||||
            while (HttpRedirectCodes.indexOf(response.message.statusCode) != -1 &&
 | 
			
		||||
                this._allowRedirects &&
 | 
			
		||||
                redirectsRemaining > 0) {
 | 
			
		||||
                const redirectUrl = response.message.headers['location'];
 | 
			
		||||
                if (!redirectUrl) {
 | 
			
		||||
                    // if there's no location to redirect to, we won't
 | 
			
		||||
                    break;
 | 
			
		||||
                }
 | 
			
		||||
                let parsedRedirectUrl = url.parse(redirectUrl);
 | 
			
		||||
                if (parsedUrl.protocol == 'https:' && parsedUrl.protocol != parsedRedirectUrl.protocol && !this._allowRedirectDowngrade) {
 | 
			
		||||
                    throw new Error("Redirect from HTTPS to HTTP protocol. This downgrade is not allowed for security reasons. If you want to allow this behavior, set the allowRedirectDowngrade option to true.");
 | 
			
		||||
                if (parsedUrl.protocol == 'https:' &&
 | 
			
		||||
                    parsedUrl.protocol != parsedRedirectUrl.protocol &&
 | 
			
		||||
                    !this._allowRedirectDowngrade) {
 | 
			
		||||
                    throw new Error('Redirect from HTTPS to HTTP protocol. This downgrade is not allowed for security reasons. If you want to allow this behavior, set the allowRedirectDowngrade option to true.');
 | 
			
		||||
                }
 | 
			
		||||
                // we need to finish reading the response before reassigning response
 | 
			
		||||
                // which will leak the open socket.
 | 
			
		||||
                await response.readBody();
 | 
			
		||||
                // strip authorization header if redirected to a different hostname
 | 
			
		||||
                if (parsedRedirectUrl.hostname !== parsedUrl.hostname) {
 | 
			
		||||
                    for (let header in headers) {
 | 
			
		||||
                        // header names are case insensitive
 | 
			
		||||
                        if (header.toLowerCase() === 'authorization') {
 | 
			
		||||
                            delete headers[header];
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                // let's make the request with the new redirectUrl
 | 
			
		||||
                info = this._prepareRequest(verb, parsedRedirectUrl, headers);
 | 
			
		||||
                response = await this.requestRaw(info, data);
 | 
			
		||||
@@ -3847,8 +3876,8 @@ class HttpClient {
 | 
			
		||||
     */
 | 
			
		||||
    requestRawWithCallback(info, data, onResult) {
 | 
			
		||||
        let socket;
 | 
			
		||||
        if (typeof (data) === 'string') {
 | 
			
		||||
            info.options.headers["Content-Length"] = Buffer.byteLength(data, 'utf8');
 | 
			
		||||
        if (typeof data === 'string') {
 | 
			
		||||
            info.options.headers['Content-Length'] = Buffer.byteLength(data, 'utf8');
 | 
			
		||||
        }
 | 
			
		||||
        let callbackCalled = false;
 | 
			
		||||
        let handleResult = (err, res) => {
 | 
			
		||||
@@ -3861,7 +3890,7 @@ class HttpClient {
 | 
			
		||||
            let res = new HttpClientResponse(msg);
 | 
			
		||||
            handleResult(null, res);
 | 
			
		||||
        });
 | 
			
		||||
        req.on('socket', (sock) => {
 | 
			
		||||
        req.on('socket', sock => {
 | 
			
		||||
            socket = sock;
 | 
			
		||||
        });
 | 
			
		||||
        // If we ever get disconnected, we want the socket to timeout eventually
 | 
			
		||||
@@ -3876,10 +3905,10 @@ class HttpClient {
 | 
			
		||||
            // res should have headers
 | 
			
		||||
            handleResult(err, null);
 | 
			
		||||
        });
 | 
			
		||||
        if (data && typeof (data) === 'string') {
 | 
			
		||||
        if (data && typeof data === 'string') {
 | 
			
		||||
            req.write(data, 'utf8');
 | 
			
		||||
        }
 | 
			
		||||
        if (data && typeof (data) !== 'string') {
 | 
			
		||||
        if (data && typeof data !== 'string') {
 | 
			
		||||
            data.on('close', function () {
 | 
			
		||||
                req.end();
 | 
			
		||||
            });
 | 
			
		||||
@@ -3906,31 +3935,34 @@ class HttpClient {
 | 
			
		||||
        const defaultPort = usingSsl ? 443 : 80;
 | 
			
		||||
        info.options = {};
 | 
			
		||||
        info.options.host = info.parsedUrl.hostname;
 | 
			
		||||
        info.options.port = info.parsedUrl.port ? parseInt(info.parsedUrl.port) : defaultPort;
 | 
			
		||||
        info.options.path = (info.parsedUrl.pathname || '') + (info.parsedUrl.search || '');
 | 
			
		||||
        info.options.port = info.parsedUrl.port
 | 
			
		||||
            ? parseInt(info.parsedUrl.port)
 | 
			
		||||
            : defaultPort;
 | 
			
		||||
        info.options.path =
 | 
			
		||||
            (info.parsedUrl.pathname || '') + (info.parsedUrl.search || '');
 | 
			
		||||
        info.options.method = method;
 | 
			
		||||
        info.options.headers = this._mergeHeaders(headers);
 | 
			
		||||
        if (this.userAgent != null) {
 | 
			
		||||
            info.options.headers["user-agent"] = this.userAgent;
 | 
			
		||||
            info.options.headers['user-agent'] = this.userAgent;
 | 
			
		||||
        }
 | 
			
		||||
        info.options.agent = this._getAgent(info.parsedUrl);
 | 
			
		||||
        // gives handlers an opportunity to participate
 | 
			
		||||
        if (this.handlers) {
 | 
			
		||||
            this.handlers.forEach((handler) => {
 | 
			
		||||
            this.handlers.forEach(handler => {
 | 
			
		||||
                handler.prepareRequest(info.options);
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
        return info;
 | 
			
		||||
    }
 | 
			
		||||
    _mergeHeaders(headers) {
 | 
			
		||||
        const lowercaseKeys = obj => Object.keys(obj).reduce((c, k) => (c[k.toLowerCase()] = obj[k], c), {});
 | 
			
		||||
        const lowercaseKeys = obj => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCase()] = obj[k]), c), {});
 | 
			
		||||
        if (this.requestOptions && this.requestOptions.headers) {
 | 
			
		||||
            return Object.assign({}, lowercaseKeys(this.requestOptions.headers), lowercaseKeys(headers));
 | 
			
		||||
        }
 | 
			
		||||
        return lowercaseKeys(headers || {});
 | 
			
		||||
    }
 | 
			
		||||
    _getExistingOrDefaultHeader(additionalHeaders, header, _default) {
 | 
			
		||||
        const lowercaseKeys = obj => Object.keys(obj).reduce((c, k) => (c[k.toLowerCase()] = obj[k], c), {});
 | 
			
		||||
        const lowercaseKeys = obj => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCase()] = obj[k]), c), {});
 | 
			
		||||
        let clientHeader;
 | 
			
		||||
        if (this.requestOptions && this.requestOptions.headers) {
 | 
			
		||||
            clientHeader = lowercaseKeys(this.requestOptions.headers)[header];
 | 
			
		||||
@@ -3968,7 +4000,7 @@ class HttpClient {
 | 
			
		||||
                    proxyAuth: proxyUrl.auth,
 | 
			
		||||
                    host: proxyUrl.hostname,
 | 
			
		||||
                    port: proxyUrl.port
 | 
			
		||||
                },
 | 
			
		||||
                }
 | 
			
		||||
            };
 | 
			
		||||
            let tunnelAgent;
 | 
			
		||||
            const overHttps = proxyUrl.protocol === 'https:';
 | 
			
		||||
@@ -3995,7 +4027,9 @@ class HttpClient {
 | 
			
		||||
            // we don't want to set NODE_TLS_REJECT_UNAUTHORIZED=0 since that will affect request for entire process
 | 
			
		||||
            // http.RequestOptions doesn't expose a way to modify RequestOptions.agent.options
 | 
			
		||||
            // we have to cast it to any and change it directly
 | 
			
		||||
            agent.options = Object.assign(agent.options || {}, { rejectUnauthorized: false });
 | 
			
		||||
            agent.options = Object.assign(agent.options || {}, {
 | 
			
		||||
                rejectUnauthorized: false
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
        return agent;
 | 
			
		||||
    }
 | 
			
		||||
@@ -4056,7 +4090,7 @@ class HttpClient {
 | 
			
		||||
                    msg = contents;
 | 
			
		||||
                }
 | 
			
		||||
                else {
 | 
			
		||||
                    msg = "Failed request: (" + statusCode + ")";
 | 
			
		||||
                    msg = 'Failed request: (' + statusCode + ')';
 | 
			
		||||
                }
 | 
			
		||||
                let err = new Error(msg);
 | 
			
		||||
                // attach statusCode and body obj (if available) to the error object
 | 
			
		||||
@@ -5122,12 +5156,10 @@ function getProxyUrl(reqUrl) {
 | 
			
		||||
    }
 | 
			
		||||
    let proxyVar;
 | 
			
		||||
    if (usingSsl) {
 | 
			
		||||
        proxyVar = process.env["https_proxy"] ||
 | 
			
		||||
            process.env["HTTPS_PROXY"];
 | 
			
		||||
        proxyVar = process.env['https_proxy'] || process.env['HTTPS_PROXY'];
 | 
			
		||||
    }
 | 
			
		||||
    else {
 | 
			
		||||
        proxyVar = process.env["http_proxy"] ||
 | 
			
		||||
            process.env["HTTP_PROXY"];
 | 
			
		||||
        proxyVar = process.env['http_proxy'] || process.env['HTTP_PROXY'];
 | 
			
		||||
    }
 | 
			
		||||
    if (proxyVar) {
 | 
			
		||||
        proxyUrl = url.parse(proxyVar);
 | 
			
		||||
@@ -5139,7 +5171,7 @@ function checkBypass(reqUrl) {
 | 
			
		||||
    if (!reqUrl.hostname) {
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
    let noProxy = process.env["no_proxy"] || process.env["NO_PROXY"] || '';
 | 
			
		||||
    let noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || '';
 | 
			
		||||
    if (!noProxy) {
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
@@ -5160,7 +5192,10 @@ function checkBypass(reqUrl) {
 | 
			
		||||
        upperReqHosts.push(`${upperReqHosts[0]}:${reqPort}`);
 | 
			
		||||
    }
 | 
			
		||||
    // Compare request host against noproxy
 | 
			
		||||
    for (let upperNoProxyItem of noProxy.split(',').map(x => x.trim().toUpperCase()).filter(x => x)) {
 | 
			
		||||
    for (let upperNoProxyItem of noProxy
 | 
			
		||||
        .split(',')
 | 
			
		||||
        .map(x => x.trim().toUpperCase())
 | 
			
		||||
        .filter(x => x)) {
 | 
			
		||||
        if (upperReqHosts.some(x => x === upperNoProxyItem)) {
 | 
			
		||||
            return true;
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user