Skip to content

Commit 379f56c

Browse files
asgerfasgerf
committed
unified: Add callback tests
1 parent 7a82544 commit 379f56c

3 files changed

Lines changed: 63 additions & 0 deletions

File tree

‎unified/ql/test/library-tests/dataflow/flow-summaries.swift‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,24 @@ func t5() {
3535
let z = TestType.readUnusualName(y)
3636
sink(z) // $ hasValueFlow=t5.1
3737
}
38+
39+
func t6() {
40+
let x = source("t6.1")
41+
TestType.intoCallback(x) { y in
42+
sink(y) // $ hasValueFlow=t6.1
43+
}
44+
}
45+
46+
func t7() {
47+
let y = TestType.outOfCallback {
48+
return source("t7.1")
49+
}
50+
sink(y) // $ hasValueFlow=t7.1
51+
}
52+
53+
func t8() {
54+
sink(TestType.throughCallback(source("t8.1")) { y in return y }) // $ hasValueFlow=t8.1
55+
sink(TestType.throughCallback(source("t8.2")) { y in return y + "x" }) // $ hasTaintFlow=t8.2
56+
sink(TestType.throughCallback("safe") { y in return y }) // no flow
57+
sink(TestType.throughCallback(source("t8.3")) { y in return "safe" }) // no flow
58+
}

