Skip to content

Commit 2bb6a39

Browse files
Jami CogswellJami Cogswell
Jami Cogswell
authored and
Jami Cogswell
committed
Java: update tests
1 parent c0ebeb9 commit 2bb6a39

File tree

3 files changed

+45
-58
lines changed

3 files changed

+45
-58
lines changed

‎java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ private module Frameworks {
2929
private import semmle.code.java.frameworks.ratpack.RatpackExec
3030
private import semmle.code.java.frameworks.stapler.Stapler
3131
private import semmle.code.java.security.ListOfConstantsSanitizer
32+
private import semmle.code.java.security.PathSanitizer
3233
}
3334

3435
/**

‎java/ql/test/library-tests/paths/test.expected‎

Lines changed: 41 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
models
22
| 1 | Summary: java.io; File; false; File; ; ; Argument[0]; Argument[this]; taint; manual |
3-
| 2 | Summary: java.io; File; false; File; ; ; Argument[1]; Argument[this]; taint; manual |
4-
| 3 | Summary: java.io; File; true; getAbsoluteFile; ; ; Argument[this]; ReturnValue; taint; manual |
5-
| 4 | Summary: java.io; File; true; getAbsolutePath; ; ; Argument[this]; ReturnValue; taint; manual |
6-
| 5 | Summary: java.io; File; true; getCanonicalFile; ; ; Argument[this]; ReturnValue; taint; manual |
7-
| 6 | Summary: java.io; File; true; getCanonicalPath; ; ; Argument[this]; ReturnValue; taint; manual |
8-
| 7 | Summary: java.io; File; true; toPath; ; ; Argument[this]; ReturnValue; taint; manual |
9-
| 8 | Summary: java.io; File; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
10-
| 9 | Summary: java.io; File; true; toURI; ; ; Argument[this]; ReturnValue; taint; manual |
11-
| 10 | Summary: java.nio.file; FileSystem; true; getPath; (String,String[]); ; Argument[0]; ReturnValue; taint; manual |
12-
| 11 | Summary: java.nio.file; Path; false; toFile; ; ; Argument[this]; ReturnValue; taint; manual |
13-
| 12 | Summary: java.nio.file; Path; true; getParent; ; ; Argument[this]; ReturnValue; taint; manual |
14-
| 13 | Summary: java.nio.file; Path; true; normalize; ; ; Argument[this]; ReturnValue; taint; manual |
15-
| 14 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[0]; ReturnValue; taint; manual |
16-
| 15 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[this]; ReturnValue; taint; manual |
17-
| 16 | Summary: java.nio.file; Path; true; toAbsolutePath; ; ; Argument[this]; ReturnValue; taint; manual |
18-
| 17 | Summary: java.nio.file; Path; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
19-
| 18 | Summary: java.nio.file; Path; true; toUri; ; ; Argument[this]; ReturnValue; taint; manual |
20-
| 19 | Summary: java.nio.file; Paths; true; get; ; ; Argument[0]; ReturnValue; taint; manual |
21-
| 20 | Summary: java.nio.file; Paths; true; get; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
3+
| 2 | Summary: java.io; File; true; getAbsoluteFile; ; ; Argument[this]; ReturnValue; taint; manual |
4+
| 3 | Summary: java.io; File; true; getAbsolutePath; ; ; Argument[this]; ReturnValue; taint; manual |
5+
| 4 | Summary: java.io; File; true; getCanonicalFile; ; ; Argument[this]; ReturnValue; taint; manual |
6+
| 5 | Summary: java.io; File; true; getCanonicalPath; ; ; Argument[this]; ReturnValue; taint; manual |
7+
| 6 | Summary: java.io; File; true; toPath; ; ; Argument[this]; ReturnValue; taint; manual |
8+
| 7 | Summary: java.io; File; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
9+
| 8 | Summary: java.io; File; true; toURI; ; ; Argument[this]; ReturnValue; taint; manual |
10+
| 9 | Summary: java.nio.file; FileSystem; true; getPath; (String,String[]); ; Argument[0]; ReturnValue; taint; manual |
11+
| 10 | Summary: java.nio.file; Path; false; toFile; ; ; Argument[this]; ReturnValue; taint; manual |
12+
| 11 | Summary: java.nio.file; Path; true; getParent; ; ; Argument[this]; ReturnValue; taint; manual |
13+
| 12 | Summary: java.nio.file; Path; true; normalize; ; ; Argument[this]; ReturnValue; taint; manual |
14+
| 13 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[0]; ReturnValue; taint; manual |
15+
| 14 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[this]; ReturnValue; taint; manual |
16+
| 15 | Summary: java.nio.file; Path; true; toAbsolutePath; ; ; Argument[this]; ReturnValue; taint; manual |
17+
| 16 | Summary: java.nio.file; Path; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
18+
| 17 | Summary: java.nio.file; Path; true; toUri; ; ; Argument[this]; ReturnValue; taint; manual |
19+
| 18 | Summary: java.nio.file; Paths; true; get; ; ; Argument[0]; ReturnValue; taint; manual |
20+
| 19 | Summary: java.nio.file; Paths; true; get; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
2221
edges
2322
| Test.java:20:14:20:27 | (...)... : File | Test.java:21:19:21:20 | in : File | provenance | |
2423
| Test.java:20:20:20:27 | source(...) : Object | Test.java:20:14:20:27 | (...)... : File | provenance | |
@@ -36,100 +35,96 @@ edges
3635
| Test.java:41:18:41:25 | source(...) : Object | Test.java:41:13:41:25 | (...)... : URI | provenance | |
3736
| Test.java:42:10:42:21 | new File(...) : File | Test.java:43:9:43:11 | out | provenance | |
3837
| Test.java:42:19:42:20 | in : URI | Test.java:42:10:42:21 | new File(...) : File | provenance | MaD:1 |
39-
| Test.java:48:16:48:31 | (...)... : String | Test.java:49:31:49:32 | in : String | provenance | |
38+
| Test.java:48:16:48:31 | (...)... : String | Test.java:50:9:50:11 | out | provenance | AdditionalTaintStep |
4039
| Test.java:48:24:48:31 | source(...) : Object | Test.java:48:16:48:31 | (...)... : String | provenance | |
41-
| Test.java:49:10:49:33 | new File(...) : File | Test.java:50:9:50:11 | out | provenance | |
42-
| Test.java:49:31:49:32 | in : String | Test.java:49:10:49:33 | new File(...) : File | provenance | MaD:2 |
43-
| Test.java:55:16:55:31 | (...)... : String | Test.java:56:33:56:34 | in : String | provenance | |
40+
| Test.java:55:16:55:31 | (...)... : String | Test.java:57:9:57:11 | out | provenance | AdditionalTaintStep |
4441
| Test.java:55:24:55:31 | source(...) : Object | Test.java:55:16:55:31 | (...)... : String | provenance | |
45-
| Test.java:56:10:56:35 | new File(...) : File | Test.java:57:9:57:11 | out | provenance | |
46-
| Test.java:56:33:56:34 | in : String | Test.java:56:10:56:35 | new File(...) : File | provenance | MaD:2 |
4742
| Test.java:62:14:62:27 | (...)... : File | Test.java:63:10:63:11 | in : File | provenance | |
4843
| Test.java:62:20:62:27 | source(...) : Object | Test.java:62:14:62:27 | (...)... : File | provenance | |
49-
| Test.java:63:10:63:11 | in : File | Test.java:63:10:63:29 | getAbsoluteFile(...) : File | provenance | MaD:3 |
44+
| Test.java:63:10:63:11 | in : File | Test.java:63:10:63:29 | getAbsoluteFile(...) : File | provenance | MaD:2 |
5045
| Test.java:63:10:63:29 | getAbsoluteFile(...) : File | Test.java:64:9:64:11 | out | provenance | |
5146
| Test.java:69:14:69:27 | (...)... : File | Test.java:70:10:70:11 | in : File | provenance | |
5247
| Test.java:69:20:69:27 | source(...) : Object | Test.java:69:14:69:27 | (...)... : File | provenance | |
53-
| Test.java:70:10:70:11 | in : File | Test.java:70:10:70:29 | getAbsolutePath(...) : String | provenance | MaD:4 |
48+
| Test.java:70:10:70:11 | in : File | Test.java:70:10:70:29 | getAbsolutePath(...) : String | provenance | MaD:3 |
5449
| Test.java:70:10:70:29 | getAbsolutePath(...) : String | Test.java:71:9:71:11 | out | provenance | |
5550
| Test.java:76:14:76:27 | (...)... : File | Test.java:77:10:77:11 | in : File | provenance | |
5651
| Test.java:76:20:76:27 | source(...) : Object | Test.java:76:14:76:27 | (...)... : File | provenance | |
57-
| Test.java:77:10:77:11 | in : File | Test.java:77:10:77:30 | getCanonicalFile(...) : File | provenance | MaD:5 |
52+
| Test.java:77:10:77:11 | in : File | Test.java:77:10:77:30 | getCanonicalFile(...) : File | provenance | MaD:4 |
5853
| Test.java:77:10:77:30 | getCanonicalFile(...) : File | Test.java:78:9:78:11 | out | provenance | |
5954
| Test.java:83:14:83:27 | (...)... : File | Test.java:84:10:84:11 | in : File | provenance | |
6055
| Test.java:83:20:83:27 | source(...) : Object | Test.java:83:14:83:27 | (...)... : File | provenance | |
61-
| Test.java:84:10:84:11 | in : File | Test.java:84:10:84:30 | getCanonicalPath(...) : String | provenance | MaD:6 |
56+
| Test.java:84:10:84:11 | in : File | Test.java:84:10:84:30 | getCanonicalPath(...) : String | provenance | MaD:5 |
6257
| Test.java:84:10:84:30 | getCanonicalPath(...) : String | Test.java:85:9:85:11 | out | provenance | |
6358
| Test.java:90:14:90:27 | (...)... : File | Test.java:91:10:91:11 | in : File | provenance | |
6459
| Test.java:90:20:90:27 | source(...) : Object | Test.java:90:14:90:27 | (...)... : File | provenance | |
65-
| Test.java:91:10:91:11 | in : File | Test.java:91:10:91:20 | toPath(...) : Path | provenance | MaD:7 |
60+
| Test.java:91:10:91:11 | in : File | Test.java:91:10:91:20 | toPath(...) : Path | provenance | MaD:6 |
6661
| Test.java:91:10:91:20 | toPath(...) : Path | Test.java:92:9:92:11 | out | provenance | |
6762
| Test.java:97:14:97:27 | (...)... : File | Test.java:98:10:98:11 | in : File | provenance | |
6863
| Test.java:97:20:97:27 | source(...) : Object | Test.java:97:14:97:27 | (...)... : File | provenance | |
69-
| Test.java:98:10:98:11 | in : File | Test.java:98:10:98:22 | toString(...) : String | provenance | MaD:8 |
64+
| Test.java:98:10:98:11 | in : File | Test.java:98:10:98:22 | toString(...) : String | provenance | MaD:7 |
7065
| Test.java:98:10:98:22 | toString(...) : String | Test.java:99:9:99:11 | out | provenance | |
7166
| Test.java:104:14:104:27 | (...)... : File | Test.java:105:10:105:11 | in : File | provenance | |
7267
| Test.java:104:20:104:27 | source(...) : Object | Test.java:104:14:104:27 | (...)... : File | provenance | |
73-
| Test.java:105:10:105:11 | in : File | Test.java:105:10:105:19 | toURI(...) : URI | provenance | MaD:9 |
68+
| Test.java:105:10:105:11 | in : File | Test.java:105:10:105:19 | toURI(...) : URI | provenance | MaD:8 |
7469
| Test.java:105:10:105:19 | toURI(...) : URI | Test.java:106:9:106:11 | out | provenance | |
7570
| Test.java:111:16:111:31 | (...)... : String | Test.java:113:27:113:28 | in : String | provenance | |
7671
| Test.java:111:24:111:31 | source(...) : Object | Test.java:111:16:111:31 | (...)... : String | provenance | |
7772
| Test.java:113:10:113:45 | getPath(...) : Path | Test.java:114:9:114:11 | out | provenance | |
78-
| Test.java:113:27:113:28 | in : String | Test.java:113:10:113:45 | getPath(...) : Path | provenance | MaD:10 |
73+
| Test.java:113:27:113:28 | in : String | Test.java:113:10:113:45 | getPath(...) : Path | provenance | MaD:9 |
7974
| Test.java:119:14:119:27 | (...)... : Path | Test.java:120:10:120:11 | in : Path | provenance | |
8075
| Test.java:119:20:119:27 | source(...) : Object | Test.java:119:14:119:27 | (...)... : Path | provenance | |
81-
| Test.java:120:10:120:11 | in : Path | Test.java:120:10:120:20 | toFile(...) : File | provenance | MaD:11 |
76+
| Test.java:120:10:120:11 | in : Path | Test.java:120:10:120:20 | toFile(...) : File | provenance | MaD:10 |
8277
| Test.java:120:10:120:20 | toFile(...) : File | Test.java:121:9:121:11 | out | provenance | |
8378
| Test.java:126:14:126:27 | (...)... : Path | Test.java:127:10:127:11 | in : Path | provenance | |
8479
| Test.java:126:20:126:27 | source(...) : Object | Test.java:126:14:126:27 | (...)... : Path | provenance | |
85-
| Test.java:127:10:127:11 | in : Path | Test.java:127:10:127:23 | getParent(...) : Path | provenance | MaD:12 |
80+
| Test.java:127:10:127:11 | in : Path | Test.java:127:10:127:23 | getParent(...) : Path | provenance | MaD:11 |
8681
| Test.java:127:10:127:23 | getParent(...) : Path | Test.java:128:9:128:11 | out | provenance | |
8782
| Test.java:133:14:133:27 | (...)... : Path | Test.java:134:10:134:11 | in : Path | provenance | |
8883
| Test.java:133:20:133:27 | source(...) : Object | Test.java:133:14:133:27 | (...)... : Path | provenance | |
89-
| Test.java:134:10:134:11 | in : Path | Test.java:134:10:134:23 | normalize(...) : Path | provenance | MaD:13 |
84+
| Test.java:134:10:134:11 | in : Path | Test.java:134:10:134:23 | normalize(...) : Path | provenance | MaD:12 |
9085
| Test.java:134:10:134:23 | normalize(...) : Path | Test.java:135:9:135:11 | out | provenance | |
9186
| Test.java:140:14:140:27 | (...)... : Path | Test.java:142:27:142:28 | in : Path | provenance | |
9287
| Test.java:140:20:140:27 | source(...) : Object | Test.java:140:14:140:27 | (...)... : Path | provenance | |
9388
| Test.java:142:10:142:29 | resolve(...) : Path | Test.java:143:9:143:11 | out | provenance | |
94-
| Test.java:142:27:142:28 | in : Path | Test.java:142:10:142:29 | resolve(...) : Path | provenance | MaD:14 |
89+
| Test.java:142:27:142:28 | in : Path | Test.java:142:10:142:29 | resolve(...) : Path | provenance | MaD:13 |
9590
| Test.java:148:14:148:27 | (...)... : Path | Test.java:149:10:149:11 | in : Path | provenance | |
9691
| Test.java:148:20:148:27 | source(...) : Object | Test.java:148:14:148:27 | (...)... : Path | provenance | |
97-
| Test.java:149:10:149:11 | in : Path | Test.java:149:10:149:31 | resolve(...) : Path | provenance | MaD:15 |
92+
| Test.java:149:10:149:11 | in : Path | Test.java:149:10:149:31 | resolve(...) : Path | provenance | MaD:14 |
9893
| Test.java:149:10:149:31 | resolve(...) : Path | Test.java:150:9:150:11 | out | provenance | |
9994
| Test.java:155:14:155:27 | (...)... : Path | Test.java:156:10:156:11 | in : Path | provenance | |
10095
| Test.java:155:20:155:27 | source(...) : Object | Test.java:155:14:155:27 | (...)... : Path | provenance | |
101-
| Test.java:156:10:156:11 | in : Path | Test.java:156:10:156:33 | resolve(...) : Path | provenance | MaD:15 |
96+
| Test.java:156:10:156:11 | in : Path | Test.java:156:10:156:33 | resolve(...) : Path | provenance | MaD:14 |
10297
| Test.java:156:10:156:33 | resolve(...) : Path | Test.java:157:9:157:11 | out | provenance | |
10398
| Test.java:162:16:162:31 | (...)... : String | Test.java:164:27:164:28 | in : String | provenance | |
10499
| Test.java:162:24:162:31 | source(...) : Object | Test.java:162:16:162:31 | (...)... : String | provenance | |
105100
| Test.java:164:10:164:29 | resolve(...) : Path | Test.java:165:9:165:11 | out | provenance | |
106-
| Test.java:164:27:164:28 | in : String | Test.java:164:10:164:29 | resolve(...) : Path | provenance | MaD:14 |
101+
| Test.java:164:27:164:28 | in : String | Test.java:164:10:164:29 | resolve(...) : Path | provenance | MaD:13 |
107102
| Test.java:170:14:170:27 | (...)... : Path | Test.java:171:10:171:11 | in : Path | provenance | |
108103
| Test.java:170:20:170:27 | source(...) : Object | Test.java:170:14:170:27 | (...)... : Path | provenance | |
109-
| Test.java:171:10:171:11 | in : Path | Test.java:171:10:171:28 | toAbsolutePath(...) : Path | provenance | MaD:16 |
104+
| Test.java:171:10:171:11 | in : Path | Test.java:171:10:171:28 | toAbsolutePath(...) : Path | provenance | MaD:15 |
110105
| Test.java:171:10:171:28 | toAbsolutePath(...) : Path | Test.java:172:9:172:11 | out | provenance | |
111106
| Test.java:177:14:177:27 | (...)... : Path | Test.java:178:10:178:11 | in : Path | provenance | |
112107
| Test.java:177:20:177:27 | source(...) : Object | Test.java:177:14:177:27 | (...)... : Path | provenance | |
113-
| Test.java:178:10:178:11 | in : Path | Test.java:178:10:178:22 | toString(...) : String | provenance | MaD:17 |
108+
| Test.java:178:10:178:11 | in : Path | Test.java:178:10:178:22 | toString(...) : String | provenance | MaD:16 |
114109
| Test.java:178:10:178:22 | toString(...) : String | Test.java:179:9:179:11 | out | provenance | |
115110
| Test.java:184:14:184:27 | (...)... : Path | Test.java:185:10:185:11 | in : Path | provenance | |
116111
| Test.java:184:20:184:27 | source(...) : Object | Test.java:184:14:184:27 | (...)... : Path | provenance | |
117-
| Test.java:185:10:185:11 | in : Path | Test.java:185:10:185:19 | toUri(...) : URI | provenance | MaD:18 |
112+
| Test.java:185:10:185:11 | in : Path | Test.java:185:10:185:19 | toUri(...) : URI | provenance | MaD:17 |
118113
| Test.java:185:10:185:19 | toUri(...) : URI | Test.java:186:9:186:11 | out | provenance | |
119114
| Test.java:191:16:191:31 | (...)... : String | Test.java:192:20:192:21 | in : String | provenance | |
120115
| Test.java:191:24:191:31 | source(...) : Object | Test.java:191:16:191:31 | (...)... : String | provenance | |
121116
| Test.java:192:10:192:38 | get(...) : Path | Test.java:193:9:193:11 | out | provenance | |
122-
| Test.java:192:20:192:21 | in : String | Test.java:192:10:192:38 | get(...) : Path | provenance | MaD:19 |
117+
| Test.java:192:20:192:21 | in : String | Test.java:192:10:192:38 | get(...) : Path | provenance | MaD:18 |
123118
| Test.java:198:13:198:25 | (...)... : URI | Test.java:199:20:199:21 | in : URI | provenance | |
124119
| Test.java:198:18:198:25 | source(...) : Object | Test.java:198:13:198:25 | (...)... : URI | provenance | |
125120
| Test.java:199:10:199:22 | get(...) : Path | Test.java:200:9:200:11 | out | provenance | |
126-
| Test.java:199:20:199:21 | in : URI | Test.java:199:10:199:22 | get(...) : Path | provenance | MaD:19 |
121+
| Test.java:199:20:199:21 | in : URI | Test.java:199:10:199:22 | get(...) : Path | provenance | MaD:18 |
127122
| Test.java:205:18:205:57 | (...)... : String[] [[]] : String | Test.java:206:34:206:35 | in : String[] [[]] : String | provenance | |
128123
| Test.java:205:28:205:57 | {...} : String[] [[]] : String | Test.java:205:18:205:57 | (...)... : String[] [[]] : String | provenance | |
129124
| Test.java:205:41:205:56 | (...)... : String | Test.java:205:28:205:57 | {...} : String[] [[]] : String | provenance | |
130125
| Test.java:205:49:205:56 | source(...) : Object | Test.java:205:41:205:56 | (...)... : String | provenance | |
131126
| Test.java:206:10:206:36 | get(...) : Path | Test.java:207:9:207:11 | out | provenance | |
132-
| Test.java:206:34:206:35 | in : String[] [[]] : String | Test.java:206:10:206:36 | get(...) : Path | provenance | MaD:20 |
127+
| Test.java:206:34:206:35 | in : String[] [[]] : String | Test.java:206:10:206:36 | get(...) : Path | provenance | MaD:19 |
133128
nodes
134129
| Test.java:20:14:20:27 | (...)... : File | semmle.label | (...)... : File |
135130
| Test.java:20:20:20:27 | source(...) : Object | semmle.label | source(...) : Object |
@@ -153,13 +148,9 @@ nodes
153148
| Test.java:43:9:43:11 | out | semmle.label | out |
154149
| Test.java:48:16:48:31 | (...)... : String | semmle.label | (...)... : String |
155150
| Test.java:48:24:48:31 | source(...) : Object | semmle.label | source(...) : Object |
156-
| Test.java:49:10:49:33 | new File(...) : File | semmle.label | new File(...) : File |
157-
| Test.java:49:31:49:32 | in : String | semmle.label | in : String |
158151
| Test.java:50:9:50:11 | out | semmle.label | out |
159152
| Test.java:55:16:55:31 | (...)... : String | semmle.label | (...)... : String |
160153
| Test.java:55:24:55:31 | source(...) : Object | semmle.label | source(...) : Object |
161-
| Test.java:56:10:56:35 | new File(...) : File | semmle.label | new File(...) : File |
162-
| Test.java:56:33:56:34 | in : String | semmle.label | in : String |
163154
| Test.java:57:9:57:11 | out | semmle.label | out |
164155
| Test.java:62:14:62:27 | (...)... : File | semmle.label | (...)... : File |
165156
| Test.java:62:20:62:27 | source(...) : Object | semmle.label | source(...) : Object |

0 commit comments

Comments
 (0)