development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we use the webviewResourceRoot on for computing cspSource

Browse source 
Fixes #120879
This commit is contained in:
Matt Bierner 2021-04-08 16:59:59 -07:00
parent 84391165c3
commit 044a99585c
No known key found for this signature in database
GPG key ID: 099C331567E11888
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/workbench/services/environment/electron-sandbox/environmentService.ts
View file

@ -73,7 +73,7 @@ export class NativeWorkbenchEnvironmentService extends AbstractNativeEnvironment
@memoize
get webviewResourceRoot(): string {
// On desktop, this endpoint is only used for the service worker to identify resouce loads and
// On desktop, this endpoint is only used for the service worker to identify resource loads and
// should never actually be requested.
//
// Required due to https://github.com/electron/electron/issues/28528
@ -81,7 +81,10 @@ export class NativeWorkbenchEnvironmentService extends AbstractNativeEnvironment
}
@memoize
get webviewCspSource(): string { return `${Schemas.vscodeWebviewResource}:`; }
get webviewCspSource(): string {
const uri = URI.parse(this.webviewResourceRoot.replace('{{uuid}}', '*'));
return `${uri.scheme}://${uri.authority}`;
}
@memoize
get skipReleaseNotes(): boolean { return !!this.args['skip-release-notes']; }