Skip to content

Commit ffbd0f6

Browse files
erik-krogherik-krogh
committed
update expected test output
1 parent b3b132c commit ffbd0f6

7 files changed

Lines changed: 79 additions & 29 deletions

File tree

‎javascript/ql/test/library-tests/InterProceduralFlow/DataFlow.expected‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@
2222
| partial.js:5:15:5:24 | "tainted1" | partial.js:15:15:15:15 | x |
2323
| partial.js:5:15:5:24 | "tainted1" | partial.js:21:15:21:15 | x |
2424
| partial.js:5:15:5:24 | "tainted1" | partial.js:27:15:27:15 | x |
25-
| promises.js:2:16:2:24 | "tainted" | promises.js:7:16:7:18 | val |
26-
| promises.js:2:16:2:24 | "tainted" | promises.js:38:32:38:32 | v |
27-
| promises.js:11:22:11:31 | "resolved" | promises.js:19:20:19:20 | v |
2825
| promises.js:12:22:12:31 | "rejected" | promises.js:21:20:21:20 | v |
2926
| promises.js:12:22:12:31 | "rejected" | promises.js:24:20:24:20 | v |
30-
| promises.js:32:24:32:37 | "also tainted" | promises.js:38:32:38:32 | v |
3127
| properties2.js:7:14:7:21 | "source" | properties2.js:8:12:8:24 | foo(source).p |
3228
| properties2.js:7:14:7:21 | "source" | properties2.js:33:13:33:20 | getP(o3) |
3329
| properties.js:2:16:2:24 | "tainted" | properties.js:5:14:5:23 | a.someProp |

‎javascript/ql/test/library-tests/InterProceduralFlow/GermanFlow.expected‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,8 @@
2323
| partial.js:5:15:5:24 | "tainted1" | partial.js:15:15:15:15 | x |
2424
| partial.js:5:15:5:24 | "tainted1" | partial.js:21:15:21:15 | x |
2525
| partial.js:5:15:5:24 | "tainted1" | partial.js:27:15:27:15 | x |
26-
| promises.js:2:16:2:24 | "tainted" | promises.js:7:16:7:18 | val |
27-
| promises.js:2:16:2:24 | "tainted" | promises.js:38:32:38:32 | v |
28-
| promises.js:11:22:11:31 | "resolved" | promises.js:19:20:19:20 | v |
2926
| promises.js:12:22:12:31 | "rejected" | promises.js:21:20:21:20 | v |
3027
| promises.js:12:22:12:31 | "rejected" | promises.js:24:20:24:20 | v |
31-
| promises.js:32:24:32:37 | "also tainted" | promises.js:38:32:38:32 | v |
3228
| properties2.js:7:14:7:21 | "source" | properties2.js:8:12:8:24 | foo(source).p |
3329
| properties2.js:7:14:7:21 | "source" | properties2.js:33:13:33:20 | getP(o3) |
3430
| properties.js:2:16:2:24 | "tainted" | properties.js:5:14:5:23 | a.someProp |

‎javascript/ql/test/library-tests/InterProceduralFlow/TrackedNodes.expected‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
| missing | promises.js:10:30:17:3 | exceptional return of anonymous function | promises.js:20:7:20:7 | v |
2+
| missing | promises.js:10:30:17:3 | exceptional return of anonymous function | promises.js:21:20:21:20 | v |
3+
| missing | promises.js:10:30:17:3 | exceptional return of anonymous function | promises.js:23:19:23:19 | v |
4+
| missing | promises.js:10:30:17:3 | exceptional return of anonymous function | promises.js:24:20:24:20 | v |
5+
| missing | promises.js:12:22:12:31 | "rejected" | promises.js:20:7:20:7 | v |
6+
| missing | promises.js:12:22:12:31 | "rejected" | promises.js:21:20:21:20 | v |
7+
| missing | promises.js:12:22:12:31 | "rejected" | promises.js:23:19:23:19 | v |
8+
| missing | promises.js:12:22:12:31 | "rejected" | promises.js:24:20:24:20 | v |
9+
| missing | promises.js:13:9:13:21 | exceptional return of Math.random() | promises.js:20:7:20:7 | v |
10+
| missing | promises.js:13:9:13:21 | exceptional return of Math.random() | promises.js:21:20:21:20 | v |
11+
| missing | promises.js:13:9:13:21 | exceptional return of Math.random() | promises.js:23:19:23:19 | v |
12+
| missing | promises.js:13:9:13:21 | exceptional return of Math.random() | promises.js:24:20:24:20 | v |
13+
| missing | promises.js:14:7:14:21 | exceptional return of res(res_source) | promises.js:20:7:20:7 | v |
14+
| missing | promises.js:14:7:14:21 | exceptional return of res(res_source) | promises.js:21:20:21:20 | v |
15+
| missing | promises.js:14:7:14:21 | exceptional return of res(res_source) | promises.js:23:19:23:19 | v |
16+
| missing | promises.js:14:7:14:21 | exceptional return of res(res_source) | promises.js:24:20:24:20 | v |
17+
| missing | promises.js:16:7:16:21 | exceptional return of rej(rej_source) | promises.js:20:7:20:7 | v |
18+
| missing | promises.js:16:7:16:21 | exceptional return of rej(rej_source) | promises.js:21:20:21:20 | v |
19+
| missing | promises.js:16:7:16:21 | exceptional return of rej(rej_source) | promises.js:23:19:23:19 | v |
20+
| missing | promises.js:16:7:16:21 | exceptional return of rej(rej_source) | promises.js:24:20:24:20 | v |

