mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 05:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

binfmt_misc: register .wat

Browse Source
This commit is contained in:
Julius Michaelis
2021-08-04 08:49:18 +09:00
parent aa0d1c96db
commit ed18febfce
2 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/cli/src/commands/binfmt.rs
View File

@@ -8,7 +8,7 @@ use std::os::unix::ffi::OsStrExt;
use std::os::unix::fs::MetadataExt; use std::os::unix::fs::MetadataExt;
use Action::*; use Action::*;
#[derive(StructOpt)] #[derive(StructOpt,Clone,Copy)]
enum Action { enum Action {
/// Register wasmer as binfmt interpreter /// Register wasmer as binfmt interpreter
Register, Register,
@@ -54,7 +54,7 @@ impl Binfmt {
panic!("{} does not exist", self.binfmt_misc.to_string_lossy()); panic!("{} does not exist", self.binfmt_misc.to_string_lossy());
} }
let temp_dir; let temp_dir;
let spec = match self.action { let specs = match self.action {
Register | Reregister => { Register | Reregister => {
temp_dir = tempfile::tempdir().context("Make temporary directory")?; temp_dir = tempfile::tempdir().context("Make temporary directory")?;
seccheck(temp_dir.path())?; seccheck(temp_dir.path())?;
@@ -65,34 +65,49 @@ impl Binfmt {
.context("Copy wasmer binary to temp folder")?; .context("Copy wasmer binary to temp folder")?;
let bin_path = fs::canonicalize(&bin_path) let bin_path = fs::canonicalize(&bin_path)
.with_context(|| format!("Couldn't get absolute path for {}", bin_path.to_string_lossy()))?; .with_context(|| format!("Couldn't get absolute path for {}", bin_path.to_string_lossy()))?;
Some([b":wasm32:M::\\x00asm\\x01\\x00\\x00::".as_ref(), bin_path.as_os_str().as_bytes(), b":PFC"].concat()) Some([
[b":wasm32:M::\\x00asm\\x01\\x00\\x00::".as_ref(), bin_path.as_os_str().as_bytes(), b":PFC"].concat(),
[b":wasm32-wat:E::wat::".as_ref(), bin_path.as_os_str().as_bytes(), b":PFC"].concat(),
])
}, },
_ => None _ => None
}; };
let registration = self.binfmt_misc.join("wasm32"); let wasm_registration = self.binfmt_misc.join("wasm32");
let registration_exists = registration.exists(); let wat_registration = self.binfmt_misc.join("wasm32-wat");
match self.action { match self.action {
Unregister if !registration_exists => { Reregister | Unregister => {
bail!("Cannot unregister binfmt, not registered"); let unregister = [wasm_registration, wat_registration].iter().map(|registration| {
}, if registration.exists() {
Reregister | Unregister if registration.exists() => {
let mut registration = fs::OpenOptions::new() let mut registration = fs::OpenOptions::new()
.write(true) .write(true)
.open(registration).context("Open existing binfmt entry to remove")?; .open(registration).context("Open existing binfmt entry to remove")?;
registration.write_all(b"-1").context("Couldn't write binfmt unregister request")?; registration.write_all(b"-1").context("Couldn't write binfmt unregister request")?;
Ok(true)
} else {
eprintln!("Warning: {} does not exist, not unregistered.", registration.to_string_lossy());
Ok(false)
}
}).collect::<Vec<_>>().into_iter().collect::<Result<Vec<_>>>()?;
match (self.action, unregister.into_iter().any(|b| b)) {
(Unregister, false) => bail!("Nothing unregistered"),
_ => ()
}
}, },
_ => (), _ => (),
}; };
if let Some(specs) = specs {
if cfg!(target_env = "gnu") { if cfg!(target_env = "gnu") {
// Approximate. ELF parsing for a proper check feels like overkill here. // Approximate. ELF parsing for a proper check feels like overkill here.
eprintln!("Warning: wasmer has been compiled for glibc, and is thus likely dynamically linked. Invoking wasm binaries in chroots or mount namespaces (lxc, docker, ...) may not work."); eprintln!("Warning: wasmer has been compiled for glibc, and is thus likely dynamically linked. Invoking wasm binaries in chroots or mount namespaces (lxc, docker, ...) may not work.");
} }
if let Some(spec) = spec { specs.iter().map(|spec| {
let register = self.binfmt_misc.join("register"); let register = self.binfmt_misc.join("register");
let mut register = fs::OpenOptions::new() let mut register = fs::OpenOptions::new()
.write(true) .write(true)
.open(register).context("Open binfmt misc for registration")?; .open(register).context("Open binfmt misc for registration")?;
register.write_all(&spec).context("Couldn't register binfmt")?; register.write_all(&spec).context("Couldn't register binfmt")?;
Ok(())
}).collect::<Vec<_>>().into_iter().collect::<Result<Vec<_>>>()?;
} }
Ok(()) Ok(())
} }

0
tests/examples/memory.wat vendored Normal file → Executable file
View File