From becce316b2f614f0820cf795e69a86ec6e286e6b Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 8 Mar 2022 14:47:46 -0800 Subject: [PATCH] Avoid re-parsing uri --- src/vs/code/electron-main/app.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 0443e77cd7d..21f6f2b27da 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -195,11 +195,9 @@ export class CodeApplication extends Disposable { return false; }; - const isAllowedWebviewRequest = (details: Electron.OnBeforeRequestListenerDetails): boolean => { - const url = URI.parse(details.url); - + const isAllowedWebviewRequest = (uri: URI, details: Electron.OnBeforeRequestListenerDetails): boolean => { // Only restrict top level page of webviews: index.html - if (url.path !== '/index.html') { + if (uri.path !== '/index.html') { return true; } @@ -222,9 +220,8 @@ export class CodeApplication extends Disposable { session.defaultSession.webRequest.onBeforeRequest((details, callback) => { const uri = URI.parse(details.url); - if (uri.scheme === Schemas.vscodeWebview) { - if (!isAllowedWebviewRequest(details)) { + if (!isAllowedWebviewRequest(uri, details)) { this.logService.error('Blocked vscode-webview request', details.url); return callback({ cancel: true }); }