‎javascript/ql/test/library-tests/Promises/AdditionalPromises.expected‎

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,46 @@
11
| additional-promises.js:2:13:2:57 | new Pin ... ct) {}) |
2-
| flowsteps.js:5:3:5:21 | new Promise(throws) |
3-
| flowsteps.js:8:3:8:21 | new Promise(throws) |
4-
| flowsteps.js:12:11:12:29 | new Promise(throws) |
5-
| flowsteps.js:17:3:17:45 | new Pro ... ect(3)) |
6-
| flowsteps.js:21:11:21:53 | new Pro ... ect(4)) |
7-
| flowsteps.js:26:3:26:21 | new Promise(throws) |
8-
| flowsteps.js:26:3:27:19 | new Pro ... => {}) |
9-
| flowsteps.js:31:3:31:21 | new Promise(throws) |
10-
| flowsteps.js:31:3:32:19 | new Pro ... => {}) |
11-
| flowsteps.js:31:3:33:35 | new Pro ... og(e6)) |
12-
| flowsteps.js:36:19:36:62 | new Pro ... lve(8)) |
13-
| flowsteps.js:38:19:38:62 | new Pro ... lve(9)) |
14-
| flowsteps.js:40:11:40:28 | Promise.resolve(3) |
15-
| flowsteps.js:43:12:49:4 | new Pro ... }\\n }) |
16-
| flowsteps.js:50:19:50:41 | p2.then ... al * 4) |
2+
| flow.js:7:11:7:59 | new Pro ... ource)) |
3+
| flow.js:10:11:10:58 | new Pro ... ource)) |
4+
| flow.js:13:11:13:58 | new Pro ... ource)) |
5+
| flow.js:20:2:20:24 | Promise ... source) |
6+
| flow.js:22:2:22:24 | Promise ... source) |
7+
| flow.js:24:2:24:49 | new Pro ... ource)) |
8+
| flow.js:26:2:26:49 | new Pro ... ource)) |
9+
| flow.js:28:2:28:23 | Promise ... ("foo") |
10+
| flow.js:28:2:28:41 | Promise ... source) |
11+
| flow.js:30:2:30:24 | Promise ... source) |
12+
| flow.js:30:2:30:41 | Promise ... "foo") |
13+
| flow.js:32:2:32:49 | new Pro ... ource)) |
14+
| flow.js:34:2:34:24 | Promise ... source) |
15+
| flow.js:34:2:34:41 | Promise ... => { }) |
16+
| flow.js:36:11:36:33 | Promise ... source) |
17+
| flow.js:37:11:37:29 | p5.catch(() => { }) |
18+
| flow.js:40:2:40:49 | new Pro ... ource)) |
19+
| flow.js:40:2:40:65 | new Pro ... => { }) |
20+
| flow.js:42:2:42:49 | new Pro ... ource)) |
21+
| flow.js:42:2:42:76 | new Pro ... => { }) |
22+
| flow.js:44:2:44:24 | Promise ... source) |
23+
| flow.js:44:2:44:41 | Promise ... => { }) |
24+
| flow.js:44:2:44:58 | Promise ... => { }) |
25+
| flow.js:44:2:44:75 | Promise ... => { }) |
26+
| flow.js:46:2:46:24 | Promise ... source) |
27+
| flow.js:46:2:46:43 | Promise ... => { }) |
28+
| flow.js:48:2:48:36 | new Pro ... urce }) |
29+
| flow.js:53:2:53:22 | createP ... source) |
30+
| flow.js:55:11:55:58 | new Pro ... ource)) |
31+
| flow.js:56:11:56:27 | p8.then(() => {}) |
32+
| flow.js:57:12:57:31 | p9.finally(() => {}) |
33+
| flow.js:60:12:60:59 | new Pro ... ource)) |
34+
| flow.js:61:12:61:29 | p11.then(() => {}) |
35+
| flow.js:65:9:65:56 | new Pro ... ource)) |
36+
| flow.js:74:10:74:57 | new Pro ... ource)) |
37+
| flow.js:76:2:76:17 | chainedPromise() |
38+
| flow.js:76:2:76:32 | chained ... => {}) |
39+
| flow.js:86:23:86:70 | new Pro ... ource)) |
40+
| interflow.js:6:3:6:25 | loadScr ... urce()) |
41+
| interflow.js:6:3:7:26 | loadScr ... () { }) |
42+
| interflow.js:6:3:8:26 | loadScr ... () { }) |
43+
| interflow.js:11:12:15:6 | new Pro ... \\n }) |
1744
| promises.js:3:17:5:4 | new Pro ... );\\n }) |
1845
| promises.js:10:18:17:4 | new Pro ... );\\n }) |
1946
| promises.js:33:19:35:6 | new Pro ... \\n }) |

