Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 06:51:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[json] add trustedDomains settings (#287639)

Browse Source 
* use trusted schemas

* [json] add trustedDomains settings
This commit is contained in:
Martin Aeschlimann
2026-01-14 00:31:19 +01:00
committed by GitHub
parent 4641b2abb8
commit 067cb03d18
8 changed files with 469 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
extensions/json-language-features/client/src/languageStatus.ts
View File

@@ -6,9 +6,9 @@
import {
window, languages, Uri, Disposable, commands, QuickPickItem,
extensions, workspace, Extension, WorkspaceFolder, QuickPickItemKind,
ThemeIcon, TextDocument, LanguageStatusSeverity, l10n, DocumentSelector
ThemeIcon, TextDocument, LanguageStatusSeverity, l10n, DocumentSelector, Diagnostic
} from 'vscode';
import { JSONLanguageStatus, JSONSchemaSettings } from './jsonClient';
import { CommandIds, ErrorCodes, isSchemaResolveError, JSONLanguageStatus, JSONSchemaSettings, SettingIds } from './jsonClient';
type ShowSchemasInput = {
schemas: string[];
@@ -168,7 +168,7 @@ export function createLanguageStatusItem(documentSelector: DocumentSelector, sta
statusItem.name = l10n.t('JSON Validation Status');
statusItem.severity = LanguageStatusSeverity.Information;
const showSchemasCommand = commands.registerCommand('_json.showAssociatedSchemaList', showSchemaList);
const showSchemasCommand = commands.registerCommand(CommandIds.showAssociatedSchemaList, showSchemaList);
const activeEditorListener = window.onDidChangeActiveTextEditor(() => {
updateLanguageStatus();
@@ -195,7 +195,7 @@ export function createLanguageStatusItem(documentSelector: DocumentSelector, sta
statusItem.detail = l10n.t('multiple JSON schemas configured');
}
statusItem.command = {
command: '_json.showAssociatedSchemaList',
command: CommandIds.showAssociatedSchemaList,
title: l10n.t('Show Schemas'),
arguments: [{ schemas, uri: document.uri.toString() } satisfies ShowSchemasInput]
};
@@ -279,3 +279,86 @@ export function createDocumentSymbolsLimitItem(documentSelector: DocumentSelecto
}
export function createSchemaLoadStatusItem(newItem: (fileSchemaError: Diagnostic) => Disposable) {
let statusItem: Disposable | undefined;
const fileSchemaErrors: Map<string, Diagnostic> = new Map();
const toDispose: Disposable[] = [];
toDispose.push(window.onDidChangeActiveTextEditor(textEditor => {
statusItem?.dispose();
statusItem = undefined;
const doc = textEditor?.document;
if (doc) {
const fileSchemaError = fileSchemaErrors.get(doc.uri.toString());
if (fileSchemaError !== undefined) {
statusItem = newItem(fileSchemaError);
}
}
}));
toDispose.push(workspace.onDidCloseTextDocument(document => {
fileSchemaErrors.delete(document.uri.toString());
}));
function update(uri: Uri, diagnostics: Diagnostic[]) {
const fileSchemaError = diagnostics.find(isSchemaResolveError);
const uriString = uri.toString();
if (fileSchemaError === undefined) {
fileSchemaErrors.delete(uriString);
if (statusItem && uriString === window.activeTextEditor?.document.uri.toString()) {
statusItem.dispose();
statusItem = undefined;
}
} else {
const current = fileSchemaErrors.get(uriString);
if (current?.message === fileSchemaError.message) {
return;
}
fileSchemaErrors.set(uriString, fileSchemaError);
if (uriString === window.activeTextEditor?.document.uri.toString()) {
statusItem?.dispose();
statusItem = newItem(fileSchemaError);
}
}
}
return {
update,
dispose() {
statusItem?.dispose();
toDispose.forEach(d => d.dispose());
toDispose.length = 0;
statusItem = undefined;
fileSchemaErrors.clear();
}
};
}
export function createSchemaLoadIssueItem(documentSelector: DocumentSelector, schemaDownloadEnabled: boolean | undefined, diagnostic: Diagnostic): Disposable {
const statusItem = languages.createLanguageStatusItem('json.documentSymbolsStatus', documentSelector);
statusItem.name = l10n.t('JSON Outline Status');
statusItem.severity = LanguageStatusSeverity.Error;
statusItem.text = 'Schema download issue';
if (!workspace.isTrusted) {
statusItem.detail = l10n.t('Workspace untrusted');
statusItem.command = { command: CommandIds.workbenchTrustManage, title: 'Configure Trust' };
} else if (!schemaDownloadEnabled) {
statusItem.detail = l10n.t('Download disabled');
statusItem.command = { command: CommandIds.workbenchActionOpenSettings, arguments: [SettingIds.enableSchemaDownload], title: 'Configure' };
} else if (typeof diagnostic.code === 'number' && diagnostic.code === ErrorCodes.UntrustedSchemaError) {
statusItem.detail = l10n.t('Location untrusted');
const schemaUri = diagnostic.relatedInformation?.[0]?.location.uri;
if (schemaUri) {
statusItem.command = { command: CommandIds.configureTrustedDomainsCommandId, arguments: [schemaUri.toString()], title: 'Configure Trusted Domains' };
} else {
statusItem.command = { command: CommandIds.workbenchActionOpenSettings, arguments: [SettingIds.trustedDomains], title: 'Configure Trusted Domains' };
}
} else {
statusItem.detail = l10n.t('Unable to resolve schema');
statusItem.command = { command: CommandIds.retryResolveSchemaCommandId, title: 'Retry' };
}
return Disposable.from(statusItem);
}