maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Override original agent again (#117054)

Browse source
This commit is contained in:
Christof Marti 2021-04-20 17:38:41 +02:00
parent bdf2ef774e
commit eb45f2bd17
6 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -78,7 +78,7 @@
"tas-client-umd": "0.1.4",
"v8-inspect-profiler": "^0.0.20",
"vscode-oniguruma": "1.3.1",
"vscode-proxy-agent": "^0.10.0",
"vscode-proxy-agent": "^0.11.0",
"vscode-regexpp": "^3.1.0",
"vscode-ripgrep": "^1.11.3",
"vscode-sqlite3": "4.0.11",

2
remote/package.json
View file

@ -18,7 +18,7 @@
"spdlog": "^0.11.1",
"tas-client-umd": "0.1.4",
"vscode-oniguruma": "1.3.1",
"vscode-proxy-agent": "^0.10.0",
"vscode-proxy-agent": "^0.11.0",
"vscode-regexpp": "^3.1.0",
"vscode-ripgrep": "^1.11.3",
"vscode-textmate": "5.2.0",

8
remote/yarn.lock
View file

@ -482,10 +482,10 @@ vscode-oniguruma@1.3.1:
resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.3.1.tgz#e2383879c3485b19f533ec34efea9d7a2b14be8f"
integrity sha512-gz6ZBofA7UXafVA+m2Yt2zHKgXC2qedArprIsHAPKByTkwq9l5y/izAGckqxYml7mSbYxTRTfdRwsFq3cwF4LQ==
vscode-proxy-agent@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/vscode-proxy-agent/-/vscode-proxy-agent-0.10.0.tgz#ca183a10f1b0bf6b6862284c96a99e9a380ef17b"
integrity sha512-gbslzWeODAqganQTIoXv8iGQ/LorjamQkTXNmzIYDB1Fyz49RL9j86mUIj6avP4AzSje1XLm7/feReu6hyEoAw==
vscode-proxy-agent@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/vscode-proxy-agent/-/vscode-proxy-agent-0.11.0.tgz#9dc8d2bb9d448f1e33bb1caef97a741289660f2f"
integrity sha512-Y5mHjDGq/OKOvKG0IwCYfj25cvQ2cLEil8ce8n55IZHRAP9RF3e1sKU4ZUNDB8X2NIpKwyltrWpK9tFFE/kc3g==
dependencies:
"@tootallnate/once" "^1.1.2"
agent-base "^6.0.2"

3
src/vs/platform/request/common/request.ts
View file

@ -103,10 +103,11 @@ function registerProxyConfigurations(scope: ConfigurationScope): void {
},
'http.proxySupport': {
type: 'string',
enum: ['off', 'on', 'override'],
enum: ['off', 'on', 'fallback', 'override'],
enumDescriptions: [
localize('proxySupportOff', "Disable proxy support for extensions."),
localize('proxySupportOn', "Enable proxy support for extensions."),
localize('proxySupportFallback', "Enable proxy support for extensions, fall back to request options, when no proxy found."),
localize('proxySupportOverride', "Enable proxy support for extensions, override request options."),
],
default: 'override',

6
src/vs/workbench/services/extensions/node/proxyResolver.ts
View file

@ -14,7 +14,7 @@ import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionS
import { URI } from 'vs/base/common/uri';
import { ILogService } from 'vs/platform/log/common/log';
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { LogLevel, createHttpPatch, ProxyResolveEvent, createProxyResolver, createTlsPatch } from 'vscode-proxy-agent';
import { LogLevel, createHttpPatch, ProxyResolveEvent, createProxyResolver, createTlsPatch, ProxySupportSetting } from 'vscode-proxy-agent';
export function connectProxyResolver(
extHostWorkspace: IExtHostWorkspaceProvider,
@ -72,11 +72,11 @@ export function connectProxyResolver(
function createPatchedModules(configProvider: ExtHostConfigProvider, resolveProxy: ReturnType<typeof createProxyResolver>) {
const proxySetting = {
config: configProvider.getConfiguration('http')
.get<'override' | 'on' | 'off'>('proxySupport') || 'off'
.get<ProxySupportSetting>('proxySupport') || 'off'
};
configProvider.onDidChangeConfiguration(e => {
proxySetting.config = configProvider.getConfiguration('http')
.get<'override' | 'on' | 'off'>('proxySupport') || 'off';
.get<ProxySupportSetting>('proxySupport') || 'off';
});
const certSetting = {
config: !!configProvider.getConfiguration('http')

8
yarn.lock
View file

@ -9945,10 +9945,10 @@ vscode-oniguruma@1.3.1:
resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.3.1.tgz#e2383879c3485b19f533ec34efea9d7a2b14be8f"
integrity sha512-gz6ZBofA7UXafVA+m2Yt2zHKgXC2qedArprIsHAPKByTkwq9l5y/izAGckqxYml7mSbYxTRTfdRwsFq3cwF4LQ==
vscode-proxy-agent@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/vscode-proxy-agent/-/vscode-proxy-agent-0.10.0.tgz#ca183a10f1b0bf6b6862284c96a99e9a380ef17b"
integrity sha512-gbslzWeODAqganQTIoXv8iGQ/LorjamQkTXNmzIYDB1Fyz49RL9j86mUIj6avP4AzSje1XLm7/feReu6hyEoAw==
vscode-proxy-agent@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/vscode-proxy-agent/-/vscode-proxy-agent-0.11.0.tgz#9dc8d2bb9d448f1e33bb1caef97a741289660f2f"
integrity sha512-Y5mHjDGq/OKOvKG0IwCYfj25cvQ2cLEil8ce8n55IZHRAP9RF3e1sKU4ZUNDB8X2NIpKwyltrWpK9tFFE/kc3g==
dependencies:
"@tootallnate/once" "^1.1.2"
agent-base "^6.0.2"