Skip to content

Commit d1caf2a

Browse files
authored
Merge pull request #23088 from knewbury01/knewbury01/add-mono-api-mad-java
Add Mono API MaD java
2 parents 7b9ee04 + b30d7b4 commit d1caf2a

8 files changed

Lines changed: 519 additions & 0 deletions

File tree

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Added taint flow model for `reactor.core.publisher.Mono<T>`.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"extensions": [
3+
{
4+
"addsTo": {
5+
"pack": "codeql/java-all",
6+
"extensible": "summaryModel"
7+
},
8+
"data": [
9+
["reactor.core.publisher", "Mono", true, "justOrEmpty", "(Object)", "", "Argument[0]", "ReturnValue.Element", "value", "manual"],
10+
["reactor.core.publisher", "Mono", true, "justOrEmpty", "(Optional)", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"],
11+
["reactor.core.publisher", "Mono", true, "just", "", "", "Argument[0]", "ReturnValue.Element", "value", "manual"],
12+
["reactor.core.publisher", "Mono", true, "flatMap", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"],
13+
["reactor.core.publisher", "Mono", true, "flatMap", "", "", "Argument[0].ReturnValue.Element", "ReturnValue.Element", "value", "manual"],
14+
["reactor.core.publisher", "Mono", true, "map", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"],
15+
["reactor.core.publisher", "Mono", true, "map", "", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"],
16+
["reactor.core.publisher", "Mono", true, "mapNotNull", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"],
17+
["reactor.core.publisher", "Mono", true, "mapNotNull", "", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"]
18+
]
19+
}
20+
]
21+
}
Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
import java.util.Optional;
2+
import reactor.core.publisher.Mono;
3+
4+
public class Test {
5+
6+
void sink(Object o) {}
7+
8+
String taint() {
9+
return null;
10+
}
11+
12+
void testJust() {
13+
Mono<String> unsafe = Mono.just(taint());
14+
unsafe.map(value -> {
15+
sink(value); // $ hasValueFlow
16+
return value;
17+
});
18+
Mono<String> safe = Mono.just("safe");
19+
safe.map(value -> {
20+
sink(value); // no taint flow
21+
return value;
22+
});
23+
}
24+
25+
void testJustOrEmpty() {
26+
Mono<String> unsafe = Mono.justOrEmpty(taint());
27+
unsafe.map(value -> {
28+
sink(value); // $ hasValueFlow
29+
return value;
30+
});
31+
Mono<String> safe = Mono.justOrEmpty("safe");
32+
safe.map(value -> {
33+
sink(value); // no taint flow
34+
return value;
35+
});
36+
}
37+
38+
void testJustOrEmptyOptional() {
39+
Mono<String> unsafe = Mono.justOrEmpty(Optional.of(taint()));
40+
unsafe.map(value -> {
41+
sink(value); // $ hasValueFlow
42+
return value;
43+
});
44+
Mono<String> safe = Mono.justOrEmpty(Optional.of("safe"));
45+
safe.map(value -> {
46+
sink(value); // no taint flow
47+
return value;
48+
});
49+
Mono<String> empty = Mono.justOrEmpty(Optional.<String>empty());
50+
empty.map(value -> {
51+
sink(value); // no taint flow
52+
return value;
53+
});
54+
}
55+
56+
void testFlatMap() {
57+
Mono.just(taint()).flatMap(value -> {
58+
sink(value); // $ hasValueFlow
59+
return Mono.just("safe");
60+
});
61+
Mono.just("safe").flatMap(value -> {
62+
sink(value); // no taint flow
63+
return Mono.just("safe");
64+
});
65+
}
66+
67+
void testMap() {
68+
Mono.just(taint()).map(value -> {
69+
sink(value); // $ hasValueFlow
70+
return "safe";
71+
});
72+
Mono.just("safe").map(value -> {
73+
sink(value); // no taint flow
74+
return "safe";
75+
});
76+
}
77+
78+
void testMapNotNull() {
79+
Mono.just(taint()).mapNotNull(value -> {
80+
sink(value); // $ hasValueFlow
81+
return "safe";
82+
});
83+
Mono.just("safe").mapNotNull(value -> {
84+
sink(value); // no taint flow
85+
return "safe";
86+
});
87+
}
88+
89+
void testFlatMapResult() {
90+
Mono.just("safe").flatMap(value -> Mono.just(taint())).map(value -> {
91+
sink(value); // $ hasValueFlow
92+
return value;
93+
});
94+
Mono.just(taint()).flatMap(value -> Mono.just("safe")).map(value -> {
95+
sink(value); // no taint flow
96+
return value;
97+
});
98+
}
99+
100+
void testMapResult() {
101+
Mono.just("safe").map(value -> taint()).map(value -> {
102+
sink(value); // $ hasValueFlow
103+
return value;
104+
});
105+
Mono.just(taint()).map(value -> "safe").map(value -> {
106+
sink(value); // no taint flow
107+
return value;
108+
});
109+
}
110+
111+
void testMapNotNullResult() {
112+
Mono.just("safe").mapNotNull(value -> taint()).map(value -> {
113+
sink(value); // $ hasValueFlow
114+
return value;
115+
});
116+
Mono.just(taint()).mapNotNull(value -> "safe").map(value -> {
117+
sink(value); // no taint flow
118+
return value;
119+
});
120+
}
121+
122+
void testNestedValues() {
123+
Mono.just(Optional.of(taint())).flatMap(value -> {
124+
sink(value.get()); // $ hasValueFlow
125+
return Mono.just("safe");
126+
});
127+
Mono.just(Optional.of(taint())).map(value -> {
128+
sink(value.get()); // $ hasValueFlow
129+
return "safe";
130+
});
131+
Mono.just(Optional.of(taint())).mapNotNull(value -> {
132+
sink(value.get()); // $ hasValueFlow
133+
return "safe";
134+
});
135+
}
136+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/reactor-core
Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
models
2+
| 1 | Summary: java.util; Optional; false; get; ; ; Argument[this].Element; ReturnValue; value; manual |
3+
| 2 | Summary: java.util; Optional; false; of; ; ; Argument[0]; ReturnValue.Element; value; manual |
4+
| 3 | Summary: reactor.core.publisher; Mono; true; flatMap; ; ; Argument[0].ReturnValue.Element; ReturnValue.Element; value; manual |
5+
| 4 | Summary: reactor.core.publisher; Mono; true; flatMap; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
6+
| 5 | Summary: reactor.core.publisher; Mono; true; just; ; ; Argument[0]; ReturnValue.Element; value; manual |
7+
| 6 | Summary: reactor.core.publisher; Mono; true; justOrEmpty; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
8+
| 7 | Summary: reactor.core.publisher; Mono; true; justOrEmpty; (Optional); ; Argument[0].Element; ReturnValue.Element; value; manual |
9+
| 8 | Summary: reactor.core.publisher; Mono; true; map; ; ; Argument[0].ReturnValue; ReturnValue.Element; value; manual |
10+
| 9 | Summary: reactor.core.publisher; Mono; true; map; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
11+
| 10 | Summary: reactor.core.publisher; Mono; true; mapNotNull; ; ; Argument[0].ReturnValue; ReturnValue.Element; value; manual |
12+
| 11 | Summary: reactor.core.publisher; Mono; true; mapNotNull; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
13+
edges
14+
| Test.java:13:31:13:48 | just(...) : Mono [<element>] : String | Test.java:14:9:14:14 | unsafe : Mono [<element>] : String | provenance | |
15+
| Test.java:13:41:13:47 | taint(...) : String | Test.java:13:31:13:48 | just(...) : Mono [<element>] : String | provenance | MaD:5 |
16+
| Test.java:14:9:14:14 | unsafe : Mono [<element>] : String | Test.java:14:20:14:24 | value : String | provenance | MaD:9 |
17+
| Test.java:14:20:14:24 | value : String | Test.java:15:18:15:22 | value | provenance | |
18+
| Test.java:26:31:26:55 | justOrEmpty(...) : Mono [<element>] : String | Test.java:27:9:27:14 | unsafe : Mono [<element>] : String | provenance | |
19+
| Test.java:26:48:26:54 | taint(...) : String | Test.java:26:31:26:55 | justOrEmpty(...) : Mono [<element>] : String | provenance | MaD:6 |
20+
| Test.java:27:9:27:14 | unsafe : Mono [<element>] : String | Test.java:27:20:27:24 | value : String | provenance | MaD:9 |
21+
| Test.java:27:20:27:24 | value : String | Test.java:28:18:28:22 | value | provenance | |
22+
| Test.java:39:31:39:68 | justOrEmpty(...) : Mono [<element>] : String | Test.java:40:9:40:14 | unsafe : Mono [<element>] : String | provenance | |
23+
| Test.java:39:48:39:67 | of(...) : Optional [<element>] : String | Test.java:39:31:39:68 | justOrEmpty(...) : Mono [<element>] : String | provenance | MaD:7 |
24+
| Test.java:39:60:39:66 | taint(...) : String | Test.java:39:48:39:67 | of(...) : Optional [<element>] : String | provenance | MaD:2 |
25+
| Test.java:40:9:40:14 | unsafe : Mono [<element>] : String | Test.java:40:20:40:24 | value : String | provenance | MaD:9 |
26+
| Test.java:40:20:40:24 | value : String | Test.java:41:18:41:22 | value | provenance | |
27+
| Test.java:57:9:57:26 | just(...) : Mono [<element>] : String | Test.java:57:36:57:40 | value : String | provenance | MaD:4 |
28+
| Test.java:57:19:57:25 | taint(...) : String | Test.java:57:9:57:26 | just(...) : Mono [<element>] : String | provenance | MaD:5 |
29+
| Test.java:57:36:57:40 | value : String | Test.java:58:18:58:22 | value | provenance | |
30+
| Test.java:68:9:68:26 | just(...) : Mono [<element>] : String | Test.java:68:32:68:36 | value : String | provenance | MaD:9 |
31+
| Test.java:68:19:68:25 | taint(...) : String | Test.java:68:9:68:26 | just(...) : Mono [<element>] : String | provenance | MaD:5 |
32+
| Test.java:68:32:68:36 | value : String | Test.java:69:18:69:22 | value | provenance | |
33+
| Test.java:79:9:79:26 | just(...) : Mono [<element>] : String | Test.java:79:39:79:43 | value : String | provenance | MaD:11 |
34+
| Test.java:79:19:79:25 | taint(...) : String | Test.java:79:9:79:26 | just(...) : Mono [<element>] : String | provenance | MaD:5 |
35+
| Test.java:79:39:79:43 | value : String | Test.java:80:18:80:22 | value | provenance | |
36+
| Test.java:90:9:90:62 | flatMap(...) : Mono [<element>] : String | Test.java:90:68:90:72 | value : String | provenance | MaD:9 |
37+
| Test.java:90:44:90:61 | just(...) : Mono [<element>] : String | Test.java:90:9:90:62 | flatMap(...) : Mono [<element>] : String | provenance | MaD:3 |
38+
| Test.java:90:54:90:60 | taint(...) : String | Test.java:90:44:90:61 | just(...) : Mono [<element>] : String | provenance | MaD:5 |
39+
| Test.java:90:68:90:72 | value : String | Test.java:91:18:91:22 | value | provenance | |
40+
| Test.java:101:9:101:47 | map(...) : Mono [<element>] : String | Test.java:101:53:101:57 | value : String | provenance | MaD:9 |
41+
| Test.java:101:40:101:46 | taint(...) : String | Test.java:101:9:101:47 | map(...) : Mono [<element>] : String | provenance | MaD:8 |
42+
| Test.java:101:53:101:57 | value : String | Test.java:102:18:102:22 | value | provenance | |
43+
| Test.java:112:9:112:54 | mapNotNull(...) : Mono [<element>] : String | Test.java:112:60:112:64 | value : String | provenance | MaD:9 |
44+
| Test.java:112:47:112:53 | taint(...) : String | Test.java:112:9:112:54 | mapNotNull(...) : Mono [<element>] : String | provenance | MaD:10 |
45+
| Test.java:112:60:112:64 | value : String | Test.java:113:18:113:22 | value | provenance | |
46+
| Test.java:123:9:123:39 | just(...) : Mono [<element>, <element>] : String | Test.java:123:49:123:53 | value : Optional [<element>] : String | provenance | MaD:4 |
47+
| Test.java:123:19:123:38 | of(...) : Optional [<element>] : String | Test.java:123:9:123:39 | just(...) : Mono [<element>, <element>] : String | provenance | MaD:5 |
48+
| Test.java:123:31:123:37 | taint(...) : String | Test.java:123:19:123:38 | of(...) : Optional [<element>] : String | provenance | MaD:2 |
49+
| Test.java:123:49:123:53 | value : Optional [<element>] : String | Test.java:124:18:124:22 | value : Optional [<element>] : String | provenance | |
50+
| Test.java:124:18:124:22 | value : Optional [<element>] : String | Test.java:124:18:124:28 | get(...) | provenance | MaD:1 |
51+
| Test.java:127:9:127:39 | just(...) : Mono [<element>, <element>] : String | Test.java:127:45:127:49 | value : Optional [<element>] : String | provenance | MaD:9 |
52+
| Test.java:127:19:127:38 | of(...) : Optional [<element>] : String | Test.java:127:9:127:39 | just(...) : Mono [<element>, <element>] : String | provenance | MaD:5 |
53+
| Test.java:127:31:127:37 | taint(...) : String | Test.java:127:19:127:38 | of(...) : Optional [<element>] : String | provenance | MaD:2 |
54+
| Test.java:127:45:127:49 | value : Optional [<element>] : String | Test.java:128:18:128:22 | value : Optional [<element>] : String | provenance | |
55+
| Test.java:128:18:128:22 | value : Optional [<element>] : String | Test.java:128:18:128:28 | get(...) | provenance | MaD:1 |
56+
| Test.java:131:9:131:39 | just(...) : Mono [<element>, <element>] : String | Test.java:131:52:131:56 | value : Optional [<element>] : String | provenance | MaD:11 |
57+
| Test.java:131:19:131:38 | of(...) : Optional [<element>] : String | Test.java:131:9:131:39 | just(...) : Mono [<element>, <element>] : String | provenance | MaD:5 |
58+
| Test.java:131:31:131:37 | taint(...) : String | Test.java:131:19:131:38 | of(...) : Optional [<element>] : String | provenance | MaD:2 |
59+
| Test.java:131:52:131:56 | value : Optional [<element>] : String | Test.java:132:18:132:22 | value : Optional [<element>] : String | provenance | |
60+
| Test.java:132:18:132:22 | value : Optional [<element>] : String | Test.java:132:18:132:28 | get(...) | provenance | MaD:1 |
61+
nodes
62+
| Test.java:13:31:13:48 | just(...) : Mono [<element>] : String | semmle.label | just(...) : Mono [<element>] : String |
63+
| Test.java:13:41:13:47 | taint(...) : String | semmle.label | taint(...) : String |
64+
| Test.java:14:9:14:14 | unsafe : Mono [<element>] : String | semmle.label | unsafe : Mono [<element>] : String |
65+
| Test.java:14:20:14:24 | value : String | semmle.label | value : String |
66+
| Test.java:15:18:15:22 | value | semmle.label | value |
67+
| Test.java:26:31:26:55 | justOrEmpty(...) : Mono [<element>] : String | semmle.label | justOrEmpty(...) : Mono [<element>] : String |
68+
| Test.java:26:48:26:54 | taint(...) : String | semmle.label | taint(...) : String |
69+
| Test.java:27:9:27:14 | unsafe : Mono [<element>] : String | semmle.label | unsafe : Mono [<element>] : String |
70+
| Test.java:27:20:27:24 | value : String | semmle.label | value : String |
71+
| Test.java:28:18:28:22 | value | semmle.label | value |
72+
| Test.java:39:31:39:68 | justOrEmpty(...) : Mono [<element>] : String | semmle.label | justOrEmpty(...) : Mono [<element>] : String |
73+
| Test.java:39:48:39:67 | of(...) : Optional [<element>] : String | semmle.label | of(...) : Optional [<element>] : String |
74+
| Test.java:39:60:39:66 | taint(...) : String | semmle.label | taint(...) : String |
75+
| Test.java:40:9:40:14 | unsafe : Mono [<element>] : String | semmle.label | unsafe : Mono [<element>] : String |
76+
| Test.java:40:20:40:24 | value : String | semmle.label | value : String |
77+
| Test.java:41:18:41:22 | value | semmle.label | value |
78+
| Test.java:57:9:57:26 | just(...) : Mono [<element>] : String | semmle.label | just(...) : Mono [<element>] : String |
79+
| Test.java:57:19:57:25 | taint(...) : String | semmle.label | taint(...) : String |
80+
| Test.java:57:36:57:40 | value : String | semmle.label | value : String |
81+
| Test.java:58:18:58:22 | value | semmle.label | value |
82+
| Test.java:68:9:68:26 | just(...) : Mono [<element>] : String | semmle.label | just(...) : Mono [<element>] : String |
83+
| Test.java:68:19:68:25 | taint(...) : String | semmle.label | taint(...) : String |
84+
| Test.java:68:32:68:36 | value : String | semmle.label | value : String |
85+
| Test.java:69:18:69:22 | value | semmle.label | value |
86+
| Test.java:79:9:79:26 | just(...) : Mono [<element>] : String | semmle.label | just(...) : Mono [<element>] : String |
87+
| Test.java:79:19:79:25 | taint(...) : String | semmle.label | taint(...) : String |
88+
| Test.java:79:39:79:43 | value : String | semmle.label | value : String |
89+
| Test.java:80:18:80:22 | value | semmle.label | value |
90+
| Test.java:90:9:90:62 | flatMap(...) : Mono [<element>] : String | semmle.label | flatMap(...) : Mono [<element>] : String |
91+
| Test.java:90:44:90:61 | just(...) : Mono [<element>] : String | semmle.label | just(...) : Mono [<element>] : String |
92+
| Test.java:90:54:90:60 | taint(...) : String | semmle.label | taint(...) : String |
93+
| Test.java:90:68:90:72 | value : String | semmle.label | value : String |
94+
| Test.java:91:18:91:22 | value | semmle.label | value |
95+
| Test.java:101:9:101:47 | map(...) : Mono [<element>] : String | semmle.label | map(...) : Mono [<element>] : String |
96+
| Test.java:101:40:101:46 | taint(...) : String | semmle.label | taint(...) : String |
97+
| Test.java:101:53:101:57 | value : String | semmle.label | value : String |
98+
| Test.java:102:18:102:22 | value | semmle.label | value |
99+
| Test.java:112:9:112:54 | mapNotNull(...) : Mono [<element>] : String | semmle.label | mapNotNull(...) : Mono [<element>] : String |
100+
| Test.java:112:47:112:53 | taint(...) : String | semmle.label | taint(...) : String |
101+
| Test.java:112:60:112:64 | value : String | semmle.label | value : String |
102+
| Test.java:113:18:113:22 | value | semmle.label | value |
103+
| Test.java:123:9:123:39 | just(...) : Mono [<element>, <element>] : String | semmle.label | just(...) : Mono [<element>, <element>] : String |
104+
| Test.java:123:19:123:38 | of(...) : Optional [<element>] : String | semmle.label | of(...) : Optional [<element>] : String |
105+
| Test.java:123:31:123:37 | taint(...) : String | semmle.label | taint(...) : String |
106+
| Test.java:123:49:123:53 | value : Optional [<element>] : String | semmle.label | value : Optional [<element>] : String |
107+
| Test.java:124:18:124:22 | value : Optional [<element>] : String | semmle.label | value : Optional [<element>] : String |
108+
| Test.java:124:18:124:28 | get(...) | semmle.label | get(...) |
109+
| Test.java:127:9:127:39 | just(...) : Mono [<element>, <element>] : String | semmle.label | just(...) : Mono [<element>, <element>] : String |
110+
| Test.java:127:19:127:38 | of(...) : Optional [<element>] : String | semmle.label | of(...) : Optional [<element>] : String |
111+
| Test.java:127:31:127:37 | taint(...) : String | semmle.label | taint(...) : String |
112+
| Test.java:127:45:127:49 | value : Optional [<element>] : String | semmle.label | value : Optional [<element>] : String |
113+
| Test.java:128:18:128:22 | value : Optional [<element>] : String | semmle.label | value : Optional [<element>] : String |
114+
| Test.java:128:18:128:28 | get(...) | semmle.label | get(...) |
115+
| Test.java:131:9:131:39 | just(...) : Mono [<element>, <element>] : String | semmle.label | just(...) : Mono [<element>, <element>] : String |
116+
| Test.java:131:19:131:38 | of(...) : Optional [<element>] : String | semmle.label | of(...) : Optional [<element>] : String |
117+
| Test.java:131:31:131:37 | taint(...) : String | semmle.label | taint(...) : String |
118+
| Test.java:131:52:131:56 | value : Optional [<element>] : String | semmle.label | value : Optional [<element>] : String |
119+
| Test.java:132:18:132:22 | value : Optional [<element>] : String | semmle.label | value : Optional [<element>] : String |
120+
| Test.java:132:18:132:28 | get(...) | semmle.label | get(...) |
121+
subpaths
122+
testFailures
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import java
2+
import utils.test.InlineFlowTest
3+
import DefaultFlowTest
4+
import TaintFlow::PathGraph

0 commit comments

Comments
 (0)