Merge #1660

1660: Allow mapdir aliases with starting `/` r=MarkMcCaskey a=MarkMcCaskey Stripping leading `/` is valid because we mount mapped dirs at `/` regardless. Resolves #1503 This solution is a bit hacky, there may be a more elegant solution. I'll look for one tomorrow morning when I'm more mentally fresh. - [ ] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: Mark McCaskey <[email protected]>
wasmerio · Oct 1, 2020 · cebf0cd · cebf0cd
2 parents d924639 + 9c208a1
commit cebf0cd
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 0 deletions.
diff --git a/lib/wasi/src/state/builder.rs b/lib/wasi/src/state/builder.rs
@@ -438,6 +438,9 @@ impl PreopenDirBuilder {
 
     /// Make this preopened directory appear to the WASI program as `alias`
     pub fn alias(&mut self, alias: &str) -> &mut Self {
+        // We mount at preopened dirs at `/` by default and multiple `/` in a row
+        // are equal to a single `/`.
+        let alias = alias.trim_start_matches('/');
         self.alias = Some(alias.to_string());
 
         self

diff --git a/tests/ignores.txt b/tests/ignores.txt
@@ -61,12 +61,14 @@ wasitests::snapshot1::file_metadata on windows
 wasitests::snapshot1::fseek on windows
 wasitests::snapshot1::path_link on windows
 wasitests::snapshot1::path_symlink on windows
+wasitests::snapshot1::mapdir_with_leading_slash on windows
 wasitests::unstable::fd_pread on windows
 wasitests::unstable::fd_read on windows
 wasitests::unstable::file_metadata on windows
 wasitests::unstable::fseek on windows
 wasitests::unstable::path_link on windows
 wasitests::unstable::path_symlink on windows
+wasitests::unstable::mapdir_with_leading_slash on windows
 
 # This test is meant to only run on Unix
 wasitests::unstable::unix_open_special_files on windows

diff --git a/tests/wasi-wast/wasi/snapshot1/mapdir_with_leading_slash.wasm b/tests/wasi-wast/wasi/snapshot1/mapdir_with_leading_slash.wasm
diff --git a/tests/wasi-wast/wasi/snapshot1/mapdir_with_leading_slash.wast b/tests/wasi-wast/wasi/snapshot1/mapdir_with_leading_slash.wast
@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "mapdir_with_leading_slash.wasm"
+  (map_dirs "/hamlet:test_fs/hamlet")
+  (assert_return (i64.const 0))
+  (assert_stdout "File exists? true\nSCENE III. A room in the castle.\n\n    Enter KING CLAUDIUS, ROSENCRANTZ, and GUILDENSTERN \n\nKING CLAUDIUS\n\n    I like him not, nor stands it safe with us\n    To let his madness range. Therefore prepare you;\n    I your commission will forthwith dispatch,\n   \n")
+)
diff --git a/tests/wasi-wast/wasi/tests/mapdir_with_leading_slash.rs b/tests/wasi-wast/wasi/tests/mapdir_with_leading_slash.rs
@@ -0,0 +1,23 @@
+// WASI:
+// mapdir: /hamlet:test_fs/hamlet
+
+use std::fs;
+use std::io::Read;
+use std::path::PathBuf;
+
+fn main() {
+    #[cfg(not(target_os = "wasi"))]
+    let mut base = PathBuf::from("test_fs/hamlet");
+    #[cfg(target_os = "wasi")]
+    let mut base = PathBuf::from("hamlet");
+
+    base.push("act3/scene3.txt");
+
+    println!("File exists? {}", base.exists());
+
+    let mut f = fs::File::open(&base).unwrap();
+    let mut s = String::new();
+    f.read_to_string(&mut s).unwrap();
+
+    println!("{}", s.chars().take(256).collect::<String>());
+}
diff --git a/tests/wasi-wast/wasi/unstable/mapdir_with_leading_slash.wasm b/tests/wasi-wast/wasi/unstable/mapdir_with_leading_slash.wasm
diff --git a/tests/wasi-wast/wasi/unstable/mapdir_with_leading_slash.wast b/tests/wasi-wast/wasi/unstable/mapdir_with_leading_slash.wast
@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "mapdir_with_leading_slash.wasm"
+  (map_dirs "/hamlet:test_fs/hamlet")
+  (assert_return (i64.const 0))
+  (assert_stdout "File exists? true\nSCENE III. A room in the castle.\n\n    Enter KING CLAUDIUS, ROSENCRANTZ, and GUILDENSTERN \n\nKING CLAUDIUS\n\n    I like him not, nor stands it safe with us\n    To let his madness range. Therefore prepare you;\n    I your commission will forthwith dispatch,\n   \n")
+)