Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable loading schemas from http/s in untrusted workspaces (#265176)

Browse Source
This commit is contained in:
Martin Aeschlimann
2025-09-04 17:56:18 +02:00
committed by GitHub
parent 1e270afce2
commit f52be6a9d7
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/json-language-features/client/src/jsonClient.ts
View File

@@ -392,7 +392,7 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
} catch (e) {
throw new ResponseError(2, e.toString(), e);
}
} else if (schemaDownloadEnabled) {
} else if (schemaDownloadEnabled && workspace.isTrusted) {
if (runtime.telemetry && uri.authority === 'schema.management.azure.com') {
/* __GDPR__
"json.schema" : {
@@ -409,6 +409,9 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
throw new ResponseError(4, e.toString());
}
} else {
if (!workspace.isTrusted) {
throw new ResponseError(1, l10n.t('Downloading schemas is disabled in untrusted workspaces'));
}
throw new ResponseError(1, l10n.t('Downloading schemas is disabled through setting \'{0}\'', SettingIds.enableSchemaDownload));
}
});
@@ -533,6 +536,7 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
client.sendNotification(DidChangeConfigurationNotification.type, { settings: getSettings() });
}
}));
toDispose.push(workspace.onDidGrantWorkspaceTrust(updateSchemaDownloadSetting));
toDispose.push(createLanguageStatusItem(documentSelector, (uri: string) => client.sendRequest(LanguageStatusRequest.type, uri)));
@@ -569,6 +573,11 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
}
function updateSchemaDownloadSetting() {
if (!workspace.isTrusted) {
schemaResolutionErrorStatusBarItem.tooltip = l10n.t('Unable to download schemas in untrusted workspaces.');
schemaResolutionErrorStatusBarItem.command = 'workbench.trust.manage';
return;
}
schemaDownloadEnabled = workspace.getConfiguration().get(SettingIds.enableSchemaDownload) !== false;
if (schemaDownloadEnabled) {
schemaResolutionErrorStatusBarItem.tooltip = l10n.t('Unable to resolve schema. Click to retry.');