Skip to content

Commit 35ccfb1

Browse files
geoffw0CHMANG
geoffw0
authored and
CHMANG
committed
Rust: Accept changes to test .expected file, result of upgrades on main.
1 parent 507f77d commit 35ccfb1

1 file changed

Lines changed: 36 additions & 40 deletions

File tree

‎rust/ql/test/query-tests/security/CWE-078/CommandInjection.expected‎

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
#select
2-
| main.rs:27:5:27:16 | ...::new | main.rs:4:22:4:35 | ...::args | main.rs:27:5:27:16 | ...::new | This command line depends on a $@. | main.rs:4:22:4:35 | ...::args | user-provided value |
3-
| main.rs:34:10:34:12 | arg | main.rs:5:25:5:46 | ...::get | main.rs:34:10:34:12 | arg | This command line depends on a $@. | main.rs:5:25:5:46 | ...::get | user-provided value |
4-
| main.rs:40:10:40:12 | arg | main.rs:4:22:4:35 | ...::args | main.rs:40:10:40:12 | arg | This command line depends on a $@. | main.rs:4:22:4:35 | ...::args | user-provided value |
5-
| main.rs:47:10:47:13 | args | main.rs:5:25:5:46 | ...::get | main.rs:47:10:47:13 | args | This command line depends on a $@. | main.rs:5:25:5:46 | ...::get | user-provided value |
6-
| main.rs:53:5:53:16 | ...::new | main.rs:5:25:5:46 | ...::get | main.rs:53:5:53:16 | ...::new | This command line depends on a $@. | main.rs:5:25:5:46 | ...::get | user-provided value |
7-
| main.rs:65:19:65:46 | ...::new | main.rs:59:25:59:46 | ...::get | main.rs:65:19:65:46 | ...::new | This command line depends on a $@. | main.rs:59:25:59:46 | ...::get | user-provided value |
8-
| main.rs:73:10:73:12 | arg | main.rs:59:25:59:46 | ...::get | main.rs:73:10:73:12 | arg | This command line depends on a $@. | main.rs:59:25:59:46 | ...::get | user-provided value |
9-
| main.rs:86:14:86:16 | arg | main.rs:108:22:108:35 | ...::args | main.rs:86:14:86:16 | arg | This command line depends on a $@. | main.rs:108:22:108:35 | ...::args | user-provided value |
10-
| main.rs:100:18:100:20 | arg | main.rs:108:22:108:35 | ...::args | main.rs:100:18:100:20 | arg | This command line depends on a $@. | main.rs:108:22:108:35 | ...::args | user-provided value |
2+
| main.rs:27:18:27:36 | arg_string.as_str() | main.rs:4:22:4:37 | ...::args(...) | main.rs:27:18:27:36 | arg_string.as_str() | This command line depends on a $@. | main.rs:4:22:4:37 | ...::args(...) | user-provided value |
3+
| main.rs:34:14:34:35 | remote_string.as_str() | main.rs:5:25:5:69 | ...::get(...) | main.rs:34:14:34:35 | remote_string.as_str() | This command line depends on a $@. | main.rs:5:25:5:69 | ...::get(...) | user-provided value |
4+
| main.rs:40:14:40:32 | arg_string.as_str() | main.rs:4:22:4:37 | ...::args(...) | main.rs:40:14:40:32 | arg_string.as_str() | This command line depends on a $@. | main.rs:4:22:4:37 | ...::args(...) | user-provided value |
5+
| main.rs:47:15:47:45 | &... | main.rs:5:25:5:69 | ...::get(...) | main.rs:47:15:47:45 | &... | This command line depends on a $@. | main.rs:5:25:5:69 | ...::get(...) | user-provided value |
6+
| main.rs:53:18:53:46 | concatenated_command.as_str() | main.rs:5:25:5:69 | ...::get(...) | main.rs:53:18:53:46 | concatenated_command.as_str() | This command line depends on a $@. | main.rs:5:25:5:69 | ...::get(...) | user-provided value |
7+
| main.rs:65:48:65:69 | remote_string.as_str() | main.rs:59:25:59:69 | ...::get(...) | main.rs:65:48:65:69 | remote_string.as_str() | This command line depends on a $@. | main.rs:59:25:59:69 | ...::get(...) | user-provided value |
8+
| main.rs:73:14:73:35 | remote_string.as_str() | main.rs:59:25:59:69 | ...::get(...) | main.rs:73:14:73:35 | remote_string.as_str() | This command line depends on a $@. | main.rs:59:25:59:69 | ...::get(...) | user-provided value |
9+
| main.rs:86:18:86:27 | user_input | main.rs:108:22:108:37 | ...::args(...) | main.rs:86:18:86:27 | user_input | This command line depends on a $@. | main.rs:108:22:108:37 | ...::args(...) | user-provided value |
10+
| main.rs:100:22:100:29 | filename | main.rs:108:22:108:37 | ...::args(...) | main.rs:100:22:100:29 | filename | This command line depends on a $@. | main.rs:108:22:108:37 | ...::args(...) | user-provided value |
1111
edges
1212
| main.rs:4:9:4:18 | arg_string | main.rs:27:18:27:27 | arg_string | provenance | |
1313
| main.rs:4:9:4:18 | arg_string | main.rs:40:14:40:23 | arg_string | provenance | |
14-
| main.rs:4:22:4:35 | ...::args | main.rs:4:22:4:37 | ...::args(...) [element] | provenance | Src:MaD:7 |
14+
| main.rs:4:22:4:37 | ...::args(...) | main.rs:4:22:4:37 | ...::args(...) [element] | provenance | Src:MaD:7 |
1515
| main.rs:4:22:4:37 | ...::args(...) [element] | main.rs:4:22:4:44 | ... .nth(...) [Some] | provenance | MaD:8 |
1616
| main.rs:4:22:4:44 | ... .nth(...) [Some] | main.rs:4:22:4:74 | ... .unwrap_or(...) | provenance | MaD:10 |
1717
| main.rs:4:22:4:74 | ... .unwrap_or(...) | main.rs:4:9:4:18 | arg_string | provenance | |
1818
| main.rs:5:9:5:21 | remote_string | main.rs:34:14:34:26 | remote_string | provenance | |
1919
| main.rs:5:9:5:21 | remote_string | main.rs:47:23:47:35 | remote_string | provenance | |
2020
| main.rs:5:9:5:21 | remote_string | main.rs:52:40:52:69 | MacroExpr | provenance | |
21-
| main.rs:5:25:5:46 | ...::get | main.rs:5:25:5:69 | ...::get(...) [Ok] | provenance | Src:MaD:6 |
21+
| main.rs:5:25:5:69 | ...::get(...) | main.rs:5:25:5:69 | ...::get(...) [Ok] | provenance | Src:MaD:6 |
2222
| main.rs:5:25:5:69 | ...::get(...) [Ok] | main.rs:5:25:6:17 | ... .unwrap() | provenance | MaD:11 |
2323
| main.rs:5:25:6:17 | ... .unwrap() | main.rs:5:25:7:15 | ... .text() [Ok] | provenance | MaD:13 |
2424
| main.rs:5:25:7:15 | ... .text() [Ok] | main.rs:5:25:8:38 | ... .unwrap_or(...) | provenance | MaD:12 |
2525
| main.rs:5:25:8:38 | ... .unwrap_or(...) | main.rs:5:9:5:21 | remote_string | provenance | |
2626
| main.rs:27:18:27:27 | arg_string | main.rs:27:18:27:36 | arg_string.as_str() [&ref] | provenance | MaD:9 |
27-
| main.rs:27:18:27:36 | arg_string.as_str() [&ref] | main.rs:27:5:27:16 | ...::new | provenance | MaD:3 Sink:MaD:3 |
27+
| main.rs:27:18:27:36 | arg_string.as_str() [&ref] | main.rs:27:18:27:36 | arg_string.as_str() | provenance | Sink:MaD:3 |
2828
| main.rs:34:14:34:26 | remote_string | main.rs:34:14:34:35 | remote_string.as_str() [&ref] | provenance | MaD:9 |
29-
| main.rs:34:14:34:35 | remote_string.as_str() [&ref] | main.rs:34:10:34:12 | arg | provenance | MaD:1 Sink:MaD:1 |
29+
| main.rs:34:14:34:35 | remote_string.as_str() [&ref] | main.rs:34:14:34:35 | remote_string.as_str() | provenance | Sink:MaD:1 |
3030
| main.rs:40:14:40:23 | arg_string | main.rs:40:14:40:32 | arg_string.as_str() [&ref] | provenance | MaD:9 |
31-
| main.rs:40:14:40:32 | arg_string.as_str() [&ref] | main.rs:40:10:40:12 | arg | provenance | MaD:1 Sink:MaD:1 |
32-
| main.rs:47:15:47:45 | &... [&ref, element, &ref] | main.rs:47:10:47:13 | args | provenance | MaD:2 Sink:MaD:2 Sink:MaD:2 |
33-
| main.rs:47:15:47:45 | &... [&ref, element, &ref] | main.rs:47:10:47:13 | args | provenance | MaD:2 Sink:MaD:2 Sink:MaD:2 Sink:MaD:2 |
31+
| main.rs:40:14:40:32 | arg_string.as_str() [&ref] | main.rs:40:14:40:32 | arg_string.as_str() | provenance | Sink:MaD:1 |
32+
| main.rs:47:15:47:45 | &... [&ref, element, &ref] | main.rs:47:15:47:45 | &... | provenance | Sink:MaD:2 Sink:MaD:2 |
33+
| main.rs:47:15:47:45 | &... [&ref, element, &ref] | main.rs:47:15:47:45 | &... | provenance | Sink:MaD:2 Sink:MaD:2 Sink:MaD:2 |
3434
| main.rs:47:16:47:45 | [...] [element, &ref] | main.rs:47:15:47:45 | &... [&ref, element, &ref] | provenance | |
3535
| main.rs:47:23:47:35 | remote_string | main.rs:47:23:47:44 | remote_string.as_str() [&ref] | provenance | MaD:9 |
3636
| main.rs:47:23:47:44 | remote_string.as_str() [&ref] | main.rs:47:16:47:45 | [...] [element, &ref] | provenance | |
@@ -40,25 +40,23 @@ edges
4040
| main.rs:52:40:52:69 | MacroExpr | main.rs:52:40:52:69 | ...::format(...) | provenance | MaD:14 |
4141
| main.rs:52:40:52:69 | { ... } | main.rs:52:40:52:69 | ...::must_use(...) | provenance | MaD:15 |
4242
| main.rs:53:18:53:37 | concatenated_command | main.rs:53:18:53:46 | concatenated_command.as_str() [&ref] | provenance | MaD:9 |
43-
| main.rs:53:18:53:46 | concatenated_command.as_str() [&ref] | main.rs:53:5:53:16 | ...::new | provenance | MaD:3 Sink:MaD:3 |
43+
| main.rs:53:18:53:46 | concatenated_command.as_str() [&ref] | main.rs:53:18:53:46 | concatenated_command.as_str() | provenance | Sink:MaD:3 |
4444
| main.rs:59:9:59:21 | remote_string | main.rs:65:48:65:60 | remote_string | provenance | |
4545
| main.rs:59:9:59:21 | remote_string | main.rs:73:14:73:26 | remote_string | provenance | |
46-
| main.rs:59:25:59:46 | ...::get | main.rs:59:25:59:69 | ...::get(...) [Ok] | provenance | Src:MaD:6 |
46+
| main.rs:59:25:59:69 | ...::get(...) | main.rs:59:25:59:69 | ...::get(...) [Ok] | provenance | Src:MaD:6 |
4747
| main.rs:59:25:59:69 | ...::get(...) [Ok] | main.rs:59:25:60:17 | ... .unwrap() | provenance | MaD:11 |
4848
| main.rs:59:25:60:17 | ... .unwrap() | main.rs:59:25:61:15 | ... .text() [Ok] | provenance | MaD:13 |
4949
| main.rs:59:25:61:15 | ... .text() [Ok] | main.rs:59:25:62:38 | ... .unwrap_or(...) | provenance | MaD:12 |
5050
| main.rs:59:25:62:38 | ... .unwrap_or(...) | main.rs:59:9:59:21 | remote_string | provenance | |
5151
| main.rs:65:48:65:60 | remote_string | main.rs:65:48:65:69 | remote_string.as_str() [&ref] | provenance | MaD:9 |
52-
| main.rs:65:48:65:69 | remote_string.as_str() [&ref] | main.rs:65:19:65:46 | ...::new | provenance | MaD:5 Sink:MaD:5 |
52+
| main.rs:65:48:65:69 | remote_string.as_str() [&ref] | main.rs:65:48:65:69 | remote_string.as_str() | provenance | Sink:MaD:5 |
5353
| main.rs:73:14:73:26 | remote_string | main.rs:73:14:73:35 | remote_string.as_str() [&ref] | provenance | MaD:9 |
54-
| main.rs:73:14:73:35 | remote_string.as_str() [&ref] | main.rs:73:10:73:12 | arg | provenance | MaD:4 Sink:MaD:4 |
55-
| main.rs:82:27:82:42 | ...: ... [&ref] | main.rs:86:18:86:27 | user_input [&ref] | provenance | |
56-
| main.rs:86:18:86:27 | user_input [&ref] | main.rs:86:14:86:16 | arg | provenance | MaD:1 Sink:MaD:1 |
57-
| main.rs:95:27:95:40 | ...: ... [&ref] | main.rs:100:22:100:29 | filename [&ref] | provenance | |
58-
| main.rs:100:22:100:29 | filename [&ref] | main.rs:100:18:100:20 | arg | provenance | MaD:1 Sink:MaD:1 |
54+
| main.rs:73:14:73:35 | remote_string.as_str() [&ref] | main.rs:73:14:73:35 | remote_string.as_str() | provenance | Sink:MaD:4 |
55+
| main.rs:82:27:82:42 | ...: ... [&ref] | main.rs:86:18:86:27 | user_input | provenance | Sink:MaD:1 |
56+
| main.rs:95:27:95:40 | ...: ... [&ref] | main.rs:100:22:100:29 | filename | provenance | Sink:MaD:1 |
5957
| main.rs:108:9:108:18 | arg_string | main.rs:112:39:112:48 | arg_string | provenance | |
6058
| main.rs:108:9:108:18 | arg_string | main.rs:113:40:113:49 | arg_string | provenance | |
61-
| main.rs:108:22:108:35 | ...::args | main.rs:108:22:108:37 | ...::args(...) [element] | provenance | Src:MaD:7 |
59+
| main.rs:108:22:108:37 | ...::args(...) | main.rs:108:22:108:37 | ...::args(...) [element] | provenance | Src:MaD:7 |
6260
| main.rs:108:22:108:37 | ...::args(...) [element] | main.rs:108:22:108:44 | ... .nth(...) [Some] | provenance | MaD:8 |
6361
| main.rs:108:22:108:44 | ... .nth(...) [Some] | main.rs:108:22:108:74 | ... .unwrap_or(...) | provenance | MaD:10 |
6462
| main.rs:108:22:108:74 | ... .unwrap_or(...) | main.rs:108:9:108:18 | arg_string | provenance | |
@@ -84,26 +82,26 @@ models
8482
| 15 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
8583
nodes
8684
| main.rs:4:9:4:18 | arg_string | semmle.label | arg_string |
87-
| main.rs:4:22:4:35 | ...::args | semmle.label | ...::args |
85+
| main.rs:4:22:4:37 | ...::args(...) | semmle.label | ...::args(...) |
8886
| main.rs:4:22:4:37 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
8987
| main.rs:4:22:4:44 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
9088
| main.rs:4:22:4:74 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
9189
| main.rs:5:9:5:21 | remote_string | semmle.label | remote_string |
92-
| main.rs:5:25:5:46 | ...::get | semmle.label | ...::get |
90+
| main.rs:5:25:5:69 | ...::get(...) | semmle.label | ...::get(...) |
9391
| main.rs:5:25:5:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
9492
| main.rs:5:25:6:17 | ... .unwrap() | semmle.label | ... .unwrap() |
9593
| main.rs:5:25:7:15 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
9694
| main.rs:5:25:8:38 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
97-
| main.rs:27:5:27:16 | ...::new | semmle.label | ...::new |
9895
| main.rs:27:18:27:27 | arg_string | semmle.label | arg_string |
96+
| main.rs:27:18:27:36 | arg_string.as_str() | semmle.label | arg_string.as_str() |
9997
| main.rs:27:18:27:36 | arg_string.as_str() [&ref] | semmle.label | arg_string.as_str() [&ref] |
100-
| main.rs:34:10:34:12 | arg | semmle.label | arg |
10198
| main.rs:34:14:34:26 | remote_string | semmle.label | remote_string |
99+
| main.rs:34:14:34:35 | remote_string.as_str() | semmle.label | remote_string.as_str() |
102100
| main.rs:34:14:34:35 | remote_string.as_str() [&ref] | semmle.label | remote_string.as_str() [&ref] |
103-
| main.rs:40:10:40:12 | arg | semmle.label | arg |
104101
| main.rs:40:14:40:23 | arg_string | semmle.label | arg_string |
102+
| main.rs:40:14:40:32 | arg_string.as_str() | semmle.label | arg_string.as_str() |
105103
| main.rs:40:14:40:32 | arg_string.as_str() [&ref] | semmle.label | arg_string.as_str() [&ref] |
106-
| main.rs:47:10:47:13 | args | semmle.label | args |
104+
| main.rs:47:15:47:45 | &... | semmle.label | &... |
107105
| main.rs:47:15:47:45 | &... [&ref, element, &ref] | semmle.label | &... [&ref, element, &ref] |
108106
| main.rs:47:16:47:45 | [...] [element, &ref] | semmle.label | [...] [element, &ref] |
109107
| main.rs:47:23:47:35 | remote_string | semmle.label | remote_string |
@@ -113,29 +111,27 @@ nodes
113111
| main.rs:52:40:52:69 | ...::must_use(...) | semmle.label | ...::must_use(...) |
114112
| main.rs:52:40:52:69 | MacroExpr | semmle.label | MacroExpr |
115113
| main.rs:52:40:52:69 | { ... } | semmle.label | { ... } |
116-
| main.rs:53:5:53:16 | ...::new | semmle.label | ...::new |
117114
| main.rs:53:18:53:37 | concatenated_command | semmle.label | concatenated_command |
115+
| main.rs:53:18:53:46 | concatenated_command.as_str() | semmle.label | concatenated_command.as_str() |
118116
| main.rs:53:18:53:46 | concatenated_command.as_str() [&ref] | semmle.label | concatenated_command.as_str() [&ref] |
119117
| main.rs:59:9:59:21 | remote_string | semmle.label | remote_string |
120-
| main.rs:59:25:59:46 | ...::get | semmle.label | ...::get |
118+
| main.rs:59:25:59:69 | ...::get(...) | semmle.label | ...::get(...) |
121119
| main.rs:59:25:59:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
122120
| main.rs:59:25:60:17 | ... .unwrap() | semmle.label | ... .unwrap() |
123121
| main.rs:59:25:61:15 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
124122
| main.rs:59:25:62:38 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
125-
| main.rs:65:19:65:46 | ...::new | semmle.label | ...::new |
126123
| main.rs:65:48:65:60 | remote_string | semmle.label | remote_string |
124+
| main.rs:65:48:65:69 | remote_string.as_str() | semmle.label | remote_string.as_str() |
127125
| main.rs:65:48:65:69 | remote_string.as_str() [&ref] | semmle.label | remote_string.as_str() [&ref] |
128-
| main.rs:73:10:73:12 | arg | semmle.label | arg |
129126
| main.rs:73:14:73:26 | remote_string | semmle.label | remote_string |
127+
| main.rs:73:14:73:35 | remote_string.as_str() | semmle.label | remote_string.as_str() |
130128
| main.rs:73:14:73:35 | remote_string.as_str() [&ref] | semmle.label | remote_string.as_str() [&ref] |
131129
| main.rs:82:27:82:42 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
132-
| main.rs:86:14:86:16 | arg | semmle.label | arg |
133-
| main.rs:86:18:86:27 | user_input [&ref] | semmle.label | user_input [&ref] |
130+
| main.rs:86:18:86:27 | user_input | semmle.label | user_input |
134131
| main.rs:95:27:95:40 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
135-
| main.rs:100:18:100:20 | arg | semmle.label | arg |
136-
| main.rs:100:22:100:29 | filename [&ref] | semmle.label | filename [&ref] |
132+
| main.rs:100:22:100:29 | filename | semmle.label | filename |
137133
| main.rs:108:9:108:18 | arg_string | semmle.label | arg_string |
138-
| main.rs:108:22:108:35 | ...::args | semmle.label | ...::args |
134+
| main.rs:108:22:108:37 | ...::args(...) | semmle.label | ...::args(...) |
139135
| main.rs:108:22:108:37 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
140136
| main.rs:108:22:108:44 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
141137
| main.rs:108:22:108:74 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |

0 commit comments

Comments
 (0)