Fix filesystem rights on WASI, add integration test for file permissions

build.rs

@@ -20,6 +20,8 @@ fn main() -> anyhow::Result<()> {
         .expect("Can't get directory");
     build_deps::rerun_if_changed_paths("tests/wasi-wast/wasi/snapshot1/*")
         .expect("Can't get directory");
+    build_deps::rerun_if_changed_paths("tests/wasi-wast/wasi/nightly-2022-10-18/*")
+        .expect("Can't get directory");
 
     let out_dir = PathBuf::from(
         env::var_os("OUT_DIR").expect("The OUT_DIR environment variable must be set"),
@@ -66,7 +68,7 @@ fn main() -> anyhow::Result<()> {
         };
 
         with_test_module(&mut wasitests, "wasitests", |wasitests| {
-            for wasi_version in &["unstable", "snapshot1"] {
+            for wasi_version in &["unstable", "snapshot1", "nightly_2022_10_18"] {
                 with_test_module(wasitests, wasi_version, |wasitests| {
                     for (wasi_filesystem_test_name, wasi_filesystem_kind) in &[
                         ("host_fs", "WasiFileSystemKind::Host"),

tests/wasi-wast/src/main.rs

@@ -7,7 +7,9 @@ mod wasi_version;
 mod wasitests;
 
 pub use crate::set_up_toolchain::install_toolchains;
-pub use crate::wasi_version::{WasiVersion, ALL_WASI_VERSIONS, LATEST_WASI_VERSION};
+pub use crate::wasi_version::{
+    WasiVersion, ALL_WASI_VERSIONS, LATEST_WASI_VERSION, NIGHTLY_VERSION,
+};
 pub use crate::wasitests::{build, WasiOptions, WasiTest};
 
 use gumdrop::Options;
@@ -17,6 +19,8 @@ pub struct TestGenOptions {
     /// if you want to specify specific tests to generate
     #[options(free)]
     free: Vec<String>,
+    /// Whether to use the current nightly instead of the latest snapshot0 compiler
+    nightly: bool,
     /// Whether or not to do operations for all versions of WASI or just the latest.
     all_versions: bool,
     /// Whether or not the Wasm will be generated.
@@ -38,8 +42,11 @@ fn main() {
     let generate_all = opts.all_versions;
     let set_up_toolchain = opts.set_up_toolchain;
     let generate_wasm = opts.generate_wasm;
+    let nightly = opts.nightly;
     let wasi_versions = if generate_all {
         ALL_WASI_VERSIONS
+    } else if nightly {
+        NIGHTLY_VERSION
     } else {
         LATEST_WASI_VERSION
     };

tests/wasi-wast/src/wasi_version.rs

@@ -1,29 +1,39 @@
 pub static ALL_WASI_VERSIONS: &[WasiVersion] = &[WasiVersion::Unstable, WasiVersion::Snapshot1];
 pub static LATEST_WASI_VERSION: &[WasiVersion] = &[WasiVersion::get_latest()];
+pub static NIGHTLY_VERSION: &[WasiVersion] = &[WasiVersion::current_nightly()];
 
 #[derive(Debug, Clone, Copy)]
 pub enum WasiVersion {
     /// A.K.A. Snapshot0
     Unstable,
     Snapshot1,
+    /// This is for making tests pass on Apple M1 while
+    /// still keeping the old test for compatibility reasons
+    CurrentNightly,
 }
 
 impl WasiVersion {
     pub const fn get_latest() -> Self {
         Self::Snapshot1
     }
 
+    pub const fn current_nightly() -> Self {
+        Self::CurrentNightly
+    }
+
     pub fn get_compiler_toolchain(&self) -> &'static str {
         match self {
             WasiVersion::Unstable => "nightly-2019-09-13",
             WasiVersion::Snapshot1 => "1.53.0",
+            WasiVersion::CurrentNightly => "nightly-2022-10-18",
         }
     }
 
     pub fn get_directory_name(&self) -> &'static str {
         match self {
             WasiVersion::Unstable => "unstable",
             WasiVersion::Snapshot1 => "snapshot1",
+            WasiVersion::CurrentNightly => "nightly_2022_10_18",
         }
     }
 }

tests/wasi-wast/wasi/nightly_2022_10_18/close_preopen_fd.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "close_preopen_fd.wasm"
+  (map_dirs "hamlet:test_fs/hamlet")
+  (assert_return (i64.const 0))
+  (assert_stdout "accessing preopen fd was a success\nClosing preopen fd was a success\naccessing closed preopen fd was an EBADF error: true\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/create_dir.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "create_dir.wasm"
+  (preopens "test_fs")
+  (assert_return (i64.const 0))
+  (assert_stdout "Test file exists: false\nDir exists: false\nDir exists: false\nDir exists: false\nSuccess\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/envvar.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "envvar.wasm"
+  (envs "DOG=1" "CAT=2")
+  (assert_return (i64.const 0))
+  (assert_stdout "Env vars:\nCAT=2\nDOG=1\nDOG Ok(\"1\")\nDOG_TYPE Err(NotPresent)\nSET VAR Ok(\"HELLO\")\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/fd_allocate.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fd_allocate.wasm"
+  (temp_dirs ".")
+  (assert_return (i64.const 0))
+  (assert_stdout "171\n1405\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/fd_append.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fd_append.wasm"
+  (temp_dirs ".")
+  (assert_return (i64.const 101))
+  (assert_stderr "thread 'main' panicked at 'Couldn't create file: Os { code: 2, kind: NotFound, message: \"No such file or directory\" }', /Users/fs/Development/wasmer/tests/wasi-wast/wasi/tests/fd_append.rs:27:14\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/fd_close.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fd_close.wasm"
+  (map_dirs ".:test_fs/hamlet")
+  (assert_return (i64.const 0))
+  (assert_stdout "Successfully closed file!\nSuccessfully closed stderr!\nSuccessfully closed stdin!\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/fd_pread.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fd_pread.wasm"
+  (preopens "test_fs")
+  (assert_return (i64.const 0))
+  (assert_stdout " POLONIUS\n\n    He will come straight. Look you lay home to him:\n\n POLONIUS\n\n    He will come straight. Look you lay home to him:\n\nRead the same data? true\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/fd_read.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fd_read.wasm"
+  (map_dirs ".:test_fs/hamlet")
+  (assert_return (i64.const 0))
+  (assert_stdout "SCENE IV. The Queen's closet.\n\n    Enter QUEEN GERTRUDE and POLO\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/fd_rename_path.wast

@@ -0,0 +1,6 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fd_rename_path.wasm"
+  (preopens "test_fs")
+  (assert_return (i64.const 0))
+)

tests/wasi-wast/wasi/nightly_2022_10_18/fd_rights.wast

@@ -0,0 +1,6 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fd_rights.wasm"
+  (assert_return (i64.const 101))
+  (assert_stderr "thread 'main' panicked at 'assertion failed: files.is_empty()', /Users/fs/Development/wasmer/tests/wasi-wast/wasi/tests/fd_rights.rs:6:5\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/fd_sync.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fd_sync.wasm"
+  (temp_dirs ".")
+  (assert_return (i64.const 0))
+  (assert_stdout "170\n1404\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/file_metadata.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "file_metadata.wasm"
+  (preopens "test_fs")
+  (assert_return (i64.const 0))
+  (assert_stdout "is dir: false\nfiletype: false true false\nfile info: 8866\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/fs_sandbox_test.wast

@@ -0,0 +1,6 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fs_sandbox_test.wasm"
+  (assert_return (i64.const 0))
+  (assert_stdout "Reading the parent directory was okay? false\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/fseek.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fseek.wasm"
+  (map_dirs ".:test_fs/hamlet")
+  (assert_return (i64.const 0))
+  (assert_stdout "SCENE III. A room in Polonius' h\nouse.\n\n    Enter LAERTES and OPH\n    And, sister, as the winds gi\nr talk with the Lord Hamlet.\n   \nuits,\n    Breathing like sanctif\nis is for all:\n    I would not, \n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/hello.wast

@@ -0,0 +1,6 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "hello.wasm"
+  (assert_return (i64.const 0))
+  (assert_stdout "Hello, world!\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/isatty.wast

@@ -0,0 +1,6 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "isatty.wasm"
+  (assert_return (i64.const 0))
+  (assert_stdout "stdin: 1\nstdout: 1\nstderr: 1\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/mapdir.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "mapdir.wasm"
+  (map_dirs ".:test_fs/hamlet")
+  (assert_return (i64.const 0))
+  (assert_stdout "\"./README.md\"\n\"./act1\"\n\"./act2\"\n\"./act3\"\n\"./act4\"\n\"./act5\"\n\"./bookmarks\"\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/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")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/path_link.wast

@@ -0,0 +1,8 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "path_link.wasm"
+  (map_dirs "act5:test_fs/hamlet/act5")
+  (temp_dirs "temp")
+  (assert_return (i64.const 0))
+  (assert_stdout "ACT V\nSCENE I. A churchyard.\n\n    Enter two Clowns, with spades,\nACT V\nSCENE I. A churchyard.\n\n    Enter two Clowns, with spades,\nPath still exists\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/path_rename.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "path_rename.wasm"
+  (temp_dirs "temp")
+  (assert_return (i64.const 0))
+  (assert_stdout "The original file does not still exist!\nFound item: path_renamed_file.txt\n柴犬\nThe original file does not still exist!\nFound item: path_renamed_file.txt\n柴犬\nrun_with_sub_dir: The original file does not still exist!\nrun_with_different_sub_dirs: The original file does not still exist!\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/path_symlink.wast

@@ -0,0 +1,8 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "path_symlink.wasm"
+  (map_dirs "hamlet:test_fs/hamlet")
+  (temp_dirs "temp")
+  (assert_return (i64.const 101))
+  (assert_stderr "thread 'main' panicked at 'Could not open file: Os { code: 2, kind: NotFound, message: \"No such file or directory\" }', /Users/fs/Development/wasmer/tests/wasi-wast/wasi/tests/path_symlink.rs:21:44\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/pipe_reverse.wast

@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "pipe_reverse.wasm"
+  (assert_return (i64.const 0))
+  (stdin "Hello, world!")
+  (assert_stdout "!dlrow ,olleH\n")
+)

tests/wasi-wast/wasi/nightly_2022_10_18/poll_oneoff.wast

@@ -0,0 +1,8 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "poll_oneoff.wasm"
+  (map_dirs "hamlet:test_fs/hamlet")
+  (temp_dirs "temp")
+  (assert_return (i64.const 101))
+  (assert_stderr "thread 'main' panicked at 'Could not open file: Os { code: 2, kind: NotFound, message: \"No such file or directory\" }', /Users/fs/Development/wasmer/tests/wasi-wast/wasi/tests/poll_oneoff.rs:155:14\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n")
+)