‎javascript/ql/test/library-tests/Promises/flow.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,14 @@
7474
return new Promise((resolve, reject) => reject(source)).then(() => {});
7575
}
7676
chainedPromise().then(() => {}).catch(e => sink(e)); // NOT OK!
77+
78+
function leaksResolvedPromise(p) {
79+
p.then(x => sink(x)); // NOT OK!
80+
}
81+
leaksResolvedPromise(Promise.resolve(source));
82+
83+
function leaksRejectedPromise(p) {
84+
p.catch(e => sink(e)); // NOT OK!
85+
}
86+
leaksRejectedPromise(new Promise((resolve, reject) => reject(source)));
7787
})();

‎javascript/ql/test/library-tests/Promises/tests.expected‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ test_ResolvedPromiseDefinition
99
| flow.js:44:2:44:24 | Promise ... source) | flow.js:44:18:44:23 | source |
1010
| flow.js:46:2:46:24 | Promise ... source) | flow.js:46:18:46:23 | source |
1111
| flow.js:51:10:51:29 | Promise.resolve(src) | flow.js:51:26:51:28 | src |
12+
| flow.js:81:23:81:45 | Promise ... source) | flow.js:81:39:81:44 | source |
1213
| promises.js:53:19:53:41 | Promise ... source) | promises.js:53:35:53:40 | source |
1314
| promises.js:62:19:62:41 | Promise ... source) | promises.js:62:35:62:40 | source |
1415
| promises.js:71:5:71:27 | Promise ... source) | promises.js:71:21:71:26 | source |
@@ -34,6 +35,7 @@ test_PromiseDefinition_getExecutor
3435
| flow.js:60:12:60:59 | new Pro ... ource)) | flow.js:60:24:60:58 | (resolv ... source) |
3536
| flow.js:65:9:65:56 | new Pro ... ource)) | flow.js:65:21:65:55 | (resolv ... source) |
3637
| flow.js:74:10:74:57 | new Pro ... ource)) | flow.js:74:22:74:56 | (resolv ... source) |
38+
| flow.js:86:23:86:70 | new Pro ... ource)) | flow.js:86:35:86:69 | (resolv ... source) |
3739
| interflow.js:11:12:15:6 | new Pro ... \\n }) | interflow.js:11:24:15:5 | functio ... ;\\n } |
3840
| promises.js:3:17:5:4 | new Pro ... );\\n }) | promises.js:3:29:5:3 | functio ... e);\\n } |
3941
| promises.js:10:18:17:4 | new Pro ... );\\n }) | promises.js:10:30:17:3 | (res, r ... e);\\n } |
@@ -55,6 +57,7 @@ test_PromiseDefinition
5557
| flow.js:60:12:60:59 | new Pro ... ource)) |
5658
| flow.js:65:9:65:56 | new Pro ... ource)) |
5759
| flow.js:74:10:74:57 | new Pro ... ource)) |
60+
| flow.js:86:23:86:70 | new Pro ... ource)) |
5861
| interflow.js:11:12:15:6 | new Pro ... \\n }) |
5962
| promises.js:3:17:5:4 | new Pro ... );\\n }) |
6063
| promises.js:10:18:17:4 | new Pro ... );\\n }) |
@@ -86,6 +89,7 @@ test_PromiseDefinition_getRejectParameter
8689
| flow.js:60:12:60:59 | new Pro ... ource)) | flow.js:60:34:60:39 | reject |
8790
| flow.js:65:9:65:56 | new Pro ... ource)) | flow.js:65:31:65:36 | reject |
8891
| flow.js:74:10:74:57 | new Pro ... ource)) | flow.js:74:32:74:37 | reject |
92+
| flow.js:86:23:86:70 | new Pro ... ource)) | flow.js:86:45:86:50 | reject |
8993
| interflow.js:11:12:15:6 | new Pro ... \\n }) | interflow.js:11:43:11:48 | reject |
9094
| promises.js:3:17:5:4 | new Pro ... );\\n }) | promises.js:3:48:3:53 | reject |
9195
| promises.js:10:18:17:4 | new Pro ... );\\n }) | promises.js:10:36:10:38 | rej |
@@ -104,6 +108,7 @@ test_PromiseDefinition_getResolveParameter
104108
| flow.js:60:12:60:59 | new Pro ... ource)) | flow.js:60:25:60:31 | resolve |
105109
| flow.js:65:9:65:56 | new Pro ... ource)) | flow.js:65:22:65:28 | resolve |
106110
| flow.js:74:10:74:57 | new Pro ... ource)) | flow.js:74:23:74:29 | resolve |
111+
| flow.js:86:23:86:70 | new Pro ... ource)) | flow.js:86:36:86:42 | resolve |
107112
| interflow.js:11:12:15:6 | new Pro ... \\n }) | interflow.js:11:34:11:40 | resolve |
108113
| promises.js:3:17:5:4 | new Pro ... );\\n }) | promises.js:3:39:3:45 | resolve |
109114
| promises.js:10:18:17:4 | new Pro ... );\\n }) | promises.js:10:31:10:33 | res |
@@ -132,4 +137,6 @@ flow
132137
| flow.js:2:15:2:22 | "source" | flow.js:62:22:62:22 | x |
133138
| flow.js:2:15:2:22 | "source" | flow.js:70:8:70:8 | e |
134139
| flow.js:2:15:2:22 | "source" | flow.js:76:50:76:50 | e |
140+
| flow.js:2:15:2:22 | "source" | flow.js:79:20:79:20 | x |
141+
| flow.js:2:15:2:22 | "source" | flow.js:84:21:84:21 | e |
135142
| interflow.js:3:18:3:25 | "source" | interflow.js:18:10:18:14 | error |

