Skip to content

Commit eef60c9

Browse files
committed
python: add test for "ReturnValue.TupleElement[0,1]"
also synchronise files
1 parent 533b637 commit eef60c9

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

python/ql/test/experimental/dataflow/model-summaries/InlineTaintTest.ext.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extensions:
33
pack: codeql/python-all
44
extensible: summaryModel
55
data:
6-
- ["foo", "Member[MS_identity]", "Argument[0]", "ReturnValue", "value"]
6+
- ["foo", "Member[MS_identity]", "Argument[0,x:]", "ReturnValue", "value"]
77
- ["foo", "Member[MS_apply_lambda]", "Argument[1]", "Argument[0].Parameter[0]", "value"]
88
- ["foo", "Member[MS_apply_lambda]", "Argument[0].ReturnValue", "ReturnValue", "value"]
99
- ["foo", "Member[MS_reversed]", "Argument[0].ListElement", "ReturnValue.ListElement", "value"]
@@ -17,4 +17,5 @@ extensions:
1717
- ["foo", "Member[MS_append_to_list]", "Argument[1]", "ReturnValue", "taint"]
1818
- ["foo", "Member[MS_spread]", "Argument[0]", "ReturnValue.TupleElement[0]", "value"]
1919
- ["foo", "Member[MS_spread]", "Argument[1]", "ReturnValue.TupleElement[1]", "value"]
20+
- ["foo", "Member[MS_spread_all]", "Argument[0]", "ReturnValue.TupleElement[0,1]", "value"]
2021
- ["json", "Member[MS_loads]", "Argument[0]", "ReturnValue", "taint"]

python/ql/test/experimental/dataflow/model-summaries/NormalDataflowTest.ext.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ extensions:
1717
- ["foo", "Member[MS_append_to_list]", "Argument[1]", "ReturnValue", "taint"]
1818
- ["foo", "Member[MS_spread]", "Argument[0]", "ReturnValue.TupleElement[0]", "value"]
1919
- ["foo", "Member[MS_spread]", "Argument[1]", "ReturnValue.TupleElement[1]", "value"]
20+
- ["foo", "Member[MS_spread_all]", "Argument[0]", "ReturnValue.TupleElement[0,1]", "value"]
2021
- ["json", "Member[MS_loads]", "Argument[0]", "ReturnValue", "taint"]

python/ql/test/experimental/dataflow/model-summaries/model_summaries.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def SINK_F(x):
3030
ensure_tainted = ensure_not_tainted = print
3131
TAINTED_STRING = "TAINTED_STRING"
3232

33-
from foo import MS_identity, MS_apply_lambda, MS_reversed, MS_list_map, MS_append_to_list, MS_spread
33+
from foo import MS_identity, MS_apply_lambda, MS_reversed, MS_list_map, MS_append_to_list, MS_spread, MS_spread_all
3434

3535
# Simple summary
3636
via_identity = MS_identity(SOURCE)
@@ -118,6 +118,10 @@ def explicit_identity(x):
118118
SINK_F(x)
119119
SINK(y) # $ flow="SOURCE, l:-2 -> y"
120120

121+
a, b = MS_spread_all(SOURCE)
122+
SINK(a) # $ flow="SOURCE, l:-1 -> a"
123+
SINK(b) # $ flow="SOURCE, l:-2 -> b"
124+
121125
# Modeled flow-summary is not value preserving
122126
from json import MS_loads as json_loads
123127

0 commit comments

Comments
 (0)