mirror of
https://github.com/Microsoft/vscode
synced 2024-08-28 13:29:44 +00:00
Update @vscode/proxy-agent and enable new cert loading
This commit is contained in:
parent
9892b66efe
commit
5ae15d5398
|
@ -70,7 +70,7 @@
|
||||||
"@parcel/watcher": "2.1.0",
|
"@parcel/watcher": "2.1.0",
|
||||||
"@vscode/iconv-lite-umd": "0.7.0",
|
"@vscode/iconv-lite-umd": "0.7.0",
|
||||||
"@vscode/policy-watcher": "^1.1.4",
|
"@vscode/policy-watcher": "^1.1.4",
|
||||||
"@vscode/proxy-agent": "^0.17.2",
|
"@vscode/proxy-agent": "^0.17.3",
|
||||||
"@vscode/ripgrep": "^1.15.5",
|
"@vscode/ripgrep": "^1.15.5",
|
||||||
"@vscode/spdlog": "^0.13.11",
|
"@vscode/spdlog": "^0.13.11",
|
||||||
"@vscode/sqlite3": "5.1.6-vscode",
|
"@vscode/sqlite3": "5.1.6-vscode",
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"@microsoft/1ds-post-js": "^3.2.13",
|
"@microsoft/1ds-post-js": "^3.2.13",
|
||||||
"@parcel/watcher": "2.1.0",
|
"@parcel/watcher": "2.1.0",
|
||||||
"@vscode/iconv-lite-umd": "0.7.0",
|
"@vscode/iconv-lite-umd": "0.7.0",
|
||||||
"@vscode/proxy-agent": "^0.17.2",
|
"@vscode/proxy-agent": "^0.17.3",
|
||||||
"@vscode/ripgrep": "^1.15.5",
|
"@vscode/ripgrep": "^1.15.5",
|
||||||
"@vscode/spdlog": "^0.13.11",
|
"@vscode/spdlog": "^0.13.11",
|
||||||
"@vscode/vscode-languagedetection": "1.0.21",
|
"@vscode/vscode-languagedetection": "1.0.21",
|
||||||
|
|
|
@ -58,10 +58,10 @@
|
||||||
resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
|
resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
|
||||||
integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
|
integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
|
||||||
|
|
||||||
"@vscode/proxy-agent@^0.17.2":
|
"@vscode/proxy-agent@^0.17.3":
|
||||||
version "0.17.2"
|
version "0.17.3"
|
||||||
resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.17.2.tgz#0e0dac24478e2d71a4fd1b2bb5f84dc61add79e2"
|
resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.17.3.tgz#ae46cb64d58a1a2ba063321eb4e3339eaba703b8"
|
||||||
integrity sha512-aKRo1YfUCsgEjHvr2HXfM6dwHhieyO6G+WHly7jewyyTJ1nANWEocS3JRnRbC4KjlajKhSUEOx838cdnY/vRtA==
|
integrity sha512-l+00ALcWQyDsW3kd22uOeAn84KHFkixnk/STiBFRxltbTiaiJsHCCpjlmX+x/RK+B97FcRLlg+MRRb7jtWAnng==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@tootallnate/once" "^3.0.0"
|
"@tootallnate/once" "^3.0.0"
|
||||||
agent-base "^7.0.1"
|
agent-base "^7.0.1"
|
||||||
|
|
|
@ -14,11 +14,11 @@ import { MainThreadTelemetryShape } from 'vs/workbench/api/common/extHost.protoc
|
||||||
import { IExtensionHostInitData } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
|
import { IExtensionHostInitData } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
|
||||||
import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
|
import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { ILogService } from 'vs/platform/log/common/log';
|
import { ILogService, LogLevel as LogServiceLevel } from 'vs/platform/log/common/log';
|
||||||
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
|
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
|
||||||
import { LogLevel, createHttpPatch, createProxyResolver, createTlsPatch, ProxySupportSetting, ProxyAgentParams, createNetPatch } from '@vscode/proxy-agent';
|
import { LogLevel, createHttpPatch, createProxyResolver, createTlsPatch, ProxySupportSetting, ProxyAgentParams, createNetPatch } from '@vscode/proxy-agent';
|
||||||
|
|
||||||
const systemCertificatesV2Default = false;
|
const systemCertificatesV2Default = true;
|
||||||
|
|
||||||
export function connectProxyResolver(
|
export function connectProxyResolver(
|
||||||
extHostWorkspace: IExtHostWorkspaceProvider,
|
extHostWorkspace: IExtHostWorkspaceProvider,
|
||||||
|
@ -53,8 +53,22 @@ export function connectProxyResolver(
|
||||||
extHostLogService.error(message, ...args);
|
extHostLogService.error(message, ...args);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
getLogLevel: () => extHostLogService.getLevel(),
|
getLogLevel: () => {
|
||||||
// TODO @chrmarti Remove this from proxy agent
|
const level = extHostLogService.getLevel();
|
||||||
|
switch (level) {
|
||||||
|
case LogServiceLevel.Trace: return LogLevel.Trace;
|
||||||
|
case LogServiceLevel.Debug: return LogLevel.Debug;
|
||||||
|
case LogServiceLevel.Info: return LogLevel.Info;
|
||||||
|
case LogServiceLevel.Warning: return LogLevel.Warning;
|
||||||
|
case LogServiceLevel.Error: return LogLevel.Error;
|
||||||
|
case LogServiceLevel.Off: return LogLevel.Off;
|
||||||
|
default: return never(level);
|
||||||
|
}
|
||||||
|
function never(level: never) {
|
||||||
|
extHostLogService.error('Unknown log level', level);
|
||||||
|
return LogLevel.Debug;
|
||||||
|
}
|
||||||
|
},
|
||||||
proxyResolveTelemetry: () => { },
|
proxyResolveTelemetry: () => { },
|
||||||
useHostProxy: doUseHostProxy,
|
useHostProxy: doUseHostProxy,
|
||||||
addCertificates: [],
|
addCertificates: [],
|
||||||
|
|
|
@ -1304,10 +1304,10 @@
|
||||||
bindings "^1.5.0"
|
bindings "^1.5.0"
|
||||||
node-addon-api "^6.0.0"
|
node-addon-api "^6.0.0"
|
||||||
|
|
||||||
"@vscode/proxy-agent@^0.17.2":
|
"@vscode/proxy-agent@^0.17.3":
|
||||||
version "0.17.2"
|
version "0.17.3"
|
||||||
resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.17.2.tgz#0e0dac24478e2d71a4fd1b2bb5f84dc61add79e2"
|
resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.17.3.tgz#ae46cb64d58a1a2ba063321eb4e3339eaba703b8"
|
||||||
integrity sha512-aKRo1YfUCsgEjHvr2HXfM6dwHhieyO6G+WHly7jewyyTJ1nANWEocS3JRnRbC4KjlajKhSUEOx838cdnY/vRtA==
|
integrity sha512-l+00ALcWQyDsW3kd22uOeAn84KHFkixnk/STiBFRxltbTiaiJsHCCpjlmX+x/RK+B97FcRLlg+MRRb7jtWAnng==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@tootallnate/once" "^3.0.0"
|
"@tootallnate/once" "^3.0.0"
|
||||||
agent-base "^7.0.1"
|
agent-base "^7.0.1"
|
||||||
|
|
Loading…
Reference in a new issue