diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js index bf45fc26cd2..8b22be3d203 100644 --- a/build/gulpfile.vscode.web.js +++ b/build/gulpfile.vscode.web.js @@ -42,8 +42,7 @@ const vscodeWebResourceIncludes = [ 'out-build/vs/workbench/contrib/webview/browser/pre/*.html', // Extension Worker - 'out-build/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html', - 'out-build/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html', + 'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html', // Web node paths (needed for integration tests) 'out-build/vs/webPackagePaths.js', diff --git a/src/vs/server/webClientServer.ts b/src/vs/server/webClientServer.ts index 703446e6f6f..d2d03c7cc67 100644 --- a/src/vs/server/webClientServer.ts +++ b/src/vs/server/webClientServer.ts @@ -210,7 +210,7 @@ export class WebClientServer { 'default-src \'self\';', 'img-src \'self\' https: data: blob:;', 'media-src \'none\';', - `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} 'sha256-cb2sg39EJV8ABaSNFfWu/ou8o1xVXYK7jp90oZ9vpcg=' http://${remoteAuthority};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html + `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} 'sha256-cb2sg39EJV8ABaSNFfWu/ou8o1xVXYK7jp90oZ9vpcg=' http://${remoteAuthority};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html 'child-src \'self\';', `frame-src 'self' https://*.vscode-webview.net ${this._productService.webEndpointUrl || ''} data:;`, 'worker-src \'self\' data:;', diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts index e54225f7421..994b5ae7dbc 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts +++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts @@ -77,11 +77,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost private _getWebWorkerExtensionHostIframeSrc(): string { const suffix = this._environmentService.debugExtensionHost && this._environmentService.debugRenderer ? '?debugged=1' : '?'; - const iframeModulePath = ( - location.protocol === 'http:' - ? 'vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html' - : 'vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html' - ); + const iframeModulePath = 'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html'; if (platform.isWeb) { const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate; const commit = this._productService.commit; diff --git a/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html deleted file mode 100644 index 2e054c71ff9..00000000000 --- a/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html +++ /dev/null @@ -1,65 +0,0 @@ - - -
- - - - - - diff --git a/src/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html similarity index 100% rename from src/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html rename to src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html