Skip to content

Commit eecace7

Browse files
tausbntausbn
committed
Python: Fix or disable CPs introduced by #2700 and #2875.
1 parent 228bd73 commit eecace7

File tree

5 files changed

+41
-66
lines changed

5 files changed

+41
-66
lines changed

‎python/ql/src/semmle/python/dataflow/Implementation.qll‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,8 @@ private class EssaTaintTracking extends string {
726726
private TaintKind iterable_unpacking_descent(
727727
SequenceNode left_parent, ControlFlowNode left_defn, CollectionKind parent_kind
728728
) {
729+
//TODO: Fix the cartesian product in this predicate
730+
none() and
729731
left_parent.getAnElement() = left_defn and
730732
// Handle `a, *b = some_iterable`
731733
if left_defn instanceof StarredNode

‎python/ql/src/semmle/python/security/strings/External.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,19 +223,19 @@ class UrlsplitUrlparseTempSanitizer extends Sanitizer {
223223
or
224224
full_use.(AttrNode).getObject() = test.getInput().getAUse()
225225
|
226-
clears_taint(_, full_use, test.getTest(), test.getSense())
226+
clears_taint(full_use, test.getTest(), test.getSense())
227227
)
228228
}
229229

230-
private predicate clears_taint(ControlFlowNode final_test, ControlFlowNode tainted, ControlFlowNode test, boolean sense) {
231-
test_equality_with_const(final_test, tainted, sense)
230+
private predicate clears_taint(ControlFlowNode tainted, ControlFlowNode test, boolean sense) {
231+
test_equality_with_const(test, tainted, sense)
232232
or
233-
test_in_const_seq(final_test, tainted, sense)
233+
test_in_const_seq(test, tainted, sense)
234234
or
235235
test.(UnaryExprNode).getNode().getOp() instanceof Not and
236236
exists(ControlFlowNode nested_test |
237237
nested_test = test.(UnaryExprNode).getOperand() and
238-
clears_taint(final_test, tainted, nested_test, sense.booleanNot())
238+
clears_taint(tainted, nested_test, sense.booleanNot())
239239
)
240240
}
241241

‎python/ql/test/3/library-tests/taint/unpacking/TestTaint.expected‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
| test.py:11 | extended_unpacking | first | externally controlled string |
2-
| test.py:11 | extended_unpacking | last | externally controlled string |
3-
| test.py:11 | extended_unpacking | rest | [externally controlled string] |
4-
| test.py:16 | also_allowed | a | [externally controlled string] |
1+
| test.py:11 | extended_unpacking | first | NO TAINT |
2+
| test.py:11 | extended_unpacking | last | NO TAINT |
3+
| test.py:11 | extended_unpacking | rest | NO TAINT |
4+
| test.py:16 | also_allowed | a | NO TAINT |
55
| test.py:24 | also_allowed | b | NO TAINT |
66
| test.py:24 | also_allowed | c | NO TAINT |
7-
| test.py:31 | nested | x | externally controlled string |
8-
| test.py:31 | nested | xs | [externally controlled string] |
9-
| test.py:31 | nested | ys | [externally controlled string] |
7+
| test.py:31 | nested | x | NO TAINT |
8+
| test.py:31 | nested | xs | NO TAINT |
9+
| test.py:31 | nested | ys | NO TAINT |

‎python/ql/test/library-tests/taint/unpacking/TestStep.expected‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,8 @@
11
| Taint [[externally controlled string]] | test.py:19 | test.py:19:10:19:18 | List | | --> | Taint [[externally controlled string]] | test.py:22 | test.py:22:28:22:29 | ll | |
22
| Taint [[externally controlled string]] | test.py:19 | test.py:19:10:19:18 | List | | --> | Taint [[externally controlled string]] | test.py:26 | test.py:26:28:26:29 | ll | |
33
| Taint [[externally controlled string]] | test.py:19 | test.py:19:10:19:18 | List | | --> | Taint [[externally controlled string]] | test.py:30 | test.py:30:28:30:29 | ll | |
4-
| Taint [[externally controlled string]] | test.py:22 | test.py:22:28:22:29 | ll | | --> | Taint [externally controlled string] | test.py:23 | test.py:23:22:23:22 | b | |
5-
| Taint [[externally controlled string]] | test.py:22 | test.py:22:28:22:29 | ll | | --> | Taint [externally controlled string] | test.py:23 | test.py:23:25:23:25 | c | |
6-
| Taint [[externally controlled string]] | test.py:22 | test.py:22:28:22:29 | ll | | --> | Taint externally controlled string | test.py:23 | test.py:23:10:23:11 | a1 | |
7-
| Taint [[externally controlled string]] | test.py:22 | test.py:22:28:22:29 | ll | | --> | Taint externally controlled string | test.py:23 | test.py:23:14:23:15 | a2 | |
8-
| Taint [[externally controlled string]] | test.py:22 | test.py:22:28:22:29 | ll | | --> | Taint externally controlled string | test.py:23 | test.py:23:18:23:19 | a3 | |
9-
| Taint [[externally controlled string]] | test.py:26 | test.py:26:28:26:29 | ll | | --> | Taint [externally controlled string] | test.py:27 | test.py:27:22:27:22 | b | |
10-
| Taint [[externally controlled string]] | test.py:26 | test.py:26:28:26:29 | ll | | --> | Taint [externally controlled string] | test.py:27 | test.py:27:25:27:25 | c | |
11-
| Taint [[externally controlled string]] | test.py:26 | test.py:26:28:26:29 | ll | | --> | Taint externally controlled string | test.py:27 | test.py:27:10:27:11 | a1 | |
12-
| Taint [[externally controlled string]] | test.py:26 | test.py:26:28:26:29 | ll | | --> | Taint externally controlled string | test.py:27 | test.py:27:14:27:15 | a2 | |
13-
| Taint [[externally controlled string]] | test.py:26 | test.py:26:28:26:29 | ll | | --> | Taint externally controlled string | test.py:27 | test.py:27:18:27:19 | a3 | |
14-
| Taint [[externally controlled string]] | test.py:30 | test.py:30:28:30:29 | ll | | --> | Taint [externally controlled string] | test.py:31 | test.py:31:22:31:22 | b | |
15-
| Taint [[externally controlled string]] | test.py:30 | test.py:30:28:30:29 | ll | | --> | Taint [externally controlled string] | test.py:31 | test.py:31:25:31:25 | c | |
16-
| Taint [[externally controlled string]] | test.py:30 | test.py:30:28:30:29 | ll | | --> | Taint externally controlled string | test.py:31 | test.py:31:10:31:11 | a1 | |
17-
| Taint [[externally controlled string]] | test.py:30 | test.py:30:28:30:29 | ll | | --> | Taint externally controlled string | test.py:31 | test.py:31:14:31:15 | a2 | |
18-
| Taint [[externally controlled string]] | test.py:30 | test.py:30:28:30:29 | ll | | --> | Taint externally controlled string | test.py:31 | test.py:31:18:31:19 | a3 | |
19-
| Taint [[externally controlled string]] | test.py:47 | test.py:47:28:47:54 | Tuple | | --> | Taint externally controlled string | test.py:48 | test.py:48:10:48:10 | a | |
20-
| Taint [[externally controlled string]] | test.py:47 | test.py:47:28:47:54 | Tuple | | --> | Taint externally controlled string | test.py:48 | test.py:48:13:48:13 | b | |
21-
| Taint [[externally controlled string]] | test.py:47 | test.py:47:28:47:54 | Tuple | | --> | Taint externally controlled string | test.py:48 | test.py:48:16:48:16 | c | |
22-
| Taint [[externally controlled string]] | test.py:47 | test.py:47:28:47:54 | Tuple | | --> | Taint externally controlled string | test.py:48 | test.py:48:19:48:19 | d | |
23-
| Taint [[externally controlled string]] | test.py:47 | test.py:47:28:47:54 | Tuple | | --> | Taint externally controlled string | test.py:48 | test.py:48:22:48:22 | e | |
24-
| Taint [[externally controlled string]] | test.py:47 | test.py:47:28:47:54 | Tuple | | --> | Taint externally controlled string | test.py:48 | test.py:48:25:48:25 | f | |
254
| Taint [externally controlled string] | test.py:6 | test.py:6:9:6:20 | TAINTED_LIST | | --> | Taint [externally controlled string] | test.py:7 | test.py:7:15:7:15 | l | |
26-
| Taint [externally controlled string] | test.py:7 | test.py:7:15:7:15 | l | | --> | Taint externally controlled string | test.py:8 | test.py:8:10:8:10 | a | |
27-
| Taint [externally controlled string] | test.py:7 | test.py:7:15:7:15 | l | | --> | Taint externally controlled string | test.py:8 | test.py:8:13:8:13 | b | |
28-
| Taint [externally controlled string] | test.py:7 | test.py:7:15:7:15 | l | | --> | Taint externally controlled string | test.py:8 | test.py:8:16:8:16 | c | |
295
| Taint [externally controlled string] | test.py:12 | test.py:12:9:12:20 | TAINTED_LIST | | --> | Taint [externally controlled string] | test.py:13 | test.py:13:17:13:17 | l | |
30-
| Taint [externally controlled string] | test.py:13 | test.py:13:17:13:17 | l | | --> | Taint externally controlled string | test.py:14 | test.py:14:10:14:10 | a | |
31-
| Taint [externally controlled string] | test.py:13 | test.py:13:17:13:17 | l | | --> | Taint externally controlled string | test.py:14 | test.py:14:13:14:13 | b | |
32-
| Taint [externally controlled string] | test.py:13 | test.py:13:17:13:17 | l | | --> | Taint externally controlled string | test.py:14 | test.py:14:16:14:16 | c | |
336
| Taint [externally controlled string] | test.py:18 | test.py:18:9:18:20 | TAINTED_LIST | | --> | Taint [externally controlled string] | test.py:19 | test.py:19:11:19:11 | l | |
347
| Taint [externally controlled string] | test.py:18 | test.py:18:9:18:20 | TAINTED_LIST | | --> | Taint [externally controlled string] | test.py:19 | test.py:19:14:19:14 | l | |
358
| Taint [externally controlled string] | test.py:18 | test.py:18:9:18:20 | TAINTED_LIST | | --> | Taint [externally controlled string] | test.py:19 | test.py:19:17:19:17 | l | |

‎python/ql/test/library-tests/taint/unpacking/TestTaint.expected‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
| test.py:8 | unpacking | a | externally controlled string |
2-
| test.py:8 | unpacking | b | externally controlled string |
3-
| test.py:8 | unpacking | c | externally controlled string |
4-
| test.py:14 | unpacking_to_list | a | externally controlled string |
5-
| test.py:14 | unpacking_to_list | b | externally controlled string |
6-
| test.py:14 | unpacking_to_list | c | externally controlled string |
7-
| test.py:23 | nested | a1 | externally controlled string |
8-
| test.py:23 | nested | a2 | externally controlled string |
9-
| test.py:23 | nested | a3 | externally controlled string |
10-
| test.py:23 | nested | b | [externally controlled string] |
11-
| test.py:23 | nested | c | [externally controlled string] |
12-
| test.py:27 | nested | a1 | externally controlled string |
13-
| test.py:27 | nested | a2 | externally controlled string |
14-
| test.py:27 | nested | a3 | externally controlled string |
15-
| test.py:27 | nested | b | [externally controlled string] |
16-
| test.py:27 | nested | c | [externally controlled string] |
17-
| test.py:31 | nested | a1 | externally controlled string |
18-
| test.py:31 | nested | a2 | externally controlled string |
19-
| test.py:31 | nested | a3 | externally controlled string |
20-
| test.py:31 | nested | b | [externally controlled string] |
21-
| test.py:31 | nested | c | [externally controlled string] |
1+
| test.py:8 | unpacking | a | NO TAINT |
2+
| test.py:8 | unpacking | b | NO TAINT |
3+
| test.py:8 | unpacking | c | NO TAINT |
4+
| test.py:14 | unpacking_to_list | a | NO TAINT |
5+
| test.py:14 | unpacking_to_list | b | NO TAINT |
6+
| test.py:14 | unpacking_to_list | c | NO TAINT |
7+
| test.py:23 | nested | a1 | NO TAINT |
8+
| test.py:23 | nested | a2 | NO TAINT |
9+
| test.py:23 | nested | a3 | NO TAINT |
10+
| test.py:23 | nested | b | NO TAINT |
11+
| test.py:23 | nested | c | NO TAINT |
12+
| test.py:27 | nested | a1 | NO TAINT |
13+
| test.py:27 | nested | a2 | NO TAINT |
14+
| test.py:27 | nested | a3 | NO TAINT |
15+
| test.py:27 | nested | b | NO TAINT |
16+
| test.py:27 | nested | c | NO TAINT |
17+
| test.py:31 | nested | a1 | NO TAINT |
18+
| test.py:31 | nested | a2 | NO TAINT |
19+
| test.py:31 | nested | a3 | NO TAINT |
20+
| test.py:31 | nested | b | NO TAINT |
21+
| test.py:31 | nested | c | NO TAINT |
2222
| test.py:38 | unpack_from_set | a | NO TAINT |
2323
| test.py:38 | unpack_from_set | b | NO TAINT |
2424
| test.py:38 | unpack_from_set | c | NO TAINT |
25-
| test.py:48 | contrived_1 | a | externally controlled string |
26-
| test.py:48 | contrived_1 | b | externally controlled string |
27-
| test.py:48 | contrived_1 | c | externally controlled string |
28-
| test.py:48 | contrived_1 | d | externally controlled string |
29-
| test.py:48 | contrived_1 | e | externally controlled string |
30-
| test.py:48 | contrived_1 | f | externally controlled string |
25+
| test.py:48 | contrived_1 | a | NO TAINT |
26+
| test.py:48 | contrived_1 | b | NO TAINT |
27+
| test.py:48 | contrived_1 | c | NO TAINT |
28+
| test.py:48 | contrived_1 | d | NO TAINT |
29+
| test.py:48 | contrived_1 | e | NO TAINT |
30+
| test.py:48 | contrived_1 | f | NO TAINT |
3131
| test.py:56 | contrived_2 | a | NO TAINT |
3232
| test.py:56 | contrived_2 | b | NO TAINT |
3333
| test.py:56 | contrived_2 | c | NO TAINT |

0 commit comments

Comments
 (0)