diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index 8986f6b95373..e8991a633756 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -34,7 +34,7 @@ }, { "path": "./dist/js/bootstrap.bundle.js", - "maxSize": "83.5 kB" + "maxSize": "83.75 kB" }, { "path": "./dist/js/bootstrap.bundle.min.js", diff --git a/js/src/util/sanitizer.js b/js/src/util/sanitizer.js index cb33633ffd39..f0482eb94ed9 100644 --- a/js/src/util/sanitizer.js +++ b/js/src/util/sanitizer.js @@ -63,14 +63,22 @@ const uriAttributes = new Set([ * * Shout-out to Angular https://github.com/angular/angular/blob/15.2.8/packages/core/src/sanitization/url_sanitizer.ts#L38 */ -const SAFE_URL_PATTERN = /^(?!javascript:)(?:[a-z0-9+.-]+:|[^&:/?#]*(?:[/?#]|$))/i +const SAFE_URL_PATTERN = /^(?!(?:javascript|data|vbscript):)(?:[a-z0-9+.-]+:|[^&:/?#]*(?:[/?#]|$))/i + +/** + * A pattern that matches safe data URLs. Only matches image, video and audio + * types — notably NOT `data:text/html`, which is an XSS vector. + * + * Shout-out to Angular https://github.com/angular/angular/blob/15.2.8/packages/core/src/sanitization/url_sanitizer.ts#L49 + */ +const DATA_URL_PATTERN = /^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[\d+/a-z=]+$/i const allowedAttribute = (attribute, allowedAttributeList) => { const attributeName = attribute.nodeName.toLowerCase() if (allowedAttributeList.includes(attributeName)) { if (uriAttributes.has(attributeName)) { - return Boolean(SAFE_URL_PATTERN.test(attribute.nodeValue)) + return Boolean(SAFE_URL_PATTERN.test(attribute.nodeValue) || DATA_URL_PATTERN.test(attribute.nodeValue)) } return true diff --git a/js/tests/unit/util/sanitizer.spec.js b/js/tests/unit/util/sanitizer.spec.js index 2b21ef2e1967..ccf5c5cf6dd4 100644 --- a/js/tests/unit/util/sanitizer.spec.js +++ b/js/tests/unit/util/sanitizer.spec.js @@ -67,7 +67,13 @@ describe('Sanitizer', () => { 'jav\u0000ascript:alert();' ] - for (const url of invalidUrls) { + const dangerousDataUrls = [ + 'data:text/html,hello', + 'data:text/html;base64,PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg==', + 'vbscript:msgbox(1)' + ] + + for (const url of [...invalidUrls, ...dangerousDataUrls]) { const template = [ '