From 566a4ca5c83cc0126045abd073f69968109b40db Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Thu, 16 Jan 2025 17:25:26 +0100 Subject: [PATCH] useHostProxy > isUseHostProxyEnabled() (microsoft/vscode-copilot-release#3821) --- package-lock.json | 8 ++++---- package.json | 2 +- remote/package-lock.json | 8 ++++---- remote/package.json | 2 +- src/vs/workbench/api/node/proxyResolver.ts | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index caa4903a0c9..99a6c490a60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/policy-watcher": "^1.1.8", - "@vscode/proxy-agent": "^0.29.0", + "@vscode/proxy-agent": "^0.30.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", "@vscode/sqlite3": "5.1.8-vscode", @@ -2849,9 +2849,9 @@ } }, "node_modules/@vscode/proxy-agent": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.29.0.tgz", - "integrity": "sha512-zwpDvm5rwtJjXZv4TC8IXFRDDOU+fUNRe3asmls92Tz0dM0AJ8/WVfNgki5YOKxQMjVzWHAt0w53ZJxXj567EQ==", + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.30.0.tgz", + "integrity": "sha512-3MicZnHWbJna0WIHFDgrCFMgT8cWrzXe9VXKrJQTay8jWC+7Xi3+FTYgK9kC7RWAf7GVcwkjJh5UGTIbEDW7Fg==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", diff --git a/package.json b/package.json index 9e5044bb8b5..2a792905f9b 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/policy-watcher": "^1.1.8", - "@vscode/proxy-agent": "^0.29.0", + "@vscode/proxy-agent": "^0.30.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", "@vscode/sqlite3": "5.1.8-vscode", diff --git a/remote/package-lock.json b/remote/package-lock.json index 675fdc5b7b2..975417a80b2 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -13,7 +13,7 @@ "@parcel/watcher": "2.5.0", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.29.0", + "@vscode/proxy-agent": "^0.30.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", "@vscode/tree-sitter-wasm": "^0.0.5", @@ -419,9 +419,9 @@ "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==" }, "node_modules/@vscode/proxy-agent": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.29.0.tgz", - "integrity": "sha512-zwpDvm5rwtJjXZv4TC8IXFRDDOU+fUNRe3asmls92Tz0dM0AJ8/WVfNgki5YOKxQMjVzWHAt0w53ZJxXj567EQ==", + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.30.0.tgz", + "integrity": "sha512-3MicZnHWbJna0WIHFDgrCFMgT8cWrzXe9VXKrJQTay8jWC+7Xi3+FTYgK9kC7RWAf7GVcwkjJh5UGTIbEDW7Fg==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", diff --git a/remote/package.json b/remote/package.json index 00c008e51e5..cffdccb4ff3 100644 --- a/remote/package.json +++ b/remote/package.json @@ -8,7 +8,7 @@ "@parcel/watcher": "2.5.0", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.29.0", + "@vscode/proxy-agent": "^0.30.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", "@vscode/tree-sitter-wasm": "^0.0.5", diff --git a/src/vs/workbench/api/node/proxyResolver.ts b/src/vs/workbench/api/node/proxyResolver.ts index 9c85d7b980e..533144660e4 100644 --- a/src/vs/workbench/api/node/proxyResolver.ts +++ b/src/vs/workbench/api/node/proxyResolver.ts @@ -43,7 +43,7 @@ export function connectProxyResolver( const useHostProxyDefault = initData.environment.useHostProxy ?? !isRemote; const fallbackToLocalKerberos = useHostProxyDefault; const loadLocalCertificates = useHostProxyDefault; - const isUseHostProxyEnabled = () => configProvider.getConfiguration('http').get('useLocalProxyConfiguration', useHostProxyDefault); + const isUseHostProxyEnabled = () => !isRemote || configProvider.getConfiguration('http').get('useLocalProxyConfiguration', useHostProxyDefault); const params: ProxyAgentParams = { resolveProxy: url => extHostWorkspace.resolveProxy(url), lookupProxyAuthorization: lookupProxyAuthorization.bind(undefined, extHostWorkspace, extHostLogService, mainThreadTelemetry, configProvider, {}, {}, initData.remote.isRemote, fallbackToLocalKerberos), @@ -71,7 +71,7 @@ export function connectProxyResolver( } }, proxyResolveTelemetry: () => { }, - useHostProxy: isUseHostProxyEnabled(), // TODO: can change at runtime now + isUseHostProxyEnabled, loadAdditionalCertificates: async () => { const promises: Promise[] = []; if (initData.remote.isRemote) {