Skip to content

Rust: Improve FS models #20270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Aug 28, 2025
Merged

Rust: Improve FS models #20270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5da296d
Rust: Add tests for std::fs::OpenOptions and similar.
geoffw0 Aug 6, 2025
bc226e2
Rust: Add more general test cases for async_std::fs and tokio::fs.
geoffw0 Aug 19, 2025
801be8f
Rust: Add more tests for std::fs::DirBuilder and similar.
geoffw0 Aug 20, 2025
8da4482
Rust: Add tests for std::fs::canonicalize and similar.
geoffw0 Aug 20, 2025
49b4adc
Rust: Add more tests for DirEntry, PathBuf, OsString.
geoffw0 Aug 20, 2025
1d2ac33
Rust: Model async-std::fs.
geoffw0 Aug 19, 2025
29e7b6a
Rust: Fill a gap in the std::fs model.
geoffw0 Aug 21, 2025
16e0de0
Rust: Fill gaps in the tokio models.
geoffw0 Aug 21, 2025
fcce862
Rust: Add an explicit test case for sinks with two relevant args.
geoffw0 Aug 21, 2025
9fbbe02
Rust: Compact these models a little.
geoffw0 Aug 21, 2025
8b04bc0
Rust: Model std::fs::OpenOptions and similar.
geoffw0 Aug 21, 2025
d1a5c9b
Rust: Add a test case resembling code seen in the wild.
geoffw0 Aug 21, 2025
2f2a975
Rust: Model path::new.
geoffw0 Aug 21, 2025
40b9754
Rust: Change note.
geoffw0 Aug 22, 2025
7279b03
Rust: Model a few more Path and PathBuf methods.
geoffw0 Aug 22, 2025
701aec1
Rust: Fix the canonicalize models.
geoffw0 Aug 22, 2025
08cb038
Rust: Accept changes to other tests.
geoffw0 Aug 22, 2025
0e2bc7c
Merge remote-tracking branch 'upstream/main' into pathi
geoffw0 Aug 22, 2025
4a4f782
Rust: Accept another consistency test change.
geoffw0 Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rust: Add more tests for DirEntry, PathBuf, OsString.
  • Loading branch information
@geoffw0
geoffw0 committed Aug 22, 2025
commit 49b4adcc99f151ef1f7d5b2cfc50d04ada3e173c
54 changes: 28 additions & 26 deletions rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,32 +55,34 @@
| test.rs:413:31:413:38 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:418:22:418:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:418:22:418:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:424:22:424:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:425:27:425:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:431:22:431:34 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:440:31:440:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:445:31:445:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:450:22:450:46 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:456:26:456:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:456:26:456:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:457:31:457:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:457:31:457:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:463:22:463:41 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:473:20:473:38 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:530:21:530:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:531:21:531:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:539:21:539:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:551:20:551:40 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:607:21:607:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:608:21:608:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:616:21:616:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:658:26:658:53 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
| test.rs:677:26:677:61 | ...::connect_timeout | Flow source 'RemoteSource' of type remote (DEFAULT). |
| test.rs:729:28:729:57 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
| test.rs:811:22:811:49 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
| test.rs:837:22:837:50 | ...::new | Flow source 'RemoteSource' of type remote (DEFAULT). |
| test.rs:864:16:864:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
| test.rs:864:16:864:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
| test.rs:425:22:425:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:439:27:439:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:450:22:450:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:451:27:451:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:461:22:461:34 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:470:31:470:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:475:31:475:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:480:22:480:46 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:486:26:486:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:486:26:486:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:487:31:487:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:487:31:487:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:493:22:493:41 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:503:20:503:38 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:560:21:560:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:561:21:561:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:569:21:569:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:581:20:581:40 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:637:21:637:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:638:21:638:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:646:21:646:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
| test.rs:688:26:688:53 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
| test.rs:707:26:707:61 | ...::connect_timeout | Flow source 'RemoteSource' of type remote (DEFAULT). |
| test.rs:759:28:759:57 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
| test.rs:841:22:841:49 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
| test.rs:867:22:867:50 | ...::new | Flow source 'RemoteSource' of type remote (DEFAULT). |
| test.rs:894:16:894:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
| test.rs:894:16:894:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
| test_futures_io.rs:19:15:19:32 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
| web_frameworks.rs:11:31:11:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
| web_frameworks.rs:11:31:11:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
Expand Down
32 changes: 31 additions & 1 deletion rust/ql/test/library-tests/dataflow/sources/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,11 +421,41 @@ fn test_fs() -> Result<(), Box<dyn std::error::Error>> {

for entry in fs::read_dir("directory")? {
let e = entry?;

let path = e.path(); // $ Alert[rust/summary/taint-sources]
let file_name = e.file_name(); // $ Alert[rust/summary/taint-sources]
sink(path.clone()); // $ hasTaintFlow
sink(path.clone().as_path()); // $ hasTaintFlow
sink(path.clone().into_os_string()); // $ MISSING: hasTaintFlow
sink(std::path::PathBuf::from(path.clone().into_boxed_path())); // $ MISSING: hasTaintFlow
sink(path.clone().as_os_str()); // $ MISSING: hasTaintFlow
sink(path.clone().as_mut_os_str()); // $ MISSING: hasTaintFlow
sink(path.to_str()); // $ MISSING: hasTaintFlow
sink(path.to_path_buf()); // $ MISSING: hasTaintFlow
sink(path.file_name().unwrap()); // $ MISSING: hasTaintFlow
sink(path.extension().unwrap()); // $ MISSING: hasTaintFlow
sink(path.canonicalize().unwrap()); // $ MISSING: hasTaintFlow
sink(path); // $ hasTaintFlow

let file_name = e.file_name(); // $ Alert[rust/summary/taint-sources]
sink(file_name.clone()); // $ hasTaintFlow
sink(file_name.clone().into_string().unwrap()); // $ MISSING: hasTaintFlow
sink(file_name.to_str().unwrap()); // $ MISSING: hasTaintFlow
sink(file_name.to_string_lossy().to_mut()); // $ MISSING: hasTaintFlow
sink(file_name.clone().as_encoded_bytes()); // $ MISSING: hasTaintFlow
sink(file_name); // $ hasTaintFlow
}
for entry in std::path::Path::new("directory").read_dir()? {
let e = entry?;

let path = e.path(); // $ Alert[rust/summary/taint-sources]
let file_name = e.file_name(); // $ Alert[rust/summary/taint-sources]
}
for entry in std::path::PathBuf::from("directory").read_dir()? {
let e = entry?;

let path = e.path(); // $ MISSING: Alert[rust/summary/taint-sources]
let file_name = e.file_name(); // $ MISSING: Alert[rust/summary/taint-sources]
}

{
let target = fs::read_link("symlink.txt")?; // $ Alert[rust/summary/taint-sources]
Expand Down