kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Minor refactoring (#34980) 

Rename variables and remove a temporary one
This commit is contained in:
XhmikosR 2021-09-15 14:34:24 +03:00 committed by GitHub
parent c5d03d93fc
commit 8f2e678424
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/util/focustrap.js
View File

@ -69,11 +69,7 @@ class FocusTrap {
const { target } = event const { target } = event
const { trapElement } = this._config const { trapElement } = this._config
if ( if (target === document || target === trapElement || trapElement.contains(target)) {
target === document ||
target === trapElement ||
trapElement.contains(target)
) {
return return
} }

35
js/src/util/sanitizer.js
View File

@ -5,7 +5,7 @@
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
const uriAttrs = new Set([ const uriAttributes = new Set([
'background', 'background',
'cite', 'cite',
'href', 'href',
@ -32,22 +32,22 @@ const SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^#&/:?]*(?:[#/?]|
*/ */
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 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 = (attr, allowedAttributeList) => { const allowedAttribute = (attribute, allowedAttributeList) => {
const attrName = attr.nodeName.toLowerCase() const attributeName = attribute.nodeName.toLowerCase()
if (allowedAttributeList.includes(attrName)) { if (allowedAttributeList.includes(attributeName)) {
if (uriAttrs.has(attrName)) { if (uriAttributes.has(attributeName)) {
return Boolean(SAFE_URL_PATTERN.test(attr.nodeValue) || DATA_URL_PATTERN.test(attr.nodeValue)) return Boolean(SAFE_URL_PATTERN.test(attribute.nodeValue) || DATA_URL_PATTERN.test(attribute.nodeValue))
} }
return true return true
} }
const regExp = allowedAttributeList.filter(attrRegex => attrRegex instanceof RegExp) const regExp = allowedAttributeList.filter(attributeRegex => attributeRegex instanceof RegExp)
// Check if a regular expression validates the attribute. // Check if a regular expression validates the attribute.
for (let i = 0, len = regExp.length; i < len; i++) { for (let i = 0, len = regExp.length; i < len; i++) {
if (regExp[i].test(attrName)) { if (regExp[i].test(attributeName)) {
return true return true
} }
} }
@ -100,25 +100,24 @@ export function sanitizeHtml(unsafeHtml, allowList, sanitizeFn) {
const domParser = new window.DOMParser() const domParser = new window.DOMParser()
const createdDocument = domParser.parseFromString(unsafeHtml, 'text/html') const createdDocument = domParser.parseFromString(unsafeHtml, 'text/html')
const allowlistKeys = Object.keys(allowList)
const elements = [].concat(...createdDocument.body.querySelectorAll('*')) const elements = [].concat(...createdDocument.body.querySelectorAll('*'))
for (let i = 0, len = elements.length; i < len; i++) { for (let i = 0, len = elements.length; i < len; i++) {
const el = elements[i] const element = elements[i]
const elName = el.nodeName.toLowerCase() const elementName = element.nodeName.toLowerCase()
if (!allowlistKeys.includes(elName)) { if (!Object.keys(allowList).includes(elementName)) {
el.remove() element.remove()
continue continue
} }
const attributeList = [].concat(...el.attributes) const attributeList = [].concat(...element.attributes)
const allowedAttributes = [].concat(allowList['*'] || [], allowList[elName] || []) const allowedAttributes = [].concat(allowList['*'] || [], allowList[elementName] || [])
attributeList.forEach(attr => { attributeList.forEach(attribute => {
if (!allowedAttribute(attr, allowedAttributes)) { if (!allowedAttribute(attribute, allowedAttributes)) {
el.removeAttribute(attr.nodeName) element.removeAttribute(attribute.nodeName)
} }
}) })
} }