Skip to content

Fix leaking uponSanitizeElement hook #213277

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
roblourens merged 1 commit into from
May 23, 2024
Merged

Fix leaking uponSanitizeElement hook #213277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 21 additions & 9 deletions src/vs/base/browser/markdownRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { markdownEscapeEscapedIcons } from 'vs/base/common/iconLabels';
import { defaultGenerator } from 'vs/base/common/idGenerator';
import { KeyCode } from 'vs/base/common/keyCodes';
import { Lazy } from 'vs/base/common/lazy';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { marked } from 'vs/base/common/marked/marked';
import { parse } from 'vs/base/common/marshalling';
import { FileAccess, Schemas } from 'vs/base/common/network';
Expand Down Expand Up @@ -383,7 +383,8 @@ function sanitizeRenderedMarkdown(
renderedMarkdown: string,
): TrustedHTML {
const { config, allowedSchemes } = getSanitizerOptions(options);
dompurify.addHook('uponSanitizeAttribute', (element, e) => {
const store = new DisposableStore();
store.add(addDompurifyHook('uponSanitizeAttribute', (element, e) => {
if (e.attrName === 'style' || e.attrName === 'class') {
if (element.tagName === 'SPAN') {
if (e.attrName === 'style') {
Expand All @@ -403,26 +404,24 @@ function sanitizeRenderedMarkdown(
}
e.keepAttr = false;
}
});
}));

dompurify.addHook('uponSanitizeElement', (element, e) => {
store.add(addDompurifyHook('uponSanitizeElement', (element, e) => {
if (e.tagName === 'input') {
if (element.attributes.getNamedItem('type')?.value === 'checkbox') {
element.setAttribute('disabled', '');
} else {
element.parentElement?.removeChild(element);
}
}
});

}));

const hook = DOM.hookDomPurifyHrefAndSrcSanitizer(allowedSchemes);
store.add(DOM.hookDomPurifyHrefAndSrcSanitizer(allowedSchemes));

try {
return dompurify.sanitize(renderedMarkdown, { ...config, RETURN_TRUSTED_TYPE: true });
} finally {
dompurify.removeHook('uponSanitizeAttribute');
hook.dispose();
store.dispose();
}
}

Expand Down Expand Up @@ -876,3 +875,16 @@ function completeTable(tokens: marked.Token[]): marked.Token[] | undefined {

return undefined;
}

function addDompurifyHook(
hook: 'uponSanitizeElement',
cb: (currentNode: Element, data: dompurify.SanitizeElementHookEvent, config: dompurify.Config) => void,
): IDisposable;
function addDompurifyHook(
hook: 'uponSanitizeAttribute',
cb: (currentNode: Element, data: dompurify.SanitizeAttributeHookEvent, config: dompurify.Config) => void,
): IDisposable;
function addDompurifyHook(hook: 'uponSanitizeElement' | 'uponSanitizeAttribute', cb: any): IDisposable {
dompurify.addHook(hook, cb);
return toDisposable(() => dompurify.removeHook(hook));
}