‎javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ nodes
4646
| promises.js:5:44:5:57 | req.query.data |
4747
| promises.js:5:44:5:57 | req.query.data |
4848
| promises.js:6:11:6:11 | x |
49-
| promises.js:6:11:6:11 | x |
50-
| promises.js:6:25:6:25 | x |
5149
| promises.js:6:25:6:25 | x |
5250
| promises.js:6:25:6:25 | x |
5351
| tst2.js:6:7:6:30 | p |
@@ -108,10 +106,6 @@ edges
108106
| promises.js:5:3:5:59 | new Pro ... .data)) | promises.js:6:11:6:11 | x |
109107
| promises.js:5:44:5:57 | req.query.data | promises.js:5:3:5:59 | new Pro ... .data)) |
110108
| promises.js:5:44:5:57 | req.query.data | promises.js:5:3:5:59 | new Pro ... .data)) |
111-
| promises.js:5:44:5:57 | req.query.data | promises.js:6:11:6:11 | x |
112-
| promises.js:5:44:5:57 | req.query.data | promises.js:6:11:6:11 | x |
113-
| promises.js:6:11:6:11 | x | promises.js:6:25:6:25 | x |
114-
| promises.js:6:11:6:11 | x | promises.js:6:25:6:25 | x |
115109
| promises.js:6:11:6:11 | x | promises.js:6:25:6:25 | x |
116110
| promises.js:6:11:6:11 | x | promises.js:6:25:6:25 | x |
117111
| tst2.js:6:7:6:30 | p | tst2.js:7:12:7:12 | p |

0 commit comments

Comments
 (0)