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

JS: Merge 'main' into shared dataflow branch #18326

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

JS: Merge 'main' into shared dataflow branch #18326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33e8bd5
JS: Update testUtilities import
asgerf Dec 19, 2024
c204527
JS: Update Array test output (new tests added on main)
asgerf Dec 19, 2024
de5e6dd
JS: Update with changes in TaintTracking test
asgerf Dec 19, 2024
dc2f39c
JS: Add model of Map#groupBy
asgerf Dec 19, 2024
cd6ebb1
JS: Make test not assume implicit through for maps
asgerf Dec 19, 2024
4a6030c
JS: Update expected with some absent result sets
asgerf Dec 19, 2024
f8dc7eb
JS: Update output from tests that changed on main
asgerf Dec 19, 2024
942ba18
JS: Minor test output change in nodes/edges
asgerf Dec 19, 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
20 changes: 20 additions & 0 deletions javascript/ql/lib/semmle/javascript/internal/flow_summaries/Maps.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,23 @@ class MapSet extends SummarizedCallable {
)
}
}

class MapGroupBy extends SummarizedCallable {
MapGroupBy() { this = "Map#groupBy" }

override DataFlow::CallNode getACallSimple() {
result = mapConstructorRef().getAMemberCall("groupBy") and
result.getNumArgument() = 2
}

override predicate propagatesFlow(string input, string output, boolean preservesValue) {
preservesValue = true and
(
input = "Argument[0].ArrayElement" and
output = ["Argument[1].Parameter[0]", "ReturnValue.MapValue.ArrayElement"]
or
input = "Argument[1].ReturnValue" and
output = "ReturnValue.MapKey"
)
}
}
2 changes: 1 addition & 1 deletion javascript/ql/lib/utils/test/InlineFlowTest.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ private import semmle.javascript.frameworks.data.internal.ApiGraphModelsExtensio
private import internal.InlineExpectationsTestImpl

private module FlowTestImpl implements InputSig<Location, JSDataFlow> {
import testUtilities.InlineFlowTestUtil
import utils.test.InlineFlowTestUtil

bindingset[src, sink]
string getArgString(DataFlow::Node src, DataFlow::Node sink) {
Expand Down
6 changes: 6 additions & 0 deletions javascript/ql/test/library-tests/Arrays/DataFlow.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ flow
| arrays.js:2:16:2:23 | "source" | arrays.js:90:10:90:10 | x |
| arrays.js:2:16:2:23 | "source" | arrays.js:93:8:93:17 | arr.at(-1) |
| arrays.js:2:16:2:23 | "source" | arrays.js:110:8:110:24 | arr8_spread.pop() |
| arrays.js:2:16:2:23 | "source" | arrays.js:112:8:112:33 | arr.fin ... llback) |
| arrays.js:18:22:18:29 | "source" | arrays.js:18:50:18:50 | e |
| arrays.js:22:15:22:22 | "source" | arrays.js:23:8:23:17 | arr2.pop() |
| arrays.js:25:15:25:22 | "source" | arrays.js:26:8:26:17 | arr3.pop() |
Expand All @@ -31,3 +32,8 @@ flow
| arrays.js:97:9:97:16 | "source" | arrays.js:97:8:97:42 | ["sourc ... ).pop() |
| arrays.js:100:31:100:38 | "source" | arrays.js:101:8:101:17 | arr8.pop() |
| arrays.js:104:55:104:62 | "source" | arrays.js:106:8:106:25 | arr8_variant.pop() |
| arrays.js:115:19:115:26 | "source" | arrays.js:116:50:116:53 | item |
| arrays.js:115:19:115:26 | "source" | arrays.js:117:10:117:16 | element |
| arrays.js:121:19:121:26 | "source" | arrays.js:122:46:122:49 | item |
| arrays.js:121:19:121:26 | "source" | arrays.js:123:10:123:16 | element |
| arrays.js:127:19:127:26 | "source" | arrays.js:128:55:128:58 | item |
2 changes: 1 addition & 1 deletion javascript/ql/test/library-tests/Arrays/DataFlow.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ deprecated class LegacyConfig extends DataFlow::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}

deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>

query predicate flow = TestFlow::flow/2;
11 changes: 11 additions & 0 deletions javascript/ql/test/library-tests/Arrays/TaintFlow.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ flow
| arrays.js:2:16:2:23 | "source" | arrays.js:90:10:90:10 | x |
| arrays.js:2:16:2:23 | "source" | arrays.js:93:8:93:17 | arr.at(-1) |
| arrays.js:2:16:2:23 | "source" | arrays.js:110:8:110:24 | arr8_spread.pop() |
| arrays.js:2:16:2:23 | "source" | arrays.js:112:8:112:33 | arr.fin ... llback) |
| arrays.js:18:22:18:29 | "source" | arrays.js:18:50:18:50 | e |
| arrays.js:22:15:22:22 | "source" | arrays.js:23:8:23:17 | arr2.pop() |
| arrays.js:25:15:25:22 | "source" | arrays.js:26:8:26:17 | arr3.pop() |
Expand All @@ -32,3 +33,13 @@ flow
| arrays.js:97:9:97:16 | "source" | arrays.js:97:8:97:42 | ["sourc ... ).pop() |
| arrays.js:100:31:100:38 | "source" | arrays.js:101:8:101:17 | arr8.pop() |
| arrays.js:104:55:104:62 | "source" | arrays.js:106:8:106:25 | arr8_variant.pop() |
| arrays.js:115:19:115:26 | "source" | arrays.js:116:50:116:53 | item |
| arrays.js:115:19:115:26 | "source" | arrays.js:117:10:117:16 | element |
| arrays.js:121:19:121:26 | "source" | arrays.js:122:46:122:49 | item |
| arrays.js:121:19:121:26 | "source" | arrays.js:123:10:123:16 | element |
| arrays.js:127:19:127:26 | "source" | arrays.js:128:55:128:58 | item |
| arrays.js:132:17:132:24 | source() | arrays.js:133:46:133:49 | item |
| arrays.js:132:17:132:24 | source() | arrays.js:134:10:134:17 | element1 |
| arrays.js:138:17:138:24 | source() | arrays.js:139:50:139:53 | item |
| arrays.js:138:17:138:24 | source() | arrays.js:140:10:140:17 | element1 |
| arrays.js:144:17:144:24 | source() | arrays.js:145:55:145:58 | item |
2 changes: 1 addition & 1 deletion javascript/ql/test/library-tests/Arrays/TaintFlow.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}

deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>

query predicate flow = TestFlow::flow/2;
Loading
Loading