dompurify 2.5.1 → 2.5.3

package/dist/purify.js

@@ -1,4 +1,4 @@
-/*! @license DOMPurify 2.5.1 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.5.1/LICENSE */
+/*! @license DOMPurify 2.5.3 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.5.3/LICENSE */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -116,6 +116,7 @@
   var stringTrim = unapply(String.prototype.trim);
   var regExpTest = unapply(RegExp.prototype.test);
   var typeErrorCreate = unconstruct(TypeError);
+  var numberIsNaN = unapply(Number.isNaN);
   function unapply(func) {
     return function (thisArg) {
       for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -287,7 +288,7 @@
      * Version label, exposed for easier checks
      * if DOMPurify is up to date or not
      */
-    DOMPurify.version = '2.5.1';
+    DOMPurify.version = '2.5.3';
 
     /**
      * Array of elements that DOMPurify removed during sanitation.
@@ -677,7 +678,7 @@
       CONFIG = cfg;
     };
     var MATHML_TEXT_INTEGRATION_POINTS = addToSet({}, ['mi', 'mo', 'mn', 'ms', 'mtext']);
-    var HTML_INTEGRATION_POINTS = addToSet({}, ['foreignobject', 'desc', 'title', 'annotation-xml']);
+    var HTML_INTEGRATION_POINTS = addToSet({}, ['foreignobject', 'annotation-xml']);
 
     // Certain elements are allowed in both SVG and HTML
     // namespace. We need to specify them explicitly
@@ -1069,7 +1070,7 @@
     // eslint-disable-next-line complexity
     var _isValidAttribute = function _isValidAttribute(lcTag, lcName, value) {
       /* Make sure attribute cannot clobber */
-      if (SANITIZE_DOM && (lcName === 'id' || lcName === 'name') && (value in document || value in formElement)) {
+      if (SANITIZE_DOM && (lcName === 'id' || lcName === 'name') && (value in document || value in formElement || value === '__depth' || value === '__removalCount')) {
         return false;
       }
 
@@ -1171,6 +1172,12 @@
           continue;
         }
 
+        /* Work around a security issue with comments inside attributes */
+        if (SAFE_FOR_XML && regExpTest(/((--!?|])>)|<\/(style|title)/i, value)) {
+          _removeAttribute(name, currentNode);
+          continue;
+        }
+
         /* Sanitize attribute content to be template-safe */
         if (SAFE_FOR_TEMPLATES) {
           value = stringReplace(value, MUSTACHE_EXPR$1, ' ');
@@ -1221,7 +1228,11 @@
             /* Fallback to setAttribute() for browser-unrecognized namespaces e.g. "x-schema". */
             currentNode.setAttribute(name, value);
           }
-          arrayPop(DOMPurify.removed);
+          if (_isClobbered(currentNode)) {
+            _forceRemove(currentNode);
+          } else {
+            arrayPop(DOMPurify.removed);
+          }
         } catch (_) {}
       }
 
@@ -1248,22 +1259,26 @@
         if (_sanitizeElements(shadowNode)) {
           continue;
         }
+        var 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;
           }
         }
 
-        /* Remove an element if nested too deeply to avoid mXSS */
-        if (shadowNode.__depth >= MAX_NESTING_DEPTH) {
+        /*
+         * Remove an element if nested too deeply to avoid mXSS
+         * or if the __depth might have been tampered with
+         */
+        if (shadowNode.__depth >= MAX_NESTING_DEPTH || numberIsNaN(shadowNode.__depth)) {
           _forceRemove(shadowNode);
         }
 
@@ -1399,22 +1414,26 @@
         if (_sanitizeElements(currentNode)) {
           continue;
         }
+        var 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;
           }
         }
 
-        /* Remove an element if nested too deeply to avoid mXSS */
-        if (currentNode.__depth >= MAX_NESTING_DEPTH) {
+        /*
+         * Remove an element if nested too deeply to avoid mXSS
+         * or if the __depth might have been tampered with
+         */
+        if (currentNode.__depth >= MAX_NESTING_DEPTH || numberIsNaN(currentNode.__depth)) {
           _forceRemove(currentNode);
         }