Skip to content

fix(service-worker): allow webview resources to be served from same domain #147467

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
merged 4 commits into from
Apr 14, 2022
Merged

fix(service-worker): allow webview resources to be served from same domain #147467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccf0a79
fix: compare origins in fetch requests against remote authority
jsjoeio Apr 14, 2022
9f6a7d5
Merge branch 'main' into jsjoeio/fix-sw-origin
jsjoeio Apr 14, 2022
4643e93
Merge branch 'main' into jsjoeio/fix-sw-origin
jsjoeio Apr 14, 2022
d8d1a75
Merge branch 'main' into jsjoeio/fix-sw-origin
jsjoeio Apr 14, 2022
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
2 changes: 1 addition & 1 deletion src/vs/workbench/common/webview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const webviewResourceBaseHost = 'vscode-cdn.net';

export const webviewRootResourceAuthority = `vscode-resource.${webviewResourceBaseHost}`;

export const webviewGenericCspSource = `https://*.${webviewResourceBaseHost}`;
export const webviewGenericCspSource = `'self' https://*.${webviewResourceBaseHost}`;

/**
* Construct a uri that can load resources inside a webview
Expand Down
6 changes: 4 additions & 2 deletions src/vs/workbench/contrib/webview/browser/pre/service-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,10 @@ sw.addEventListener('fetch', (event) => {
}

// If we're making a request against the remote authority, we want to go
// back through VS Code itself so that we are authenticated properly
if (requestUrl.host === remoteAuthority) {
// through VS Code itself so that we are authenticated properly. If the
// service worker is hosted on the same origin we will have cookies and
// authentication will not be an issue.
if (requestUrl.origin !== sw.origin && requestUrl.host === remoteAuthority) {
switch (event.request.method) {
case 'GET':
case 'HEAD':
Expand Down