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

chore: cleanup webrequest filter for svg files

Browse source 
Fixes https://github.com/microsoft/vscode/issues/114743
This commit is contained in:
deepak1556 2021-01-24 09:40:04 -08:00
parent 79be0a0724
commit 62fcf3cce7
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vs/code/electron-main/window.ts
View file

@ -422,17 +422,19 @@ export class CodeWindow extends Disposable implements ICodeWindow {
this.dispose();
});
const svgFileSchemes = new Set([Schemas.file, Schemas.vscodeFileResource, Schemas.vscodeRemoteResource, 'devtools']);
const svgFileSchemes = new Set([Schemas.file, 'devtools']);
this._win.webContents.session.webRequest.onBeforeRequest((details, callback) => {
const uri = URI.parse(details.url);
// Prevent loading of remote svgs
if (details.url.endsWith('.svg')) {
const uri = URI.parse(details.url);
if (uri && !svgFileSchemes.has(uri.scheme)) {
if (uri && uri.path.endsWith('.svg')) {
const safeScheme = svgFileSchemes.has(uri.scheme) ||
uri.path.includes(Schemas.vscodeRemoteResource);
if (!safeScheme) {
return callback({ cancel: true });
}
}
return callback({});
return callback({ cancel: false });
});
this._win.webContents.session.webRequest.onHeadersReceived((details, callback) => {
@ -440,17 +442,20 @@ export class CodeWindow extends Disposable implements ICodeWindow {
const contentType = (responseHeaders['content-type'] || responseHeaders['Content-Type']);
if (contentType && Array.isArray(contentType)) {
const uri = URI.parse(details.url);
// https://github.com/microsoft/vscode/issues/97564
// ensure local svg files have Content-Type image/svg+xml
if (details.url.endsWith('.svg')) {
const uri = URI.parse(details.url);
if (uri && svgFileSchemes.has(uri.scheme)) {
if (uri && uri.path.endsWith('.svg')) {
if (svgFileSchemes.has(uri.scheme)) {
responseHeaders['Content-Type'] = ['image/svg+xml'];
return callback({ cancel: false, responseHeaders });
}
}
if (contentType.some(x => x.toLowerCase().includes('image/svg'))) {
// remote extension schemes have the following format
// http://127.0.0.1:<port>/vscode-remote-resource?path=
if (!uri.path.includes(Schemas.vscodeRemoteResource) &&
contentType.some(x => x.toLowerCase().includes('image/svg'))) {
return callback({ cancel: true });
}
}