util.unsetByPath(): prevent prototype modification (#1406)

clientIO · Dec 18, 2020 · ec7ab01 · ec7ab01
1 parent 9a51109
commit ec7ab01
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 24 deletions.
diff --git a/src/util/util.mjs b/src/util/util.mjs
@@ -137,6 +137,18 @@ export const getByPath = function(obj, path, delimiter) {
     return obj;
 };
 
+const isGetSafe = function(obj, key) {
+    // Prevent prototype pollution
+    // https://snyk.io/vuln/SNYK-JS-JSON8MERGEPATCH-1038399
+    if (key === 'constructor' && typeof obj[key] === 'function') {
+        return false;
+    }
+    if (key === '__proto__') {
+        return false;
+    }
+    return true;
+};
+
 export const setByPath = function(obj, path, value, delimiter) {
 
     const keys = Array.isArray(path) ? path : path.split(delimiter || '/');
@@ -146,15 +158,8 @@ export const setByPath = function(obj, path, value, delimiter) {
 
     for (; i < last; i++) {
         const key = keys[i];
+        if (!isGetSafe(diver, key)) return obj;
         const value = diver[key];
-        // Prevent prototype pollution
-        // https://snyk.io/vuln/SNYK-JS-JSON8MERGEPATCH-1038399
-        if (key === 'constructor' && typeof value === 'function') {
-            return obj;
-        }
-        if (key === '__proto__') {
-            return obj;
-        }
         // diver creates an empty object if there is no nested object under such a key.
         // This means that one can populate an empty nested object with setByPath().
         diver = value || (diver[key] = {});
@@ -167,25 +172,21 @@ export const setByPath = function(obj, path, value, delimiter) {
 
 export const unsetByPath = function(obj, path, delimiter) {
 
-    delimiter || (delimiter = '/');
-
-    var pathArray = Array.isArray(path) ? path.slice() : path.split(delimiter);
-
-    var propertyToRemove = pathArray.pop();
-    if (pathArray.length > 0) {
-
-        // unsetting a nested attribute
-        var parent = getByPath(obj, pathArray, delimiter);
-        if (parent) {
-            delete parent[propertyToRemove];
-        }
-
-    } else {
+    const keys = Array.isArray(path) ? path : path.split(delimiter || '/');
+    const last = keys.length - 1;
+    let diver = obj;
+    let i = 0;
 
-        // unsetting a primitive attribute
-        delete obj[propertyToRemove];
+    for (; i < last; i++) {
+        const key = keys[i];
+        if (!isGetSafe(diver, key)) return obj;
+        const value = diver[key];
+        if (!value) return obj;
+        diver = value;
     }
 
+    delete diver[keys[last]];
+
     return obj;
 };
 

diff --git a/test/jointjs/core/util.js b/test/jointjs/core/util.js
@@ -401,6 +401,15 @@ QUnit.module('util', function(hooks) {
             joint.util.unsetByPath(obj, ['c', 'd']);
             assert.deepEqual(obj, { a: 1 }, 'Attempt to delete non-existing attribute doesn\'t affect object.');
         });
+
+        ['__proto__/toString', 'constructor/prototype/toString'].forEach(function(path) {
+            QUnit.test('unsetting "' + path + '" does not modify prototype' , function(assert) {
+                var obj = {};
+                assert.equal(typeof obj.toString, 'function');
+                joint.util.unsetByPath({}, path, '/');
+                assert.equal(typeof obj.toString, 'function');
+            });
+        });
     });
 
     QUnit.test('util.normalizeSides()', function(assert) {