Skip to content

Browser: better tracking of per-window trust #319601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kycutler merged 2 commits into from
Jun 2, 2026
+18 −6
Merged

Browser: better tracking of per-window trust #319601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
243d373
Better tracking of per-window trust
kycutler Jun 2, 2026
abed0de
Potential fix for pull request finding
kycutler Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/vs/platform/browserView/electron-main/browserViewMainService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
@IApplicationStorageMainService private readonly applicationStorageMainService: IApplicationStorageMainService
) {
super();

this._register(this.windowsMainService.onDidDestroyWindow(window => {
if (this._perWindowTrustedRoots.delete(window.id)) {
this._recomputeTrustedFileRoots();
}
}));
}

async getOrCreateBrowserView(id: string, options: IBrowserViewCreateOptions): Promise<IBrowserViewState> {
Expand Down Expand Up @@ -329,10 +323,28 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa

async updateTrustedFileRoots(windowId: number, roots: readonly string[]): Promise<void> {
this._perWindowTrustedRoots.set(windowId, roots);
this._ensureWindowCloseSubscription(windowId);
this._recomputeTrustedFileRoots();
}
Comment thread
kycutler marked this conversation as resolved.

private readonly _perWindowTrustedRoots = new Map<number, readonly string[]>();
private readonly _windowCloseSubscriptions = this._register(new DisposableMap<number>());
private _ensureWindowCloseSubscription(windowId: number): void {
if (this._windowCloseSubscriptions.has(windowId)) {
return;
}
const window = this.windowsMainService.getWindowById(windowId);
if (!window) {
return;
}
const onWindowGone = Event.any(window.onDidClose, window.onDidDestroy);
this._windowCloseSubscriptions.set(windowId, Event.once(onWindowGone)(() => {
this._windowCloseSubscriptions.deleteAndDispose(windowId);
if (this._perWindowTrustedRoots.delete(windowId)) {
this._recomputeTrustedFileRoots();
}
}));
}
private _recomputeTrustedFileRoots(): void {
const roots = new Set<string>();
for (const contribution of this._perWindowTrustedRoots.values()) {
Expand Down
Loading