Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 09:08:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

bring proxy stuff together

Browse Source 
add http.proxyStrictSSL option

fixes #155
This commit is contained in:
Joao Moreno
2015-12-01 18:20:57 +01:00
parent 9b6bff1573
commit eaa5bcfe19
6 changed files with 102 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/vs/base/node/request.ts
View File

@@ -11,8 +11,6 @@ import http = require('http');
import { Url, parse as parseUrl } from 'url';
import { createWriteStream } from 'fs';
import { assign } from 'vs/base/common/objects';
import HttpProxyAgent = require('http-proxy-agent');
import HttpsProxyAgent = require('https-proxy-agent');
export interface IRequestOptions {
type?: string;
@@ -100,36 +98,4 @@ export function json<T>(opts: IRequestOptions): TPromise<T> {
pair.res.on('end', () => c(JSON.parse(buffer.join(''))));
pair.res.on('error', e);
}));
}
function getSystemProxyURI(requestURL: Url): string {
if (requestURL.protocol === 'http:') {
return process.env.HTTP_PROXY || process.env.http_proxy || null;
} else if (requestURL.protocol === 'https:') {
return process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy || null;
}
return null;
}
export function getProxyAgent(rawRequestURL: string, proxyURL: string): any {
let requestURL = parseUrl(rawRequestURL);
let proxyEndpoint = parseUrl(proxyURL);
if (!/^https?:$/.test(proxyEndpoint.protocol)) {
return null;
}
return requestURL.protocol === 'http:' ? new HttpProxyAgent(proxyURL) : new HttpsProxyAgent(proxyURL);
}
export function getSystemProxyAgent(rawRequestURL: string): any {
let requestURL = parseUrl(rawRequestURL);
let proxyURL = getSystemProxyURI(requestURL);
if (!proxyURL) {
return null;
}
return getProxyAgent(rawRequestURL, proxyURL);
}