Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Scope the `stat` fast path in `filesystem::primitives` (#14368)

Alex Crichton6c5cbbe0fa41
diff --git a/crates/wasi/src/filesystem/primitives/mod.rs b/crates/wasi/src/filesystem/primitives/mod.rs
index b0a1fa30bb..e090026693 100644
--- a/crates/wasi/src/filesystem/primitives/mod.rs
+++ b/crates/wasi/src/filesystem/primitives/mod.rs
@@ -303,7 +303,7 @@ pub(crate) fn stat(start: &fs::File, path: &Path, follow: FollowSymlinks) -> io:
// Optimization: if path has exactly one component and it's not ".." or
// anything non-normal and we're not following symlinks we can go straight
// to `stat_unchecked`, which can be faster than various paths below.
- if follow == FollowSymlinks::No {
+ if follow == FollowSymlinks::No && !path_requires_dir(path) {
let mut components = path.components();
if let Some(Component::Normal(component)) = components.next() {
if components.next().is_none() {
diff --git a/crates/wasi/src/filesystem/primitives/tests/fs_additional.rs b/crates/wasi/src/filesystem/primitives/tests/fs_additional.rs
index fbc4bd25f6..85a0e89144 100644
--- a/crates/wasi/src/filesystem/primitives/tests/fs_additional.rs
+++ b/crates/wasi/src/filesystem/primitives/tests/fs_additional.rs
@@ -1351,3 +1351,33 @@ fn trailing_slash_symlink_more() {
}
}
}
+
+#[test]
+fn trailing_slash_requires_a_directory() {
+ let tmpdir = tempfile::tempdir().unwrap();
+
+ check!(std::fs::create_dir(tmpdir.path().join("dir")));
+ std::fs::File::create(tmpdir.path().join("file")).unwrap();
+
+ let start = check!(h::open_ambient_dir(tmpdir.path()));
+ check!(p::open_dir(&start, "dir".as_ref()));
+ check!(p::open_dir(&start, "dir/".as_ref()));
+ check!(p::open_dir(&start, "dir/.".as_ref()));
+ let mut opts = p::OpenOptions::new();
+ opts.read(true);
+ check!(p::open(&start, "file".as_ref(), &opts));
+ assert!(p::open(&start, "file/".as_ref(), &opts).is_err());
+ if !cfg!(windows) {
+ assert!(p::open(&start, "file/.".as_ref(), &opts).is_err());
+ }
+
+ check!(p::stat(&start, "dir".as_ref(), p::FollowSymlinks::No));
+ check!(p::stat(&start, "dir/".as_ref(), p::FollowSymlinks::No));
+ check!(p::stat(&start, "dir/.".as_ref(), p::FollowSymlinks::No));
+
+ check!(p::stat(&start, "file".as_ref(), p::FollowSymlinks::No));
+ assert!(p::stat(&start, "file/".as_ref(), p::FollowSymlinks::No).is_err());
+ if !cfg!(windows) {
+ assert!(p::stat(&start, "file/.".as_ref(), p::FollowSymlinks::No).is_err());
+ }
+}