Merge pull request #19 from mrodrig/fix/issue-18

Fix #18

lib/path.js

@@ -48,11 +48,6 @@ function setPath(obj, kp, v) {
         throw new Error('No keyPath was provided.');
     }
 
-    // If this is clearly a prototype pollution attempt, then refuse to modify the path
-    if (kp.startsWith('__proto__') || kp.startsWith('constructor') || kp.startsWith('prototype')) {
-        return obj;
-    }
-
     return _sp(obj, kp, v);
 }
 
@@ -67,6 +62,11 @@ function setPath(obj, kp, v) {
 function _sp(obj, kp, v) {
     let {dotIndex, key, remaining} = state(kp);
 
+    // If this is clearly a prototype pollution attempt, then refuse to modify the path
+    if (kp.startsWith('__proto__') || kp.startsWith('constructor') || kp.startsWith('prototype')) {
+        return obj;
+    }
+
     if (dotIndex >= 0) {
         // If there is a '.' in the key path, recur on the subdoc and ...
         if (!obj[key] && Array.isArray(obj)) {

package.json

@@ -2,7 +2,7 @@
     "author": "mrodrig",
     "name": "doc-path",
     "description": "A document path library for Node",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "homepage": "https://mrodrig.github.io/doc-path",
     "repository": {
         "type": "git",

test/tests.js

@@ -230,10 +230,12 @@ describe('doc-path Module', function() {
 
         it('should protect against prototype pollution via __proto__', (done) => {
             doc = {};
+            assert.equal(doc.polluted, undefined);
             path.setPath(doc, '__proto__.polluted', 'prototype-polluted');
             assert.equal(doc.__proto__.polluted, undefined);
             assert.equal(doc.polluted, undefined);
             assert.equal({}.polluted, undefined);
+            assert.equal(Object.polluted, undefined);
             done();
         });
 
@@ -266,5 +268,16 @@ describe('doc-path Module', function() {
             assert.equal({}.test, undefined);
             done();
         });
+
+        it('should protect against prototype pollution against a nested document', (done) => {
+            doc = {};
+            assert.equal(doc.polluted, undefined);
+            path.setPath(doc, 'a.__proto__.polluted', 'polluted!');
+            assert.equal(typeof doc.a, 'object');
+            assert.equal(doc.polluted, undefined);
+            assert.equal({}.polluted, undefined);
+            assert.equal(Object.polluted, undefined);
+            done();
+        });
     });
 });