Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for prototype pollution #1

Merged
merged 2 commits into from
Aug 21, 2019
Merged

Fix for prototype pollution #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a621444
backport https://github.com/lodash/lodash/pull/4336/commits/a01e4fa72…
rachaelshaw Aug 20, 2019
c3fd203
Finish bringing in fix for _.defaultsDeep()
rachaelshaw Aug 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
// ### Tue Apr 3, 2018
// I added a patch based on https://github.com/lodash/lodash/commit/d8e069cc3410082e44eb18fcf8e7f3d08ebe1d4a
// in order to resolve https://hackerone.com/reports/310443
// -@mikermcneil
//
// ### Mon Aug 19, 2018
// I added a patch based on https://github.com/lodash/lodash/pull/4336/files
// in order to resolve https://snyk.io/vuln/SNYK-JS-LODASH-73638
// -@rachaelshaw
//
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -639,17 +645,18 @@

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Patched from https://github.com/lodash/lodash/commit/d8e069cc3410082e44eb18fcf8e7f3d08ebe1d4a#diff-001d0647fb00f8336795faccdec19a31R1249
// and https://github.com/lodash/lodash/pull/4336/commits/a01e4fa727e7294cb7b2845570ba96b206926790
//```
/**
* Gets the value at `key`, unless `key` is "__proto__".
* Gets the value at `key`, unless `key` is "__proto__" or "constructor".
*
* @private
* @param {Object} object The object to query.
* @param {string} key The key of the property to get.
* @returns {*} Returns the property value.
*/
function safeGet(object, key) {
return key == '__proto__'
return key == '__proto__' || (key === 'constructor' && typeof object[key] === 'function')
? undefined
: object[key];
}
Expand Down Expand Up @@ -2587,7 +2594,7 @@
return;
}
}
var value = object[key],
var value = safeGet(object, key),
result = customizer ? customizer(value, srcValue, key, object, source) : undefined,
isCommon = result === undefined;

Expand Down