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

Use unique id for webview iframe

Browse source 
Switch from using the passed in id (which is generally but not always unique) to instead use a generated id for identifying the webview's iframe. This prevents two iframes with the same id from being created
This commit is contained in:
Matt Bierner 2021-11-11 18:12:01 -08:00
parent 2fe3c26ff7
commit 9fa52c75d6
No known key found for this signature in database
GPG key ID: 099C331567E11888
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/workbench/contrib/webview/browser/webviewElement.ts
View file

@ -14,6 +14,7 @@ import { Emitter, Event } from 'vs/base/common/event';
import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { Schemas } from 'vs/base/common/network';
import { URI } from 'vs/base/common/uri';
import { generateUuid } from 'vs/base/common/uuid';
import { localize } from 'vs/nls';
import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
@ -93,6 +94,9 @@ namespace WebviewState {
export class WebviewElement extends Disposable implements IWebview, WebviewFindDelegate {
public readonly id: string;
private readonly iframeId: string;
protected get platform(): string { return 'browser'; }
private readonly _expectedServiceWorkerVersion = 2; // Keep this in sync with the version in service-worker.js
@ -136,7 +140,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
public readonly checkImeCompletionState = true;
constructor(
public readonly id: string,
id: string,
private readonly options: WebviewOptions,
contentOptions: WebviewContentOptions,
public extension: WebviewExtensionDescription | undefined,
@ -155,6 +159,9 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
) {
super();
this.id = id;
this.iframeId = generateUuid();
this.content = {
html: '',
options: contentOptions,
@ -312,7 +319,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
}));
this._register(addDisposableListener(window, 'message', e => {
if (e?.data?.target === this.id) {
if (e?.data?.target === this.iframeId) {
if (e.origin !== this.webviewContentOrigin) {
console.log(`Skipped renderer receiving message due to mismatched origins: ${e.origin} ${this.webviewContentOrigin}`);
return;
@ -412,7 +419,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
private initElement(extension: WebviewExtensionDescription | undefined, options: WebviewOptions) {
// The extensionId and purpose in the URL are used for filtering in js-debug:
const params: { [key: string]: string } = {
id: this.id,
id: this.iframeId,
swVersion: String(this._expectedServiceWorkerVersion),
extensionId: extension?.id.value ?? '',
platform: this.platform,