Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
},
"config": {
"vscode": {
"version": "1.128.0",
"ref": "1.128.0",
"commit": "fc3def6774c76082adf699d366f31a557ce5573f"
"version": "1.128.1",
"ref": "1.128.1",
"commit": "5264f2156cbcd7aea5fd004d29eaa10209155d66"
},
"monaco": {
"ref": "v0.55.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ Subject: [PATCH] fix: allow data urls in extension host worker
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
index 372f26d51e9..eff43dcde6c 100644
index 3c3c5863a72..40bc0b4572e 100644
--- a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+++ b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
@@ -4,16 +4,14 @@
<meta http-equiv="Content-Security-Policy" content="
default-src 'none';
child-src 'self' data: blob:;
- script-src 'self' 'unsafe-eval' 'sha256-cl8ijlOzEe+0GRCQNJQu2k6nUQ0fAYNYIuuKEm72JDs=' https: http://localhost:* blob:;
- script-src 'self' 'unsafe-eval' 'sha256-daEgfo2VIXpx2Np71KqCCbkeQwv+68vPrx54XRcbdcs=' https: http://localhost:* blob:;
- connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
+ script-src 'self' 'unsafe-eval' 'sha256-xM2KVDKIoeb8vVxk4ezEUsxdTZh5wFnKO3YmFhy9tkk=' data: extension-file: https: http://localhost:* blob:;
+ script-src 'self' 'unsafe-eval' 'sha256-x621qKC36VQZtyKDlDBzBs1YX37ubhmSBirgoLmAemc=' data: extension-file: https: http://localhost:* blob:;
+ connect-src 'self' data: extension-file: https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
</head>
<body>
Expand All @@ -28,5 +28,5 @@ index 372f26d51e9..eff43dcde6c 100644
- // DO NOT CHANGE the name of the worker without also updating js-debug, as that
- // is used to filter targets to attach to (e.g. #232544)
const name = searchParams.get('debugged') ? 'DebugExtensionHostWorker' : 'ExtensionHostWorker';
const parentOrigin = searchParams.get('parentOrigin') || window.origin;
const salt = searchParams.get('salt');
const parentOriginParam = searchParams.get('parentOrigin');
const parentOrigin = parentOriginParam || window.origin;
Original file line number Diff line number Diff line change
Expand Up @@ -201,19 +201,19 @@ index 4340604b3bd..881dc2fc9b0 100644
return null;
}
diff --git a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
index eff43dcde6c..269342a45e2 100644
index 40bc0b4572e..9fdd21c95b7 100644
--- a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+++ b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Security-Policy" content="
default-src 'none';
child-src 'self' data: blob:;
- script-src 'self' 'unsafe-eval' 'sha256-xM2KVDKIoeb8vVxk4ezEUsxdTZh5wFnKO3YmFhy9tkk=' data: extension-file: https: http://localhost:* blob:;
+ script-src 'self' 'unsafe-eval' 'sha256-YenIR0w2uOJMq12UhbL15PlQWd7gf4v3ThVTe/nvZZE=' data: extension-file: https: http://localhost:* blob:;
- script-src 'self' 'unsafe-eval' 'sha256-x621qKC36VQZtyKDlDBzBs1YX37ubhmSBirgoLmAemc=' data: extension-file: https: http://localhost:* blob:;
+ script-src 'self' 'unsafe-eval' 'sha256-LfSEPWgJAtrOdr34EHjreixgIIu+NHGT7RYTpV0eCBA=' data: extension-file: https: http://localhost:* blob:;
connect-src 'self' data: extension-file: https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
</head>
<body>
@@ -78,7 +78,7 @@
@@ -87,7 +87,7 @@
return;
}
const { data } = event.data;
Expand All @@ -222,7 +222,7 @@ index eff43dcde6c..269342a45e2 100644
};

window.parent.postMessage({
@@ -87,7 +87,7 @@
@@ -96,7 +96,7 @@
}, '*');
}

Expand All @@ -231,7 +231,7 @@ index eff43dcde6c..269342a45e2 100644
try {
if (globalThis.crossOriginIsolated) {
workerUrl += '?vscode-coi=2'; // COEP
@@ -102,11 +102,11 @@
@@ -111,11 +111,11 @@
`globalThis._VSCODE_NLS_MESSAGES = ${JSON.stringify(nlsMessages)};`,
`globalThis._VSCODE_NLS_LANGUAGE = ${JSON.stringify(nlsLanguage)};`,
`globalThis._VSCODE_FILE_ROOT = ${JSON.stringify(fileRoot)};`,
Expand Down
Loading