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

JS: Fix jump steps generated by IIFEs and exception flow #18043

Open
wants to merge 19 commits into
base: js/shared-dataflow-branch
Choose a base branch
from
Open

JS: Fix jump steps generated by IIFEs and exception flow #18043

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5ed362f
JS: Add exception test case
asgerf Nov 4, 2024
7acc568
JS: Port exception steps to a universal summary
asgerf Aug 22, 2024
7f2eae0
JS: Add test case for false flow through IIFEs
asgerf Nov 18, 2024
37676f4
JS: Remove jump steps from IIFE steps
asgerf Nov 1, 2024
023dcce
JS: Disable variable capture heuristic
asgerf Nov 1, 2024
d2daec4
JS: Add tests explaining why the IIFE in f2 didn't work
asgerf Nov 19, 2024
80a5a59
JS: Use getUnderlyingValue() a few places in VariableCapture
asgerf Nov 19, 2024
0166990
JS: Block InsecureRandomness flow into test files
asgerf Nov 1, 2024
d1c9e47
JS: More aggressive test file classification
asgerf Nov 1, 2024
b7dd455
JS: Add test case
asgerf Nov 21, 2024
dcdb2e5
JS: Fix callback check so it works without parameters
asgerf Nov 21, 2024
948d21c
JS: Propagate exceptions from summarized callables by default
asgerf Nov 21, 2024
84820ad
Add test for exception flow out of finally()
asgerf Nov 21, 2024
4e62a51
JS: Only apply exception propagator when no other summary applies
asgerf Nov 21, 2024
ce00bd2
JS: More docs
asgerf Nov 21, 2024
9dad2d6
JS: Update DataFlowConsistency
asgerf Nov 21, 2024
1ac7591
JS: Update missed flow in capture-flow.js
asgerf Nov 21, 2024
7a77432
JS: Update lost result in insecure-download
asgerf Nov 21, 2024
930a7b6
JS: Update output changes to nodes/edges/subpaths
asgerf Nov 21, 2024
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
17 changes: 16 additions & 1 deletion javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,14 +1217,29 @@ predicate simpleLocalFlowStep(Node node1, Node node2) {

predicate localMustFlowStep(Node node1, Node node2) { node1 = node2.getImmediatePredecessor() }

/**
* Holds if `node1 -> node2` should be removed as a jump step.
*
* Currently this is done as a workaround for the local steps generated from IIFEs.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Currently"?
Is that hinting towards plans for a another solution in the future?

Copy link
Contributor Author

@asgerf asgerf Nov 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general this predicate can populated with jump steps that should be excluded, and currently the only use-case for this is the workaround mentioned. So it was meant to imply that other things could get added to the predicate as well.

*/
private predicate excludedJumpStep(Node node1, Node node2) {
exists(ImmediatelyInvokedFunctionExpr iife |
iife.argumentPassing(node2.asExpr(), node1.asExpr())
or
node1 = iife.getAReturnedExpr().flow() and
node2 = iife.getInvocation().flow()
)
}

/**
* Holds if data can flow from `node1` to `node2` through a non-local step
* that does not follow a call edge. For example, a step through a global
* variable.
*/
predicate jumpStep(Node node1, Node node2) {
valuePreservingStep(node1, node2) and
node1.getContainer() != node2.getContainer()
node1.getContainer() != node2.getContainer() and
not excludedJumpStep(node1, node2)
or
FlowSummaryPrivate::Steps::summaryJumpStep(node1.(FlowSummaryNode).getSummaryNode(),
node2.(FlowSummaryNode).getSummaryNode())
Expand Down
12 changes: 6 additions & 6 deletions javascript/ql/test/library-tests/TripleDot/iife.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ function f1() {
return p; // argument to return
})(x);
}
sink(inner(source("f1.1"))); // $ hasValueFlow=f1.1 SPURIOUS: hasValueFlow=f1.2
sink(inner(source("f1.2"))); // $ hasValueFlow=f1.2 SPURIOUS: hasValueFlow=f1.1
sink(inner(source("f1.1"))); // $ hasValueFlow=f1.1
sink(inner(source("f1.2"))); // $ hasValueFlow=f1.2
}

function f2() {
Expand All @@ -16,8 +16,8 @@ function f2() {
})(x);
return y;
}
sink(inner(source("f2.1"))); // $ hasValueFlow=f2.1 SPURIOUS: hasValueFlow=f2.2
sink(inner(source("f2.2"))); // $ hasValueFlow=f2.2 SPURIOUS: hasValueFlow=f2.1
sink(inner(source("f2.1"))); // $ MISSING: hasValueFlow=f2.1
sink(inner(source("f2.2"))); // $ MISSING: hasValueFlow=f2.2
}

function f3() {
Expand All @@ -26,8 +26,8 @@ function f3() {
return x; // captured variable to return
})();
}
sink(inner(source("f3.1"))); // $ hasValueFlow=f3.1 SPURIOUS: hasValueFlow=f3.2
sink(inner(source("f3.2"))); // $ hasValueFlow=f3.2 SPURIOUS: hasValueFlow=f3.1
sink(inner(source("f3.1"))); // $ hasValueFlow=f3.1
sink(inner(source("f3.2"))); // $ hasValueFlow=f3.2
}

function f4() {
Expand Down