fix: Added same attribute clobbering check for 2.x branch

cure53 · Dec 7, 2024 · 9cd4f11 · 9cd4f11
1 parent f7120a3
commit 9cd4f11
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 57 deletions.
diff --git a/dist/purify.cjs.js b/dist/purify.cjs.js
diff --git a/dist/purify.cjs.js.map b/dist/purify.cjs.js.map
diff --git a/dist/purify.es.js b/dist/purify.es.js
diff --git a/dist/purify.es.js.map b/dist/purify.es.js.map
diff --git a/dist/purify.js b/dist/purify.js
diff --git a/dist/purify.js.map b/dist/purify.js.map
diff --git a/dist/purify.min.js b/dist/purify.min.js
diff --git a/dist/purify.min.js.map b/dist/purify.min.js.map
diff --git a/src/purify.js b/src/purify.js
@@ -1230,7 +1230,7 @@ function createDOMPurify(window = getGlobal()) {
     const { attributes } = currentNode;
 
     /* Check if we have attributes; if not we might have a text node */
-    if (!attributes) {
+    if (!attributes || _isClobbered(currentNode)) {
       return;
     }
 
@@ -1369,15 +1369,12 @@ function createDOMPurify(window = getGlobal()) {
     while ((shadowNode = shadowIterator.nextNode())) {
       /* Execute a hook if present */
       _executeHook('uponSanitizeShadowNode', shadowNode, null);
+      /* Sanitize tags and elements */
+      _sanitizeElements(shadowNode);
 
-      /* Check attributes first */
+      /* Check attributes next */
       _sanitizeAttributes(shadowNode);
 
-      /* Sanitize tags and elements */
-      if (_sanitizeElements(shadowNode)) {
-        continue;
-      }
-
       /* Deep shadow DOM detected */
       if (shadowNode.content instanceof DocumentFragment) {
         _sanitizeShadowDOM(shadowNode.content);
@@ -1515,13 +1512,11 @@ function createDOMPurify(window = getGlobal()) {
         continue;
       }
 
-      /* Check attributes first */
-      _sanitizeAttributes(currentNode);
-
       /* Sanitize tags and elements */
-      if (_sanitizeElements(currentNode)) {
-        continue;
-      }
+      _sanitizeElements(currentNode);
+
+      /* Check attributes next */
+      _sanitizeAttributes(currentNode);
 
       /* Shadow DOM detected, sanitize it */
       if (currentNode.content instanceof DocumentFragment) {