diff options
| author | Nikon the Third <[email protected]> | 2021-02-19 09:24:53 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-19 10:24:53 +0200 |
| commit | e8f08d1802976b8200551de49354757f84e438cf (patch) | |
| tree | 9b93206a442b98c147c1820179f8232bc7e565b6 | |
| parent | 454d8ae1f4513109abeb5b82a015691be5e95f0b (diff) | |
| download | bootstrap-e8f08d1802976b8200551de49354757f84e438cf.tar.xz bootstrap-e8f08d1802976b8200551de49354757f84e438cf.zip | |
Adjust regex `SAFE_URL_PATTERN` for use with test method of regexes. (#33136)
The test method on regexes behaves different than the match method on strings in the presence of the global modifier.
Add a unit test for sanitizing the same template twice.
Co-authored-by: XhmikosR <[email protected]>
| -rw-r--r-- | js/src/util/sanitizer.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/util/sanitizer.spec.js | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/js/src/util/sanitizer.js b/js/src/util/sanitizer.js index 18ac6f943..57653a891 100644 --- a/js/src/util/sanitizer.js +++ b/js/src/util/sanitizer.js @@ -23,7 +23,7 @@ const ARIA_ATTRIBUTE_PATTERN = /^aria-[\w-]*$/i * * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts */ -const SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^#&/:?]*(?:[#/?]|$))/gi +const SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^#&/:?]*(?:[#/?]|$))/i /** * A pattern that matches safe data URLs. Only matches image, video and audio types. diff --git a/js/tests/unit/util/sanitizer.spec.js b/js/tests/unit/util/sanitizer.spec.js index 869b8c561..7379d221f 100644 --- a/js/tests/unit/util/sanitizer.spec.js +++ b/js/tests/unit/util/sanitizer.spec.js @@ -66,5 +66,15 @@ describe('Sanitizer', () => { expect(result).toEqual(template) expect(DOMParser.prototype.parseFromString).not.toHaveBeenCalled() }) + + it('should allow multiple sanitation passes of the same template', () => { + const template = '<img src="test.jpg">' + + const firstResult = sanitizeHtml(template, DefaultAllowlist, null) + const secondResult = sanitizeHtml(template, DefaultAllowlist, null) + + expect(firstResult).toContain('src') + expect(secondResult).toContain('src') + }) }) }) |
