fix: Switched to using the getParentNode API for some calls

cure53 · Apr 27, 2024 · 61b761f · 61b761f
1 parent ee17313
commit 61b761f
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 25 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.mjs b/dist/purify.es.mjs
@@ -1264,15 +1264,16 @@ function createDOMPurify() {
       if (_sanitizeElements(shadowNode)) {
         continue;
       }
+      const parentNode = getParentNode(shadowNode);
 
       /* Set the nesting depth of an element */
       if (shadowNode.nodeType === 1) {
-        if (shadowNode.parentNode && shadowNode.parentNode.__depth) {
+        if (parentNode && parentNode.__depth) {
           /*
             We want the depth of the node in the original tree, which can
             change when it's removed from its parent.
           */
-          shadowNode.__depth = (shadowNode.__removalCount || 0) + shadowNode.parentNode.__depth + 1;
+          shadowNode.__depth = (shadowNode.__removalCount || 0) + parentNode.__depth + 1;
         } else {
           shadowNode.__depth = 1;
         }
@@ -1401,15 +1402,16 @@ function createDOMPurify() {
       if (_sanitizeElements(currentNode)) {
         continue;
       }
+      const parentNode = getParentNode(currentNode);
 
       /* Set the nesting depth of an element */
       if (currentNode.nodeType === 1) {
-        if (currentNode.parentNode && currentNode.parentNode.__depth) {
+        if (parentNode && parentNode.__depth) {
           /*
             We want the depth of the node in the original tree, which can
             change when it's removed from its parent.
           */
-          currentNode.__depth = (currentNode.__removalCount || 0) + currentNode.parentNode.__depth + 1;
+          currentNode.__depth = (currentNode.__removalCount || 0) + parentNode.__depth + 1;
         } else {
           currentNode.__depth = 1;
         }

diff --git a/dist/purify.es.mjs.map b/dist/purify.es.mjs.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
@@ -1379,17 +1379,17 @@ function createDOMPurify(window = getGlobal()) {
         continue;
       }
 
+      const parentNode = getParentNode(shadowNode);
+
       /* Set the nesting depth of an element */
       if (shadowNode.nodeType === 1) {
-        if (shadowNode.parentNode && shadowNode.parentNode.__depth) {
+        if (parentNode && parentNode.__depth) {
           /*
             We want the depth of the node in the original tree, which can
             change when it's removed from its parent.
           */
           shadowNode.__depth =
-            (shadowNode.__removalCount || 0) +
-            shadowNode.parentNode.__depth +
-            1;
+            (shadowNode.__removalCount || 0) + parentNode.__depth + 1;
         } else {
           shadowNode.__depth = 1;
         }
@@ -1527,17 +1527,17 @@ function createDOMPurify(window = getGlobal()) {
         continue;
       }
 
+      const parentNode = getParentNode(currentNode);
+
       /* Set the nesting depth of an element */
       if (currentNode.nodeType === 1) {
-        if (currentNode.parentNode && currentNode.parentNode.__depth) {
+        if (parentNode && parentNode.__depth) {
           /*
             We want the depth of the node in the original tree, which can
             change when it's removed from its parent.
           */
           currentNode.__depth =
-            (currentNode.__removalCount || 0) +
-            currentNode.parentNode.__depth +
-            1;
+            (currentNode.__removalCount || 0) + parentNode.__depth + 1;
         } else {
           currentNode.__depth = 1;
         }

diff --git a/test/test-suite.js b/test/test-suite.js
@@ -2177,6 +2177,15 @@
       ];
       clean = DOMPurify.sanitize(dirty);
       assert.contains(clean, expected);
+
+      dirty = `<form><input name="parentNode"></form>${`<div>`.repeat(
+        500
+      )}${`</div>`.repeat(500)}<img>`;
+      expected = [
+        `<form><input></form>${`<div>`.repeat(253)}${`</div>`.repeat(253)}<img>`
+      ];
+      clean = DOMPurify.sanitize(dirty);
+      assert.contains(clean, expected);
     });
 
     QUnit.test('Test proper handling of nesting-based mXSS 3/3', function (assert) {