Introduce strongly-typed system primitives (#1561)
* Introduce strongly-typed system primitives This commit does a lot of reshuffling and even some more. It introduces strongly-typed system primitives which are: `OsFile`, `OsDir`, `Stdio`, and `OsOther`. Those primitives are separate structs now, each implementing a subset of `Handle` methods, rather than all being an enumeration of some supertype such as `OsHandle`. To summarise the structs: * `OsFile` represents a regular file, and implements fd-ops of `Handle` trait * `OsDir` represents a directory, and primarily implements path-ops, plus `readdir` and some common fd-ops such as `fdstat`, etc. * `Stdio` represents a stdio handle, and implements a subset of fd-ops such as `fdstat` _and_ `read_` and `write_vectored` calls * `OsOther` currently represents anything else and implements a set similar to that implemented by `Stdio` This commit is effectively an experiment and an excercise into better understanding what's going on for each OS resource/type under-the-hood. It's meant to give us some intuition in order to move on with the idea of having strongly-typed handles in WASI both in the syscall impl as well as at the libc level. Some more minor changes include making `OsHandle` represent an OS-specific wrapper for a raw OS handle (Unix fd or Windows handle). Also, since `OsDir` is tricky across OSes, we also have a supertype of `OsHandle` called `OsDirHandle` which may store a `DIR*` stream pointer (mainly BSD). Last but not least, the `Filetype` and `Rights` are now computed when the resource is created, rather than every time we call `Handle::get_file_type` and `Handle::get_rights`. Finally, in order to facilitate the latter, I've converted `EntryRights` into `HandleRights` and pushed them into each `Handle` implementor. * Do not adjust rights on Stdio * Clean up testing for TTY and escaping writes * Implement AsFile for dyn Handle This cleans up a lot of repeating boilerplate code todo with dynamic dispatch. * Delegate definition of OsDir to OS-specific modules Delegates defining `OsDir` struct to OS-specific modules (BSD, Linux, Emscripten, Windows). This way, `OsDir` can safely re-use `OsHandle` for raw OS handle storage, and can store some aux data such as an initialized stream ptr in case of BSD. As a result, we can safely get rid of `OsDirHandle` which IMHO was causing unnecessary noise and overcomplicating the design. On the other hand, delegating definition of `OsDir` to OS-specific modules isn't super clean in and of itself either. Perhaps there's a better way of handling this? * Check if filetype of OS handle matches WASI filetype when creating It seems prudent to check if the passed in `File` instance is of type matching that of the requested WASI filetype. In other words, we'd like to avoid situations where `OsFile` is created from a pipe. * Make AsFile fallible Return `EBADF` in `AsFile` in case a `Handle` cannot be made into a `std::fs::File`. * Remove unnecessary as_file conversion * Remove unnecessary check for TTY for Stdio handle type * Fix incorrect stdio ctors on Unix * Split Stdio into three separate types: Stdin, Stdout, Stderr * Rename PendingEntry::File to PendingEntry::OsHandle to avoid confusion * Rename OsHandle to RawOsHandle Also, since `RawOsHandle` on *nix doesn't need interior mutability wrt the inner raw file descriptor, we can safely swap the `RawFd` for `File` instance. * Add docs explaining what OsOther is * Allow for stdio to be non-character-device (e.g., piped) * Return error on bad preopen rather than panic
This commit is contained in:
95
crates/wasi-common/src/sys/osother.rs
Normal file
95
crates/wasi-common/src/sys/osother.rs
Normal file
@@ -0,0 +1,95 @@
|
||||
use super::sys_impl::oshandle::RawOsHandle;
|
||||
use super::{fd, AsFile};
|
||||
use crate::handle::{Handle, HandleRights};
|
||||
use crate::sandboxed_tty_writer::SandboxedTTYWriter;
|
||||
use crate::wasi::types::{self, Filetype};
|
||||
use crate::wasi::Result;
|
||||
use std::any::Any;
|
||||
use std::cell::Cell;
|
||||
use std::fs::File;
|
||||
use std::io::{self, Read, Write};
|
||||
use std::ops::Deref;
|
||||
|
||||
pub(crate) trait OsOtherExt {
|
||||
/// Create `OsOther` as `dyn Handle` from null device.
|
||||
fn from_null() -> io::Result<Box<dyn Handle>>;
|
||||
}
|
||||
|
||||
/// `OsOther` is something of a catch-all for everything not covered with the specific handle
|
||||
/// types (`OsFile`, `OsDir`, `Stdio`). It currently encapsulates handles such as OS pipes,
|
||||
/// sockets, streams, etc. As such, when redirecting stdio within `WasiCtxBuilder`, the redirected
|
||||
/// pipe should be encapsulated within this instance _and not_ `OsFile` which represents a regular
|
||||
/// OS file.
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct OsOther {
|
||||
file_type: Filetype,
|
||||
rights: Cell<HandleRights>,
|
||||
handle: RawOsHandle,
|
||||
}
|
||||
|
||||
impl OsOther {
|
||||
pub(super) fn new(file_type: Filetype, rights: HandleRights, handle: RawOsHandle) -> Self {
|
||||
let rights = Cell::new(rights);
|
||||
Self {
|
||||
file_type,
|
||||
rights,
|
||||
handle,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Deref for OsOther {
|
||||
type Target = RawOsHandle;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.handle
|
||||
}
|
||||
}
|
||||
|
||||
impl Handle for OsOther {
|
||||
fn as_any(&self) -> &dyn Any {
|
||||
self
|
||||
}
|
||||
fn try_clone(&self) -> io::Result<Box<dyn Handle>> {
|
||||
let file_type = self.file_type;
|
||||
let handle = self.handle.try_clone()?;
|
||||
let rights = self.rights.clone();
|
||||
Ok(Box::new(Self {
|
||||
file_type,
|
||||
rights,
|
||||
handle,
|
||||
}))
|
||||
}
|
||||
fn get_file_type(&self) -> Filetype {
|
||||
self.file_type
|
||||
}
|
||||
fn get_rights(&self) -> HandleRights {
|
||||
self.rights.get()
|
||||
}
|
||||
fn set_rights(&self, new_rights: HandleRights) {
|
||||
self.rights.set(new_rights)
|
||||
}
|
||||
// FdOps
|
||||
fn fdstat_get(&self) -> Result<types::Fdflags> {
|
||||
fd::fdstat_get(&*self.as_file()?)
|
||||
}
|
||||
fn fdstat_set_flags(&self, fdflags: types::Fdflags) -> Result<()> {
|
||||
if let Some(handle) = fd::fdstat_set_flags(&*self.as_file()?, fdflags)? {
|
||||
self.handle.update_from(handle);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
fn read_vectored(&self, iovs: &mut [io::IoSliceMut]) -> Result<usize> {
|
||||
let nread = self.as_file()?.read_vectored(iovs)?;
|
||||
Ok(nread)
|
||||
}
|
||||
fn write_vectored(&self, iovs: &[io::IoSlice]) -> Result<usize> {
|
||||
let mut fd: &File = &*self.as_file()?;
|
||||
let nwritten = if self.is_tty() {
|
||||
SandboxedTTYWriter::new(&mut fd).write_vectored(&iovs)?
|
||||
} else {
|
||||
fd.write_vectored(iovs)?
|
||||
};
|
||||
Ok(nwritten)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user