Skip to content

JS: Fix join ordering in PrototypePollutionUtility #2779

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
merged 1 commit into from
Feb 6, 2020
Merged

JS: Fix join ordering in PrototypePollutionUtility #2779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions javascript/ql/src/Security/CWE-400/PrototypePollutionUtility.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ abstract class EnumeratedPropName extends DataFlow::Node {
*/
abstract DataFlow::Node getSourceObject();

/**
* Gets a source node that refers to the object whose properties are being enumerated.
*/
DataFlow::SourceNode getASourceObjectRef() {
result = AccessPath::getAnAliasedSourceNode(getSourceObject())
}

/**
* Gets a property read that accesses the corresponding property value in the source object.
*
Expand All @@ -56,7 +63,7 @@ abstract class EnumeratedPropName extends DataFlow::Node {
SourceNode getASourceProp() {
exists(Node base, Node key |
dynamicPropReadStep(base, key, result) and
AccessPath::getAnAliasedSourceNode(getSourceObject()).flowsTo(base) and
getASourceObjectRef().flowsTo(base) and
key.getImmediatePredecessor*() = this
)
}
Expand Down Expand Up @@ -117,7 +124,7 @@ class EntriesEnumeratedPropName extends EnumeratedPropName {
* Holds if the properties of `node` are enumerated locally.
*/
predicate arePropertiesEnumerated(DataFlow::SourceNode node) {
node = AccessPath::getAnAliasedSourceNode(any(EnumeratedPropName name).getSourceObject())
node = any(EnumeratedPropName name).getASourceObjectRef()
}

/**
Expand Down