diff options
author | Florian Vick <florian@eagle-eye-studios.net> | 2021-02-03 22:58:54 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-03 22:58:54 +0300 |
commit | 2a9d72133d52af1ca72944f1d19474957b54d618 (patch) | |
tree | bc6fd0cb03ebe23636fc4ef08ce5b9b37a797a96 /js/src/util | |
parent | 3770b7b9e3fd92b164a58caef05a4d9cd650a86a (diff) |
Prevent `getSelector` from returning URLs as selector (#32586)
* added checks to getSelector in util to prevent returning hrefs that are invalid selectors
* restored compatibility for the class selector and added test cases for keeping urls from being returned as a selector
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
Diffstat (limited to 'js/src/util')
-rw-r--r-- | js/src/util/index.js | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/js/src/util/index.js b/js/src/util/index.js index 22d0a578b8..bd519cce07 100644 --- a/js/src/util/index.js +++ b/js/src/util/index.js @@ -36,7 +36,20 @@ const getSelector = element => { let selector = element.getAttribute('data-bs-target') if (!selector || selector === '#') { - const hrefAttr = element.getAttribute('href') + let hrefAttr = element.getAttribute('href') + + // The only valid content that could double as a selector are IDs or classes, + // so everything starting with `#` or `.`. If a "real" URL is used as the selector, + // `document.querySelector` will rightfully complain it is invalid. + // See https://github.com/twbs/bootstrap/issues/32273 + if (!hrefAttr || (!hrefAttr.includes('#') && !hrefAttr.startsWith('.'))) { + return null + } + + // Just in case some CMS puts out a full URL with the anchor appended + if (hrefAttr.includes('#') && !hrefAttr.startsWith('#')) { + hrefAttr = '#' + hrefAttr.split('#')[1] + } selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : null } |