Skip to content

Security Fix for Prototype Pollution - huntr.dev #20

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

Merged
BadOPCode merged 4 commits into from
Nov 11, 2021
Merged

Security Fix for Prototype Pollution - huntr.dev #20

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
309c6b4
Security fix for Prototype Pollution
arjunshibu Dec 21, 2020
f290a00
Merge pull request #1 from arjunshibu/master
JamieSlome Jan 14, 2021
d6b9567
Merge branch 'master' into 1-npm-ts-nodash
BadOPCode Aug 31, 2021
81459f5
Merge branch 'master' into 1-npm-ts-nodash
BadOPCode Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Merge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,18 @@ const handleDefaultBehavior = (originalObject: any, newObject: any, behavior?:
if (originalTypeName === "Object" && newTypeName === "Object") { // built-in behavior
// tslint:disable:forin
for (const p in newObject) {
if (isPrototypePolluted(p)) continue
originalObject[p] = processBehavior(originalObject[p], newObject[p], behavior);
}
// tslint:enable:forin
return originalObject;
}
};

const isPrototypePolluted = (key: any) => {
return ['__proto__', 'constructor', 'prototype'].includes(key)
}

/**
* Recursively merge two objects together.
* @param originalObject The base object. Properties here will be overwritten
Expand All @@ -72,7 +77,7 @@ export const Merge = (originalObject: any, newObject: any, behavior?: IMergeBeha
return definedBehaviorResults;
}
}

return handleDefaultBehavior(originalObject, newObject, behavior);
};

Expand Down