Try using consistent origin for main thread custom editors (microsoft#166520)

For microsoft#132464

Author: mjbvz

src/vs/workbench/api/browser/mainThreadCustomEditors.ts

@@ -19,6 +19,7 @@ import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { FileOperation, IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vs/platform/label/common/label';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IUndoRedoService, UndoRedoElementType } from 'vs/platform/undoRedo/common/undoRedo';
 import { MainThreadWebviewPanels } from 'vs/workbench/api/browser/mainThreadWebviewPanels';
 import { MainThreadWebviews, reviveWebviewExtension } from 'vs/workbench/api/browser/mainThreadWebviews';
@@ -28,7 +29,7 @@ import { CustomEditorInput } from 'vs/workbench/contrib/customEditor/browser/cus
 import { CustomDocumentBackupData } from 'vs/workbench/contrib/customEditor/browser/customEditorInputFactory';
 import { ICustomEditorModel, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
 import { CustomTextEditorModel } from 'vs/workbench/contrib/customEditor/common/customTextEditorModel';
-import { WebviewExtensionDescription } from 'vs/workbench/contrib/webview/browser/webview';
+import { ExtensionKeyedWebviewOriginStore, WebviewExtensionDescription } from 'vs/workbench/contrib/webview/browser/webview';
 import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IWebviewWorkbenchService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
 import { editorGroupToColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
@@ -55,11 +56,14 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 
 	private readonly _editorRenameBackups = new Map<string, CustomDocumentBackupData>();
 
+	private readonly _webviewOriginStore: ExtensionKeyedWebviewOriginStore;
+
 	constructor(
 		context: IExtHostContext,
 		private readonly mainThreadWebview: MainThreadWebviews,
 		private readonly mainThreadWebviewPanels: MainThreadWebviewPanels,
 		@IExtensionService extensionService: IExtensionService,
+		@IStorageService storageService: IStorageService,
 		@IWorkingCopyService workingCopyService: IWorkingCopyService,
 		@IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService,
 		@ICustomEditorService private readonly _customEditorService: ICustomEditorService,
@@ -69,6 +73,8 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 	) {
 		super();
 
+		this._webviewOriginStore = new ExtensionKeyedWebviewOriginStore('mainThreadCustomEditors.origins', storageService);
+
 		this._proxyCustomEditors = context.getProxy(extHostProtocol.ExtHostContext.ExtHostCustomEditors);
 
 		this._register(workingCopyFileService.registerWorkingCopyProvider((editorResource) => {
@@ -134,6 +140,8 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 				const handle = webviewInput.id;
 				const resource = webviewInput.resource;
 
+				webviewInput.webview.origin = this._webviewOriginStore.getOrigin(viewType, extension.id);
+
 				this.mainThreadWebviewPanels.addWebviewInput(handle, webviewInput, { serializeBuffersForPostMessage });
 				webviewInput.webview.options = options;
 				webviewInput.webview.extension = extension;

src/vs/workbench/contrib/webview/browser/overlayWebview.ts

@@ -42,7 +42,8 @@ export class OverlayWebview extends Disposable implements IOverlayWebview {
 
 	public readonly id: string;
 	public readonly providedViewType?: string;
-	public readonly origin: string;
+
+	public origin: string;
 
 	private _container: FastDomNode<HTMLDivElement> | undefined;
 

src/vs/workbench/contrib/webview/browser/webview.ts

@@ -176,19 +176,37 @@ export interface IWebview extends IDisposable {
 	readonly id: string;
 
 	/**
-	 * The origin this webview itself is loaded from. May not be unique
+	 * The original view type of the webview.
 	 */
-	readonly origin: string;
+	readonly providedViewType?: string;
 
 	/**
-	 * The original view type of the webview.
+	 * The origin this webview itself is loaded from. May not be unique.
 	 */
-	readonly providedViewType?: string;
+	readonly origin: string;
 
+	/**
+	 * The html content of the webview.
+	 */
 	html: string;
+
+	/**
+	 * Control what content is allowed/blocked inside the webview.
+	 */
 	contentOptions: WebviewContentOptions;
+
+	/**
+	 * List of roots from which local resources can be loaded.
+	 *
+	 * Requests for local resources not in this list are blocked.
+	 */
 	localResourcesRoot: readonly URI[];
+
+	/**
+	 * The extension that created/owns this webview.
+	 */
 	extension: WebviewExtensionDescription | undefined;
+
 	initialScrollProgress: number;
 	state: string | undefined;
 
@@ -258,6 +276,8 @@ export interface IOverlayWebview extends IWebview {
 	 */
 	readonly container: HTMLElement;
 
+	origin: string;
+
 	options: WebviewOptions;
 
 	/**