‎unified/ql/test/library-tests/dataflow/test.expected‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,20 @@ edges
212212
| flow-summaries.swift:35:9:35:9 | z | flow-summaries.swift:36:10:36:10 | z | provenance | |
213213
| flow-summaries.swift:35:13:35:39 | ... .readUnusualName(...) | flow-summaries.swift:35:9:35:9 | z | provenance | |
214214
| flow-summaries.swift:35:38:35:38 | y [unusualNameNotAppearingInSourceCode] | flow-summaries.swift:35:13:35:39 | ... .readUnusualName(...) | provenance | |
215+
| flow-summaries.swift:40:9:40:9 | x | flow-summaries.swift:41:27:41:27 | x | provenance | |
216+
| flow-summaries.swift:40:13:40:26 | source(...) | flow-summaries.swift:40:9:40:9 | x | provenance | |
217+
| flow-summaries.swift:41:27:41:27 | x | flow-summaries.swift:41:32:41:32 | y | provenance | |
218+
| flow-summaries.swift:41:32:41:32 | y | flow-summaries.swift:42:14:42:14 | y | provenance | |
219+
| flow-summaries.swift:47:9:47:9 | y | flow-summaries.swift:50:10:50:10 | y | provenance | |
220+
| flow-summaries.swift:47:13:49:5 | ... .outOfCallback(...) | flow-summaries.swift:47:9:47:9 | y | provenance | |
221+
| flow-summaries.swift:48:16:48:29 | source(...) | flow-summaries.swift:47:13:49:5 | ... .outOfCallback(...) | provenance | |
222+
| flow-summaries.swift:54:35:54:48 | source(...) | flow-summaries.swift:54:10:54:67 | ... .throughCallback(...) | provenance | |
223+
| flow-summaries.swift:54:35:54:48 | source(...) | flow-summaries.swift:54:53:54:53 | y | provenance | |
224+
| flow-summaries.swift:54:53:54:53 | y | flow-summaries.swift:54:65:54:65 | y | provenance | |
225+
| flow-summaries.swift:55:35:55:48 | source(...) | flow-summaries.swift:55:10:55:73 | ... .throughCallback(...) | provenance | |
226+
| flow-summaries.swift:55:35:55:48 | source(...) | flow-summaries.swift:55:53:55:53 | y | provenance | |
227+
| flow-summaries.swift:55:53:55:53 | y | flow-summaries.swift:55:65:55:65 | y | provenance | |
228+
| flow-summaries.swift:55:65:55:65 | y | flow-summaries.swift:55:65:55:71 | ... + ... | provenance | |
215229
| implicit-self.swift:16:9:16:12 | [post] self [x] | implicit-self.swift:17:14:17:17 | self [x] | provenance | |
216230
| implicit-self.swift:16:9:16:14 | ... .x | implicit-self.swift:16:9:16:12 | [post] self [x] | provenance | |
217231
| implicit-self.swift:16:18:16:31 | source(...) | implicit-self.swift:16:9:16:14 | ... .x | provenance | |
@@ -658,6 +672,24 @@ nodes
658672
| flow-summaries.swift:35:13:35:39 | ... .readUnusualName(...) | semmle.label | ... .readUnusualName(...) |
659673
| flow-summaries.swift:35:38:35:38 | y [unusualNameNotAppearingInSourceCode] | semmle.label | y [unusualNameNotAppearingInSourceCode] |
660674
| flow-summaries.swift:36:10:36:10 | z | semmle.label | z |
675+
| flow-summaries.swift:40:9:40:9 | x | semmle.label | x |
676+
| flow-summaries.swift:40:13:40:26 | source(...) | semmle.label | source(...) |
677+
| flow-summaries.swift:41:27:41:27 | x | semmle.label | x |
678+
| flow-summaries.swift:41:32:41:32 | y | semmle.label | y |
679+
| flow-summaries.swift:42:14:42:14 | y | semmle.label | y |
680+
| flow-summaries.swift:47:9:47:9 | y | semmle.label | y |
681+
| flow-summaries.swift:47:13:49:5 | ... .outOfCallback(...) | semmle.label | ... .outOfCallback(...) |
682+
| flow-summaries.swift:48:16:48:29 | source(...) | semmle.label | source(...) |
683+
| flow-summaries.swift:50:10:50:10 | y | semmle.label | y |
684+
| flow-summaries.swift:54:10:54:67 | ... .throughCallback(...) | semmle.label | ... .throughCallback(...) |
685+
| flow-summaries.swift:54:35:54:48 | source(...) | semmle.label | source(...) |
686+
| flow-summaries.swift:54:53:54:53 | y | semmle.label | y |
687+
| flow-summaries.swift:54:65:54:65 | y | semmle.label | y |
688+
| flow-summaries.swift:55:10:55:73 | ... .throughCallback(...) | semmle.label | ... .throughCallback(...) |
689+
| flow-summaries.swift:55:35:55:48 | source(...) | semmle.label | source(...) |
690+
| flow-summaries.swift:55:53:55:53 | y | semmle.label | y |
691+
| flow-summaries.swift:55:65:55:65 | y | semmle.label | y |
692+
| flow-summaries.swift:55:65:55:71 | ... + ... | semmle.label | ... + ... |
661693
| implicit-self.swift:16:9:16:12 | [post] self [x] | semmle.label | [post] self [x] |
662694
| implicit-self.swift:16:9:16:14 | ... .x | semmle.label | ... .x |
663695
| implicit-self.swift:16:18:16:31 | source(...) | semmle.label | source(...) |
@@ -908,6 +940,8 @@ subpaths
908940
| capture.swift:49:13:49:13 | x | capture.swift:45:22:45:24 | arg | capture.swift:46:9:46:9 | y | capture.swift:50:10:50:10 | y |
909941
| capture.swift:60:13:60:13 | x | capture.swift:56:22:56:24 | arg | capture.swift:57:9:57:9 | [post] y [0] | capture.swift:61:10:61:10 | y [0] |
910942
| capture.swift:94:13:94:17 | local [x] | capture.swift:99:16:99:16 | x | capture.swift:99:16:99:16 | x | capture.swift:94:13:94:19 | local(...) |
943+
| flow-summaries.swift:54:35:54:48 | source(...) | flow-summaries.swift:54:53:54:53 | y | flow-summaries.swift:54:65:54:65 | y | flow-summaries.swift:54:10:54:67 | ... .throughCallback(...) |
944+
| flow-summaries.swift:55:35:55:48 | source(...) | flow-summaries.swift:55:53:55:53 | y | flow-summaries.swift:55:65:55:71 | ... + ... | flow-summaries.swift:55:10:55:73 | ... .throughCallback(...) |
911945
| test.swift:196:30:196:44 | source(...) | test.swift:189:22:189:22 | s | test.swift:189:58:189:58 | s | test.swift:196:16:196:45 | asyncIdentity(...) |
912946
| test.swift:200:31:200:45 | source(...) | test.swift:191:25:191:25 | s | test.swift:191:62:191:62 | s | test.swift:200:14:200:46 | throwingIdentity(...) |
913947
| test.swift:201:37:201:51 | source(...) | test.swift:191:25:191:25 | s | test.swift:191:62:191:62 | s | test.swift:201:20:201:52 | throwingIdentity(...) |
@@ -973,6 +1007,10 @@ testFailures
9731007
| flow-summaries.swift:18:10:18:10 | y | flow-summaries.swift:16:34:16:47 | source(...) | flow-summaries.swift:18:10:18:10 | y | $@ | flow-summaries.swift:16:34:16:47 | source(...) | source(...) |
9741008
| flow-summaries.swift:29:10:29:24 | ... .outputField | flow-summaries.swift:25:13:25:26 | source(...) | flow-summaries.swift:29:10:29:24 | ... .outputField | $@ | flow-summaries.swift:25:13:25:26 | source(...) | source(...) |
9751009
| flow-summaries.swift:36:10:36:10 | z | flow-summaries.swift:33:13:33:26 | source(...) | flow-summaries.swift:36:10:36:10 | z | $@ | flow-summaries.swift:33:13:33:26 | source(...) | source(...) |
1010+
| flow-summaries.swift:42:14:42:14 | y | flow-summaries.swift:40:13:40:26 | source(...) | flow-summaries.swift:42:14:42:14 | y | $@ | flow-summaries.swift:40:13:40:26 | source(...) | source(...) |
1011+
| flow-summaries.swift:50:10:50:10 | y | flow-summaries.swift:48:16:48:29 | source(...) | flow-summaries.swift:50:10:50:10 | y | $@ | flow-summaries.swift:48:16:48:29 | source(...) | source(...) |
1012+
| flow-summaries.swift:54:10:54:67 | ... .throughCallback(...) | flow-summaries.swift:54:35:54:48 | source(...) | flow-summaries.swift:54:10:54:67 | ... .throughCallback(...) | $@ | flow-summaries.swift:54:35:54:48 | source(...) | source(...) |
1013+
| flow-summaries.swift:55:10:55:73 | ... .throughCallback(...) | flow-summaries.swift:55:35:55:48 | source(...) | flow-summaries.swift:55:10:55:73 | ... .throughCallback(...) | $@ | flow-summaries.swift:55:35:55:48 | source(...) | source(...) |
9761014
| implicit-self.swift:17:14:17:19 | ... .x | implicit-self.swift:16:18:16:31 | source(...) | implicit-self.swift:17:14:17:19 | ... .x | $@ | implicit-self.swift:16:18:16:31 | source(...) | source(...) |
9771015
| implicit-self.swift:23:14:23:14 | x | implicit-self.swift:22:13:22:26 | source(...) | implicit-self.swift:23:14:23:14 | x | $@ | implicit-self.swift:22:13:22:26 | source(...) | source(...) |
9781016
| implicit-self.swift:29:14:29:19 | ... .x | implicit-self.swift:28:13:28:26 | source(...) | implicit-self.swift:29:14:29:19 | ... .x | $@ | implicit-self.swift:28:13:28:26 | source(...) | source(...) |

‎unified/ql/test/library-tests/dataflow/test.ext.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ extensions:
99
- ["", "TestType", true, "postUpdateArg(_:output:)", "", "", "Argument[0]", "Argument[output:].Member[outputField]", "value", "manual"]
1010
- ["", "TestType", true, "storeUnusualName(_:)", "", "", "Argument[0]", "ReturnValue.Member[unusualNameNotAppearingInSourceCode]", "value", "manual"]
1111
- ["", "TestType", true, "readUnusualName(_:)", "", "", "Argument[0].Member[unusualNameNotAppearingInSourceCode]", "ReturnValue", "value", "manual"]
12+
- ["", "TestType", true, "intoCallback(_:_:)", "", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "manual"]
13+
- ["", "TestType", true, "outOfCallback(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
14+
- ["", "TestType", true, "throughCallback(_:_:)", "", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "manual"]
15+
- ["", "TestType", true, "throughCallback(_:_:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]

0 commit comments

Comments
 (0)