Skip to content

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

wasi: remove directories named with a trailing slash (#14662)

Matthew Suozzoab9ebb559089
diff --git a/crates/test-programs/src/bin/p2_remove_directory.rs b/crates/test-programs/src/bin/p2_remove_directory.rs
index 8d6a10335f..95dfdb6591 100644
--- a/crates/test-programs/src/bin/p2_remove_directory.rs
+++ b/crates/test-programs/src/bin/p2_remove_directory.rs
@@ -22,9 +22,15 @@ fn test_remove_directory(dir: &Descriptor) {
dir.remove_directory_at("dir")
.expect("remove_directory on a directory should succeed");
- // There isn't consistient behavior across operating systems of whether removing with a
- // directory where the path has a trailing slash succeeds or fails, so we won't test
- // that behavior.
+ // Test that removing it with trailing slashes also succeeds.
+ dir.create_directory_at("dir")
+ .expect("creating a directory");
+ dir.remove_directory_at("dir/")
+ .expect("remove_directory with a trailing slash on a directory should succeed");
+ dir.create_directory_at("dir")
+ .expect("creating a directory");
+ dir.remove_directory_at("dir//")
+ .expect("remove_directory with trailing slashes on a directory should succeed");
// Create a temporary file.
create_file(dir, "file");
diff --git a/crates/wasi/src/filesystem/primitives/mod.rs b/crates/wasi/src/filesystem/primitives/mod.rs
index 6533c6b869..dca2c1a75e 100644
--- a/crates/wasi/src/filesystem/primitives/mod.rs
+++ b/crates/wasi/src/filesystem/primitives/mod.rs
@@ -298,6 +298,21 @@ pub(crate) fn remove_dir(start: &fs::File, path: &Path) -> io::Result<()> {
return Ok(());
}
+ // As with `create_dir`, a trailing slash after a directory names the
+ // directory itself rather than acting like a trailing slash-dot, so remove
+ // it by its plain name. Other paths with a trailing slash, such as
+ // symlinks, still resolve through `open_parent` below, which keeps
+ // following them within `start`.
+ if path_has_trailing_slash(path) {
+ let stripped = strip_dir_suffix(path);
+ if let Ok((dir, basename)) = open_parent(MaybeOwnedFile::borrowed(start), &stripped) {
+ let basename = Path::new(basename);
+ if stat_unchecked(&dir, basename, FollowSymlinks::No).is_ok_and(|m| m.is_dir()) {
+ return remove_dir_unchecked(&dir, basename);
+ }
+ }
+ }
+
let start = MaybeOwnedFile::borrowed(start);
let (dir, basename) = open_parent(start, path)?;
remove_dir_unchecked(&dir, basename.as_ref())
diff --git a/crates/wasi/src/filesystem/primitives/tests/fs_additional.rs b/crates/wasi/src/filesystem/primitives/tests/fs_additional.rs
index 4b3934c1ab..519fadc619 100644
--- a/crates/wasi/src/filesystem/primitives/tests/fs_additional.rs
+++ b/crates/wasi/src/filesystem/primitives/tests/fs_additional.rs
@@ -284,6 +284,30 @@ fn trailing_slash() {
}
}
+#[test]
+fn remove_dir_trailing_slash() {
+ let tmpdir = tmpdir();
+ let start = h::dir_of(&tmpdir);
+
+ // A trailing slash after a directory names the directory itself.
+ check!(h::create_dir(&start, "dir"));
+ check!(p::remove_dir(&start, Path::new("dir/")));
+ check!(h::create_dir(&start, "dir"));
+ check!(p::remove_dir(&start, Path::new("dir//")));
+ check!(h::create_dir(&start, "dir"));
+ check!(h::create_dir(&start, "dir/sub"));
+ check!(p::remove_dir(&start, Path::new("dir/sub/")));
+
+ // A trailing slash-dot still resolves through `open_parent`, which can't
+ // remove the directory it opened.
+ assert!(p::remove_dir(&start, Path::new("dir/.")).is_err());
+ check!(p::remove_dir(&start, Path::new("dir")));
+
+ // A file with a trailing slash still isn't a directory.
+ check!(h::create(&start, "file"));
+ assert!(p::remove_dir(&start, Path::new("file/")).is_err());
+}
+
#[test]
fn trailing_slash_in_dir() {
let tmpdir = tmpdir();