kobako 0.30.0 → 0.31.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.release-please-manifest.json +1 -1
- data/CHANGELOG.md +335 -0
- data/Cargo.lock +469 -11
- data/README.md +43 -3
- data/ROADMAP.md +1 -1
- data/crates/kobako-runtime/CHANGELOG.md +219 -0
- data/crates/kobako-runtime/Cargo.toml +51 -3
- data/crates/kobako-runtime/README.md +7 -4
- data/crates/kobako-runtime/src/cred.rs +124 -0
- data/crates/kobako-runtime/src/dispatch.rs +4 -5
- data/crates/kobako-runtime/src/endpoint/buffer.rs +153 -44
- data/crates/kobako-runtime/src/endpoint/dispatch.rs +80 -41
- data/crates/kobako-runtime/src/endpoint/invoke.rs +23 -36
- data/crates/kobako-runtime/src/endpoint.rs +137 -36
- data/crates/kobako-runtime/src/errno.rs +391 -0
- data/crates/kobako-runtime/src/error.rs +31 -10
- data/crates/kobako-runtime/src/filesystem/anon_inodes.rs +52 -0
- data/crates/kobako-runtime/src/filesystem/bind/lookup.rs +52 -14
- data/crates/kobako-runtime/src/filesystem/bind/walk.rs +19 -20
- data/crates/kobako-runtime/src/filesystem/bind.rs +437 -245
- data/crates/kobako-runtime/src/filesystem/overlay/file.rs +6 -6
- data/crates/kobako-runtime/src/filesystem/overlay/path.rs +43 -65
- data/crates/kobako-runtime/src/filesystem/overlay/stack/copy_up.rs +9 -16
- data/crates/kobako-runtime/src/filesystem/overlay/stack/dir.rs +47 -72
- data/crates/kobako-runtime/src/filesystem/overlay/stack/namei.rs +12 -12
- data/crates/kobako-runtime/src/filesystem/overlay/stack/readdir.rs +4 -7
- data/crates/kobako-runtime/src/filesystem/overlay/stack.rs +121 -37
- data/crates/kobako-runtime/src/filesystem/overlay.rs +302 -343
- data/crates/kobako-runtime/src/filesystem/pipe.rs +12 -9
- data/crates/kobako-runtime/src/filesystem/rdir.rs +15 -32
- data/crates/kobako-runtime/src/filesystem/tmpfs/seed.rs +32 -0
- data/crates/kobako-runtime/src/filesystem/tmpfs/tmpfile.rs +3 -3
- data/crates/kobako-runtime/src/filesystem/tmpfs/whiteout.rs +57 -35
- data/crates/kobako-runtime/src/filesystem/tmpfs/xattr.rs +2 -2
- data/crates/kobako-runtime/src/filesystem/tmpfs.rs +172 -160
- data/crates/kobako-runtime/src/filesystem/wrap.rs +36 -52
- data/crates/kobako-runtime/src/filesystem.rs +6 -3
- data/crates/kobako-runtime/src/fork.rs +96 -0
- data/crates/kobako-runtime/src/grant.rs +3 -0
- data/crates/kobako-runtime/src/hashtable.rs +4 -2
- data/crates/kobako-runtime/src/lib.rs +18 -7
- data/crates/kobako-runtime/src/limits.rs +195 -0
- data/crates/kobako-runtime/src/locking.rs +10 -0
- data/crates/kobako-runtime/src/memcg.rs +383 -0
- data/crates/kobako-runtime/src/mount.rs +67 -9
- data/crates/kobako-runtime/src/net/backends.rs +43 -0
- data/crates/kobako-runtime/src/net/connections.rs +179 -0
- data/crates/kobako-runtime/src/net/credential.rs +125 -0
- data/crates/kobako-runtime/src/net/egress.rs +160 -0
- data/crates/kobako-runtime/src/net/family.rs +181 -0
- data/crates/kobako-runtime/src/net/http.rs +2733 -0
- data/crates/kobako-runtime/src/net/lookup.rs +285 -0
- data/crates/kobako-runtime/src/net/mock.rs +251 -0
- data/crates/kobako-runtime/src/net/namespace.rs +1366 -0
- data/crates/kobako-runtime/src/net/reactor.rs +531 -0
- data/crates/kobako-runtime/src/net/resolv/darwin.rs +275 -0
- data/crates/kobako-runtime/src/net/resolv/stub/tests.rs +469 -0
- data/crates/kobako-runtime/src/net/resolv/stub.rs +536 -0
- data/crates/kobako-runtime/src/net/resolv/windows.rs +248 -0
- data/crates/kobako-runtime/src/net/resolv.rs +227 -0
- data/crates/kobako-runtime/src/net/socket.rs +870 -0
- data/crates/kobako-runtime/src/net/tcp.rs +1588 -0
- data/crates/kobako-runtime/src/net/tls.rs +58 -0
- data/crates/kobako-runtime/src/net/transport.rs +279 -0
- data/crates/kobako-runtime/src/net/udp.rs +1003 -0
- data/crates/kobako-runtime/src/net.rs +42 -0
- data/crates/kobako-runtime/src/network/builder.rs +177 -0
- data/crates/kobako-runtime/src/network/ruleset.rs +777 -0
- data/crates/kobako-runtime/src/network.rs +551 -0
- data/crates/kobako-runtime/src/policy.rs +16 -0
- data/crates/kobako-runtime/src/profile.rs +29 -144
- data/crates/kobako-runtime/src/runtime.rs +3 -5
- data/crates/kobako-runtime/src/sched.rs +130 -29
- data/crates/kobako-runtime/src/security/entry_policy.rs +22 -0
- data/crates/kobako-runtime/src/{vfs/cred.rs → security/hooks.rs} +52 -144
- data/crates/kobako-runtime/src/security/mount_policy.rs +158 -0
- data/crates/kobako-runtime/src/security.rs +101 -196
- data/crates/kobako-runtime/src/snapshot.rs +121 -2
- data/crates/kobako-runtime/src/vfs/attr.rs +5 -5
- data/crates/kobako-runtime/src/vfs/dentry.rs +143 -89
- data/crates/kobako-runtime/src/vfs/file.rs +199 -203
- data/crates/kobako-runtime/src/vfs/inode.rs +41 -45
- data/crates/kobako-runtime/src/vfs/kern_path.rs +38 -42
- data/crates/kobako-runtime/src/vfs/mount.rs +10 -9
- data/crates/kobako-runtime/src/vfs/namei.rs +829 -700
- data/crates/kobako-runtime/src/vfs/namespace.rs +162 -0
- data/crates/kobako-runtime/src/vfs/open_files.rs +69 -0
- data/crates/kobako-runtime/src/vfs/openat2.rs +3 -3
- data/crates/kobako-runtime/src/vfs/path.rs +6 -6
- data/crates/kobako-runtime/src/vfs/readdir.rs +6 -6
- data/crates/kobako-runtime/src/vfs/stat.rs +159 -23
- data/crates/kobako-runtime/src/vfs/super_block.rs +18 -14
- data/crates/kobako-runtime/src/vfs/utimes.rs +37 -27
- data/crates/kobako-runtime/src/vfs.rs +9 -6
- data/crates/kobako-runtime/src/wait.rs +356 -0
- data/crates/kobako-transport/CHANGELOG.md +31 -0
- data/crates/kobako-transport/Cargo.toml +1 -1
- data/crates/kobako-transport/README.md +3 -4
- data/crates/kobako-transport/src/abi.rs +78 -72
- data/crates/kobako-transport/src/envelope/bytes.rs +17 -6
- data/crates/kobako-transport/src/envelope/call.rs +32 -4
- data/crates/kobako-transport/src/envelope/error_record.rs +21 -0
- data/crates/kobako-transport/src/envelope/name.rs +99 -0
- data/crates/kobako-transport/src/envelope/outcome.rs +9 -9
- data/crates/kobako-transport/src/envelope/preamble.rs +24 -21
- data/crates/kobako-transport/src/envelope/reply.rs +27 -27
- data/crates/kobako-transport/src/envelope/unsupported.rs +10 -10
- data/crates/kobako-transport/src/envelope.rs +13 -8
- data/crates/kobako-wasmtime/CHANGELOG.md +161 -0
- data/crates/kobako-wasmtime/Cargo.toml +26 -7
- data/crates/kobako-wasmtime/README.md +3 -2
- data/crates/kobako-wasmtime/build/preview2.rs +1339 -0
- data/crates/kobako-wasmtime/build.rs +16 -0
- data/crates/kobako-wasmtime/src/abi.rs +17 -37
- data/crates/kobako-wasmtime/src/ambient.rs +33 -18
- data/crates/kobako-wasmtime/src/cache.rs +23 -15
- data/crates/kobako-wasmtime/src/config.rs +52 -68
- data/crates/kobako-wasmtime/src/driver.rs +48 -63
- data/crates/kobako-wasmtime/src/exports.rs +143 -17
- data/crates/kobako-wasmtime/src/guest.rs +12 -6
- data/crates/kobako-wasmtime/src/guest_binary.rs +14 -0
- data/crates/kobako-wasmtime/src/imports.rs +42 -18
- data/crates/kobako-wasmtime/src/instance_pre.rs +4 -4
- data/crates/kobako-wasmtime/src/invocation.rs +74 -12
- data/crates/kobako-wasmtime/src/lib.rs +5 -3
- data/crates/kobako-wasmtime/src/limiter.rs +70 -5
- data/crates/kobako-wasmtime/src/preview1/descriptors.rs +309 -0
- data/crates/kobako-wasmtime/src/preview1/differential/mount.rs +5 -15
- data/crates/kobako-wasmtime/src/preview1/differential.rs +27 -31
- data/crates/kobako-wasmtime/src/preview1/errno.rs +55 -66
- data/crates/kobako-wasmtime/src/preview1/fd.rs +327 -296
- data/crates/kobako-wasmtime/src/preview1/memory.rs +21 -12
- data/crates/kobako-wasmtime/src/preview1/mount_view/wrap.rs +34 -53
- data/crates/kobako-wasmtime/src/preview1/mount_view.rs +231 -217
- data/crates/kobako-wasmtime/src/preview1/path.rs +56 -121
- data/crates/kobako-wasmtime/src/preview1/poll.rs +244 -120
- data/crates/kobako-wasmtime/src/preview1/sock.rs +10 -8
- data/crates/kobako-wasmtime/src/preview1/testsuite.rs +5 -15
- data/crates/kobako-wasmtime/src/preview1.rs +46 -42
- data/crates/kobako-wasmtime/src/preview2/abi.rs +227 -0
- data/crates/kobako-wasmtime/src/preview2/error.rs +118 -0
- data/crates/kobako-wasmtime/src/preview2/filesystem.rs +122 -0
- data/crates/kobako-wasmtime/src/preview2/host.rs +3959 -0
- data/crates/kobako-wasmtime/src/preview2/http.rs +1503 -0
- data/crates/kobako-wasmtime/src/preview2/io.rs +315 -0
- data/crates/kobako-wasmtime/src/preview2/sockets.rs +379 -0
- data/crates/kobako-wasmtime/src/preview2/table.rs +305 -0
- data/crates/kobako-wasmtime/src/preview2.rs +57 -0
- data/crates/kobako-wasmtime/src/trap.rs +24 -9
- data/crates/kobako-wasmtime/src/wasi.rs +210 -81
- data/crates/kobako-wasmtime/wit/deps/cli.wit +233 -0
- data/crates/kobako-wasmtime/wit/deps/clocks.wit +162 -0
- data/crates/kobako-wasmtime/wit/deps/filesystem.wit +589 -0
- data/crates/kobako-wasmtime/wit/deps/http.wit +733 -0
- data/crates/kobako-wasmtime/wit/deps/io.wit +299 -0
- data/crates/kobako-wasmtime/wit/deps/random.wit +92 -0
- data/crates/kobako-wasmtime/wit/deps/sockets.wit +949 -0
- data/data/kobako.wasm +0 -0
- data/ext/kobako/Cargo.toml +1 -1
- data/ext/kobako/src/{runtime/errors.rs → errors.rs} +34 -26
- data/ext/kobako/src/{runtime/escape.rs → escape.rs} +42 -11
- data/ext/kobako/src/{runtime/filesystem → filesystem}/grants.rs +30 -26
- data/ext/kobako/src/{runtime/filesystem → filesystem}/ruby.rs +149 -168
- data/ext/kobako/src/{runtime/filesystem.rs → filesystem.rs} +24 -15
- data/ext/kobako/src/gvl.rs +306 -0
- data/ext/kobako/src/lib.rs +64 -3
- data/ext/kobako/src/network/mock.rs +187 -0
- data/ext/kobako/src/network.rs +591 -0
- data/ext/kobako/src/runtime/bridge.rs +30 -29
- data/ext/kobako/src/runtime/snapshot.rs +4 -4
- data/ext/kobako/src/runtime.rs +221 -143
- data/ext/kobako/src/wire.rs +42 -0
- data/lib/kobako/catalog/extensions.rb +14 -2
- data/lib/kobako/catalog/flags.rb +3 -5
- data/lib/kobako/catalog/grants.rb +5 -4
- data/lib/kobako/catalog/handles.rb +5 -27
- data/lib/kobako/catalog/mount.rb +11 -3
- data/lib/kobako/catalog/network.rb +35 -0
- data/lib/kobako/catalog/replacements.rb +28 -0
- data/lib/kobako/catalog/services.rb +5 -19
- data/lib/kobako/catalog/snippets.rb +3 -18
- data/lib/kobako/catalog.rb +3 -0
- data/lib/kobako/codec/{utils.rb → boundary.rb} +4 -2
- data/lib/kobako/codec/decoder.rb +4 -4
- data/lib/kobako/codec/ext_types.rb +3 -3
- data/lib/kobako/codec/handle_walk.rb +3 -43
- data/lib/kobako/codec/value_budget.rb +132 -40
- data/lib/kobako/codec.rb +1 -1
- data/lib/kobako/context.rb +24 -11
- data/lib/kobako/errors.rb +15 -12
- data/lib/kobako/extension.rb +3 -2
- data/lib/kobako/filesystem.rb +9 -2
- data/lib/kobako/handle.rb +2 -2
- data/lib/kobako/names.rb +28 -0
- data/lib/kobako/network.rb +210 -0
- data/lib/kobako/outcome.rb +7 -7
- data/lib/kobako/pool.rb +45 -23
- data/lib/kobako/runtime.rb +3 -2
- data/lib/kobako/sandbox.rb +92 -35
- data/lib/kobako/sandbox_options.rb +41 -106
- data/lib/kobako/transport/argument_wrap.rb +64 -0
- data/lib/kobako/transport/block_failure.rb +1 -1
- data/lib/kobako/transport/dispatcher.rb +6 -6
- data/lib/kobako/transport/exposure.rb +26 -15
- data/lib/kobako/transport/reflection.rb +21 -4
- data/lib/kobako/transport/run.rb +8 -23
- data/lib/kobako/transport/yielder.rb +2 -9
- data/lib/kobako/transport.rb +1 -0
- data/lib/kobako/version.rb +1 -1
- data/lib/kobako.rb +6 -2
- data/release-please-config.json +15 -0
- data/sig/core/thread.rbs +6 -0
- data/sig/kobako/catalog/extensions.rbs +2 -0
- data/sig/kobako/catalog/grants.rbs +7 -4
- data/sig/kobako/catalog/handles.rbs +0 -2
- data/sig/kobako/catalog/mount.rbs +3 -1
- data/sig/kobako/catalog/network.rbs +20 -0
- data/sig/kobako/catalog/replacements.rbs +14 -0
- data/sig/kobako/catalog/services.rbs +0 -4
- data/sig/kobako/catalog/snippets.rbs +0 -2
- data/sig/kobako/codec/{utils.rbs → boundary.rbs} +2 -2
- data/sig/kobako/codec/handle_walk.rbs +0 -6
- data/sig/kobako/codec/value_budget.rbs +47 -4
- data/sig/kobako/context.rbs +3 -1
- data/sig/kobako/errors.rbs +4 -4
- data/sig/kobako/filesystem.rbs +21 -3
- data/sig/kobako/network.rbs +115 -0
- data/sig/kobako/outcome.rbs +1 -1
- data/sig/kobako/pool.rbs +7 -3
- data/sig/kobako/runtime.rbs +32 -3
- data/sig/kobako/sandbox.rbs +19 -2
- data/sig/kobako/sandbox_options.rbs +29 -38
- data/sig/kobako/transport/argument_wrap.rbs +15 -0
- data/sig/kobako/transport/error.rbs +1 -1
- data/sig/kobako/transport/exposure.rbs +2 -4
- data/sig/kobako/transport/reflection.rbs +10 -0
- data/sig/kobako/transport/run.rbs +0 -2
- data/sig/kobako/transport/yielder.rbs +0 -3
- data/sig/kobako/transport.rbs +1 -1
- data/sig/kobako.rbs +13 -0
- metadata +84 -35
- data/crates/kobako-runtime/src/endpoint/capture.rs +0 -115
- data/crates/kobako-runtime/src/endpoint/memory_cap.rs +0 -238
- data/crates/kobako-runtime/src/filesystem/path.rs +0 -21
- data/crates/kobako-runtime/src/vfs/errno.rs +0 -153
- data/crates/kobako-runtime/tests/linux_baseline/calls.rs +0 -171
- data/crates/kobako-runtime/tests/linux_baseline/concurrent.rs +0 -276
- data/crates/kobako-runtime/tests/linux_baseline/kobako.rs +0 -323
- data/crates/kobako-runtime/tests/linux_baseline/linux-baseline-expected.txt +0 -16
- data/crates/kobako-runtime/tests/linux_baseline/linux.rs +0 -449
- data/crates/kobako-runtime/tests/linux_baseline/main.rs +0 -611
- data/crates/kobako-runtime/tests/linux_baseline/permissions.rs +0 -236
- data/crates/kobako-wasmtime/src/descriptors.rs +0 -200
- data/crates/kobako-wasmtime/tests/integration/compile_posture.rs +0 -43
- data/crates/kobako-wasmtime/tests/integration/guest_file.rs +0 -1085
- data/crates/kobako-wasmtime/tests/integration/main.rs +0 -29
- data/crates/kobako-wasmtime/tests/integration/preamble_flags.rs +0 -70
- data/crates/kobako-wasmtime/tests/integration/snippet_compile.rs +0 -95
- data/crates/kobako-wasmtime/tests/integration/support/mod.rs +0 -30
- data/crates/kobako-wasmtime/tests/integration/unanswered_call.rs +0 -86
- data/crates/kobako-wasmtime/tests/integration/unsupported_call.rs +0 -51
- data/ext/kobako/src/runtime/gvl.rs +0 -147
- data/lib/kobako/constant_name.rb +0 -8
- data/sig/kobako/constant_name.rbs +0 -3
- /data/ext/kobako/src/{runtime/pinned_value.rs → pinned_value.rs} +0 -0
|
@@ -3,13 +3,14 @@
|
|
|
3
3
|
//!
|
|
4
4
|
//! wasmtime-wasi keeps its table private, so a descriptor kobako places
|
|
5
5
|
//! there would stay invisible to its calls. Answering every call that reads
|
|
6
|
-
//! a descriptor keeps the guest on one table, `
|
|
7
|
-
//! each Mount is a preopen. The other ten imports — arguments,
|
|
6
|
+
//! a descriptor keeps the guest on one table, `descriptors`, where
|
|
7
|
+
//! each outermost Mount is a preopen. The other ten imports — arguments,
|
|
8
8
|
//! environment, clocks, process, scheduling, and randomness — stay
|
|
9
9
|
//! wasmtime-wasi's, so `witx/` declares only these 36. wiggle generates their
|
|
10
10
|
//! glue as it generates wasmtime-wasi's, so a value outside what the witx
|
|
11
11
|
//! defines traps there before a call starts.
|
|
12
12
|
|
|
13
|
+
pub(crate) mod descriptors;
|
|
13
14
|
mod errno;
|
|
14
15
|
mod fd;
|
|
15
16
|
mod memory;
|
|
@@ -27,7 +28,6 @@ mod testsuite;
|
|
|
27
28
|
use wasmtime::Linker;
|
|
28
29
|
use wiggle::GuestPtr;
|
|
29
30
|
|
|
30
|
-
use crate::descriptors::Descriptors;
|
|
31
31
|
use crate::invocation::Invocation;
|
|
32
32
|
use errno::Answer;
|
|
33
33
|
use memory::GuestMemory;
|
|
@@ -70,10 +70,6 @@ pub(crate) fn shadow(linker: &mut Linker<Invocation>) -> wasmtime::Result<()> {
|
|
|
70
70
|
Ok(())
|
|
71
71
|
}
|
|
72
72
|
|
|
73
|
-
fn table(invocation: &mut Invocation) -> &mut Descriptors {
|
|
74
|
-
invocation.wasi_mut().descriptors_mut()
|
|
75
|
-
}
|
|
76
|
-
|
|
77
73
|
impl Invocation {
|
|
78
74
|
/// Run one call against the calling instance's memory, answering what it
|
|
79
75
|
/// answers unless its host has given the invocation up by then.
|
|
@@ -105,7 +101,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
105
101
|
_advice: types::Advice,
|
|
106
102
|
) -> Answer {
|
|
107
103
|
self.answer(memory, |_, inv| {
|
|
108
|
-
fd::advise(
|
|
104
|
+
fd::advise(inv.wasi_mut(), fd.into(), offset, len)
|
|
109
105
|
})
|
|
110
106
|
}
|
|
111
107
|
|
|
@@ -117,16 +113,16 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
117
113
|
len: types::Filesize,
|
|
118
114
|
) -> Answer {
|
|
119
115
|
self.answer(memory, |_, inv| {
|
|
120
|
-
fd::allocate(
|
|
116
|
+
fd::allocate(inv.wasi_mut(), fd.into(), offset, len)
|
|
121
117
|
})
|
|
122
118
|
}
|
|
123
119
|
|
|
124
120
|
fn fd_close(&mut self, memory: &mut wiggle::GuestMemory<'_>, fd: types::Fd) -> Answer {
|
|
125
|
-
self.answer(memory, |_, inv| fd::close(
|
|
121
|
+
self.answer(memory, |_, inv| fd::close(inv.wasi_mut(), fd.into()))
|
|
126
122
|
}
|
|
127
123
|
|
|
128
124
|
fn fd_datasync(&mut self, memory: &mut wiggle::GuestMemory<'_>, fd: types::Fd) -> Answer {
|
|
129
|
-
self.answer(memory, |_, inv| fd::sync(
|
|
125
|
+
self.answer(memory, |_, inv| fd::sync(inv.wasi_mut(), fd.into(), true))
|
|
130
126
|
}
|
|
131
127
|
|
|
132
128
|
fn fd_fdstat_get(
|
|
@@ -134,7 +130,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
134
130
|
memory: &mut wiggle::GuestMemory<'_>,
|
|
135
131
|
fd: types::Fd,
|
|
136
132
|
) -> Answer<types::Fdstat> {
|
|
137
|
-
self.answer(memory, |_, inv| fd::fdstat_get(
|
|
133
|
+
self.answer(memory, |_, inv| fd::fdstat_get(inv.wasi_mut(), fd.into()))
|
|
138
134
|
}
|
|
139
135
|
|
|
140
136
|
fn fd_fdstat_set_flags(
|
|
@@ -144,7 +140,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
144
140
|
flags: types::Fdflags,
|
|
145
141
|
) -> Answer {
|
|
146
142
|
self.answer(memory, |_, inv| {
|
|
147
|
-
fd::fdstat_set_flags(
|
|
143
|
+
fd::fdstat_set_flags(inv.wasi_mut(), fd.into(), flags)
|
|
148
144
|
})
|
|
149
145
|
}
|
|
150
146
|
|
|
@@ -156,7 +152,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
156
152
|
_fs_rights_inheriting: types::Rights,
|
|
157
153
|
) -> Answer {
|
|
158
154
|
self.answer(memory, |_, inv| {
|
|
159
|
-
fd::fdstat_set_rights(
|
|
155
|
+
fd::fdstat_set_rights(inv.wasi_mut(), fd.into())
|
|
160
156
|
})
|
|
161
157
|
}
|
|
162
158
|
|
|
@@ -165,7 +161,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
165
161
|
memory: &mut wiggle::GuestMemory<'_>,
|
|
166
162
|
fd: types::Fd,
|
|
167
163
|
) -> Answer<types::Filestat> {
|
|
168
|
-
self.answer(memory, |_, inv| fd::filestat_get(
|
|
164
|
+
self.answer(memory, |_, inv| fd::filestat_get(inv.wasi(), fd.into()))
|
|
169
165
|
}
|
|
170
166
|
|
|
171
167
|
fn fd_filestat_set_size(
|
|
@@ -175,7 +171,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
175
171
|
size: types::Filesize,
|
|
176
172
|
) -> Answer {
|
|
177
173
|
self.answer(memory, |_, inv| {
|
|
178
|
-
fd::filestat_set_size(
|
|
174
|
+
fd::filestat_set_size(inv.wasi_mut(), fd.into(), size)
|
|
179
175
|
})
|
|
180
176
|
}
|
|
181
177
|
|
|
@@ -189,7 +185,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
189
185
|
) -> Answer {
|
|
190
186
|
self.answer(memory, |_, inv| {
|
|
191
187
|
fd::utimensat(atim, mtim, fst_flags, |times| {
|
|
192
|
-
fd::filestat_set_times(
|
|
188
|
+
fd::filestat_set_times(inv.wasi(), fd.into(), times)
|
|
193
189
|
})
|
|
194
190
|
})
|
|
195
191
|
}
|
|
@@ -202,7 +198,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
202
198
|
offset: types::Filesize,
|
|
203
199
|
) -> Answer<types::Size> {
|
|
204
200
|
self.answer(memory, |mem, inv| {
|
|
205
|
-
fd::pread(
|
|
201
|
+
fd::pread(inv.wasi_mut(), mem, fd.into(), iovs, offset)
|
|
206
202
|
})
|
|
207
203
|
}
|
|
208
204
|
|
|
@@ -211,7 +207,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
211
207
|
memory: &mut wiggle::GuestMemory<'_>,
|
|
212
208
|
fd: types::Fd,
|
|
213
209
|
) -> Answer<types::Prestat> {
|
|
214
|
-
self.answer(memory, |_, inv| fd::prestat_get(
|
|
210
|
+
self.answer(memory, |_, inv| fd::prestat_get(inv.wasi_mut(), fd.into()))
|
|
215
211
|
}
|
|
216
212
|
|
|
217
213
|
fn fd_prestat_dir_name(
|
|
@@ -222,7 +218,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
222
218
|
path_max_len: types::Size,
|
|
223
219
|
) -> Answer {
|
|
224
220
|
self.answer(memory, |mem, inv| {
|
|
225
|
-
fd::prestat_dir_name(
|
|
221
|
+
fd::prestat_dir_name(inv.wasi_mut(), mem, fd.into(), path, path_max_len)
|
|
226
222
|
})
|
|
227
223
|
}
|
|
228
224
|
|
|
@@ -234,7 +230,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
234
230
|
offset: types::Filesize,
|
|
235
231
|
) -> Answer<types::Size> {
|
|
236
232
|
self.answer(memory, |mem, inv| {
|
|
237
|
-
fd::pwrite(
|
|
233
|
+
fd::pwrite(inv.wasi_mut(), mem, fd.into(), ciovs, offset)
|
|
238
234
|
})
|
|
239
235
|
}
|
|
240
236
|
|
|
@@ -245,7 +241,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
245
241
|
iovs: types::IovecArray,
|
|
246
242
|
) -> Answer<types::Size> {
|
|
247
243
|
self.answer(memory, |mem, inv| {
|
|
248
|
-
fd::read(
|
|
244
|
+
fd::read(inv.wasi_mut(), mem, fd.into(), iovs)
|
|
249
245
|
})
|
|
250
246
|
}
|
|
251
247
|
|
|
@@ -258,7 +254,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
258
254
|
cookie: types::Dircookie,
|
|
259
255
|
) -> Answer<types::Size> {
|
|
260
256
|
self.answer(memory, |mem, inv| {
|
|
261
|
-
fd::readdir(
|
|
257
|
+
fd::readdir(inv.wasi_mut(), mem, fd.into(), buf, buf_len, cookie)
|
|
262
258
|
})
|
|
263
259
|
}
|
|
264
260
|
|
|
@@ -269,7 +265,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
269
265
|
to: types::Fd,
|
|
270
266
|
) -> Answer {
|
|
271
267
|
self.answer(memory, |_, inv| {
|
|
272
|
-
fd::renumber(
|
|
268
|
+
fd::renumber(inv.wasi_mut(), from.into(), to.into())
|
|
273
269
|
})
|
|
274
270
|
}
|
|
275
271
|
|
|
@@ -281,12 +277,12 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
281
277
|
whence: types::Whence,
|
|
282
278
|
) -> Answer<types::Filesize> {
|
|
283
279
|
self.answer(memory, |_, inv| {
|
|
284
|
-
fd::seek(
|
|
280
|
+
fd::seek(inv.wasi_mut(), fd.into(), offset, whence)
|
|
285
281
|
})
|
|
286
282
|
}
|
|
287
283
|
|
|
288
284
|
fn fd_sync(&mut self, memory: &mut wiggle::GuestMemory<'_>, fd: types::Fd) -> Answer {
|
|
289
|
-
self.answer(memory, |_, inv| fd::sync(
|
|
285
|
+
self.answer(memory, |_, inv| fd::sync(inv.wasi_mut(), fd.into(), false))
|
|
290
286
|
}
|
|
291
287
|
|
|
292
288
|
fn fd_tell(
|
|
@@ -294,7 +290,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
294
290
|
memory: &mut wiggle::GuestMemory<'_>,
|
|
295
291
|
fd: types::Fd,
|
|
296
292
|
) -> Answer<types::Filesize> {
|
|
297
|
-
self.answer(memory, |_, inv| fd::tell(
|
|
293
|
+
self.answer(memory, |_, inv| fd::tell(inv.wasi_mut(), fd.into()))
|
|
298
294
|
}
|
|
299
295
|
|
|
300
296
|
fn fd_write(
|
|
@@ -304,7 +300,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
304
300
|
ciovs: types::CiovecArray,
|
|
305
301
|
) -> Answer<types::Size> {
|
|
306
302
|
self.answer(memory, |mem, inv| {
|
|
307
|
-
fd::write(
|
|
303
|
+
fd::write(inv.wasi_mut(), mem, fd.into(), ciovs)
|
|
308
304
|
})
|
|
309
305
|
}
|
|
310
306
|
|
|
@@ -315,7 +311,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
315
311
|
path: GuestPtr<str>,
|
|
316
312
|
) -> Answer {
|
|
317
313
|
self.answer(memory, |mem, inv| {
|
|
318
|
-
path::create_directory(
|
|
314
|
+
path::create_directory(inv.wasi(), mem, fd.into(), path)
|
|
319
315
|
})
|
|
320
316
|
}
|
|
321
317
|
|
|
@@ -327,7 +323,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
327
323
|
path: GuestPtr<str>,
|
|
328
324
|
) -> Answer<types::Filestat> {
|
|
329
325
|
self.answer(memory, |mem, inv| {
|
|
330
|
-
path::filestat_get(
|
|
326
|
+
path::filestat_get(inv.wasi(), mem, fd.into(), flags, path)
|
|
331
327
|
})
|
|
332
328
|
}
|
|
333
329
|
|
|
@@ -343,7 +339,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
343
339
|
) -> Answer {
|
|
344
340
|
self.answer(memory, |mem, inv| {
|
|
345
341
|
fd::utimensat(atim, mtim, fst_flags, |times| {
|
|
346
|
-
path::filestat_set_times(
|
|
342
|
+
path::filestat_set_times(inv.wasi(), mem, fd.into(), flags, path, times)
|
|
347
343
|
})
|
|
348
344
|
})
|
|
349
345
|
}
|
|
@@ -359,7 +355,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
359
355
|
) -> Answer {
|
|
360
356
|
self.answer(memory, |mem, inv| {
|
|
361
357
|
path::link(
|
|
362
|
-
|
|
358
|
+
inv.wasi_mut(),
|
|
363
359
|
mem,
|
|
364
360
|
(old_fd.into(), old_path),
|
|
365
361
|
(new_fd.into(), new_path),
|
|
@@ -381,7 +377,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
381
377
|
) -> Answer<types::Fd> {
|
|
382
378
|
self.answer(memory, |mem, inv| {
|
|
383
379
|
path::open(
|
|
384
|
-
|
|
380
|
+
inv.wasi_mut(),
|
|
385
381
|
mem,
|
|
386
382
|
fd.into(),
|
|
387
383
|
path,
|
|
@@ -404,7 +400,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
404
400
|
buf_len: types::Size,
|
|
405
401
|
) -> Answer<types::Size> {
|
|
406
402
|
self.answer(memory, |mem, inv| {
|
|
407
|
-
path::readlink(
|
|
403
|
+
path::readlink(inv.wasi(), mem, fd.into(), path, buf, buf_len)
|
|
408
404
|
})
|
|
409
405
|
}
|
|
410
406
|
|
|
@@ -415,7 +411,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
415
411
|
path: GuestPtr<str>,
|
|
416
412
|
) -> Answer {
|
|
417
413
|
self.answer(memory, |mem, inv| {
|
|
418
|
-
path::remove_directory(
|
|
414
|
+
path::remove_directory(inv.wasi(), mem, fd.into(), path)
|
|
419
415
|
})
|
|
420
416
|
}
|
|
421
417
|
|
|
@@ -429,7 +425,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
429
425
|
) -> Answer {
|
|
430
426
|
self.answer(memory, |mem, inv| {
|
|
431
427
|
path::rename(
|
|
432
|
-
|
|
428
|
+
inv.wasi_mut(),
|
|
433
429
|
mem,
|
|
434
430
|
(old_fd.into(), old_path),
|
|
435
431
|
(new_fd.into(), new_path),
|
|
@@ -445,7 +441,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
445
441
|
new_path: GuestPtr<str>,
|
|
446
442
|
) -> Answer {
|
|
447
443
|
self.answer(memory, |mem, inv| {
|
|
448
|
-
path::symlink(
|
|
444
|
+
path::symlink(inv.wasi(), mem, old_path, fd.into(), new_path)
|
|
449
445
|
})
|
|
450
446
|
}
|
|
451
447
|
|
|
@@ -456,7 +452,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
456
452
|
path: GuestPtr<str>,
|
|
457
453
|
) -> Answer {
|
|
458
454
|
self.answer(memory, |mem, inv| {
|
|
459
|
-
path::unlink_file(
|
|
455
|
+
path::unlink_file(inv.wasi(), mem, fd.into(), path)
|
|
460
456
|
})
|
|
461
457
|
}
|
|
462
458
|
|
|
@@ -478,7 +474,9 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
478
474
|
fd: types::Fd,
|
|
479
475
|
_flags: types::Fdflags,
|
|
480
476
|
) -> Answer<types::Fd> {
|
|
481
|
-
self.answer(memory, |_, inv|
|
|
477
|
+
self.answer(memory, |_, inv| {
|
|
478
|
+
sock::refuse_socket_call(inv.wasi_mut(), fd.into())
|
|
479
|
+
})
|
|
482
480
|
}
|
|
483
481
|
|
|
484
482
|
fn sock_recv(
|
|
@@ -488,7 +486,9 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
488
486
|
_ri_data: types::IovecArray,
|
|
489
487
|
_ri_flags: types::Riflags,
|
|
490
488
|
) -> Answer<(types::Size, types::Roflags)> {
|
|
491
|
-
self.answer(memory, |_, inv|
|
|
489
|
+
self.answer(memory, |_, inv| {
|
|
490
|
+
sock::refuse_socket_call(inv.wasi_mut(), fd.into())
|
|
491
|
+
})
|
|
492
492
|
}
|
|
493
493
|
|
|
494
494
|
fn sock_send(
|
|
@@ -498,7 +498,9 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
498
498
|
_si_data: types::CiovecArray,
|
|
499
499
|
_si_flags: types::Siflags,
|
|
500
500
|
) -> Answer<types::Size> {
|
|
501
|
-
self.answer(memory, |_, inv|
|
|
501
|
+
self.answer(memory, |_, inv| {
|
|
502
|
+
sock::refuse_socket_call(inv.wasi_mut(), fd.into())
|
|
503
|
+
})
|
|
502
504
|
}
|
|
503
505
|
|
|
504
506
|
fn sock_shutdown(
|
|
@@ -507,6 +509,8 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for Invocation {
|
|
|
507
509
|
fd: types::Fd,
|
|
508
510
|
_how: types::Sdflags,
|
|
509
511
|
) -> Answer {
|
|
510
|
-
self.answer(memory, |_, inv|
|
|
512
|
+
self.answer(memory, |_, inv| {
|
|
513
|
+
sock::refuse_socket_call(inv.wasi_mut(), fd.into())
|
|
514
|
+
})
|
|
511
515
|
}
|
|
512
516
|
}
|
|
@@ -0,0 +1,227 @@
|
|
|
1
|
+
//! What the generated bindings read and write in the guest's memory, as the
|
|
2
|
+
//! Canonical ABI lays a value out: little-endian scalars at their offset, and
|
|
3
|
+
//! lists the guest's `cabi_realloc` allocates.
|
|
4
|
+
|
|
5
|
+
use wasmtime::{AsContextMut, Caller, Extern, Memory};
|
|
6
|
+
|
|
7
|
+
/// A scalar the Canonical ABI stores little-endian at its natural size.
|
|
8
|
+
pub(crate) trait Scalar: Copy {
|
|
9
|
+
const SIZE: usize;
|
|
10
|
+
fn from_le(bytes: &[u8]) -> Self;
|
|
11
|
+
fn to_le(self, bytes: &mut [u8]);
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
macro_rules! scalar {
|
|
15
|
+
($($ty:ty),*) => {$(
|
|
16
|
+
impl Scalar for $ty {
|
|
17
|
+
const SIZE: usize = std::mem::size_of::<$ty>();
|
|
18
|
+
fn from_le(bytes: &[u8]) -> Self {
|
|
19
|
+
<$ty>::from_le_bytes(bytes.try_into().expect("a scalar's width"))
|
|
20
|
+
}
|
|
21
|
+
fn to_le(self, bytes: &mut [u8]) {
|
|
22
|
+
bytes.copy_from_slice(&self.to_le_bytes());
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
)*};
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
scalar!(u8, i8, u16, i16, u32, i32, u64, i64);
|
|
29
|
+
|
|
30
|
+
fn memory_of<T>(caller: &mut Caller<'_, T>) -> wasmtime::Result<Memory> {
|
|
31
|
+
match caller.get_export("memory") {
|
|
32
|
+
Some(Extern::Memory(memory)) => Ok(memory),
|
|
33
|
+
_ => Err(wasmtime::Error::msg("the guest exports no memory")),
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/// The guest address `offset` bytes past `at`, a 32-bit pointer as the
|
|
38
|
+
/// Canonical ABI reads one; widened so the sum never wraps into memory the
|
|
39
|
+
/// guest did not name.
|
|
40
|
+
fn to_address(at: i32, offset: usize) -> usize {
|
|
41
|
+
at as u32 as usize + offset
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
fn read<T>(caller: &mut Caller<'_, T>, at: usize, buf: &mut [u8]) -> wasmtime::Result<()> {
|
|
45
|
+
let memory = memory_of(caller)?;
|
|
46
|
+
memory
|
|
47
|
+
.read(caller.as_context_mut(), at, buf)
|
|
48
|
+
.map_err(|_| wasmtime::Error::msg("a value the guest named lies outside its memory"))
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
fn write<T>(caller: &mut Caller<'_, T>, at: usize, bytes: &[u8]) -> wasmtime::Result<()> {
|
|
52
|
+
let memory = memory_of(caller)?;
|
|
53
|
+
memory
|
|
54
|
+
.write(caller.as_context_mut(), at, bytes)
|
|
55
|
+
.map_err(|_| wasmtime::Error::msg("an answer's place lies outside the guest's memory"))
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/// The return area of `size` bytes the guest names at `at` for an answer,
|
|
59
|
+
/// once it lies wholly inside the guest's memory and on the answer's `align`.
|
|
60
|
+
/// The Canonical ABI's `lower_flat_values` checks both once the call returns
|
|
61
|
+
/// and before any part of the answer is stored or allocated.
|
|
62
|
+
pub(crate) fn ensure_return_area(
|
|
63
|
+
caller: &mut Caller<'_, impl Sized>,
|
|
64
|
+
at: i32,
|
|
65
|
+
size: usize,
|
|
66
|
+
align: usize,
|
|
67
|
+
) -> wasmtime::Result<()> {
|
|
68
|
+
let memory = memory_of(caller)?;
|
|
69
|
+
let inside = to_address(at, 0)
|
|
70
|
+
.checked_add(size)
|
|
71
|
+
.is_some_and(|end| end <= memory.data_size(caller.as_context_mut()));
|
|
72
|
+
match (inside, to_address(at, 0).is_multiple_of(align)) {
|
|
73
|
+
(true, true) => Ok(()),
|
|
74
|
+
(false, _) => Err(wasmtime::Error::msg(
|
|
75
|
+
"the return area the guest named lies outside its memory",
|
|
76
|
+
)),
|
|
77
|
+
(true, false) => Err(wasmtime::Error::msg(
|
|
78
|
+
"the return area the guest named is not aligned",
|
|
79
|
+
)),
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
pub(crate) fn load<S: Scalar>(
|
|
84
|
+
caller: &mut Caller<'_, impl Sized>,
|
|
85
|
+
at: i32,
|
|
86
|
+
offset: usize,
|
|
87
|
+
) -> wasmtime::Result<S> {
|
|
88
|
+
let mut bytes = [0; 8];
|
|
89
|
+
read(caller, to_address(at, offset), &mut bytes[..S::SIZE])?;
|
|
90
|
+
Ok(S::from_le(&bytes[..S::SIZE]))
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
pub(crate) fn store<S: Scalar>(
|
|
94
|
+
caller: &mut Caller<'_, impl Sized>,
|
|
95
|
+
at: i32,
|
|
96
|
+
offset: usize,
|
|
97
|
+
value: S,
|
|
98
|
+
) -> wasmtime::Result<()> {
|
|
99
|
+
let mut bytes = [0; 8];
|
|
100
|
+
value.to_le(&mut bytes[..S::SIZE]);
|
|
101
|
+
write(caller, to_address(at, offset), &bytes[..S::SIZE])
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
/// The length of the list of `len` elements of `size` bytes the guest names
|
|
105
|
+
/// at `at`, once it lies wholly inside the guest's memory and on its `align`,
|
|
106
|
+
/// as wasmtime's `WasmList::new` checks before anything is read; a list
|
|
107
|
+
/// outside traps, so no length the guest names sizes a host allocation first.
|
|
108
|
+
pub(crate) fn checked_list_len(
|
|
109
|
+
caller: &mut Caller<'_, impl Sized>,
|
|
110
|
+
at: i32,
|
|
111
|
+
len: i32,
|
|
112
|
+
size: usize,
|
|
113
|
+
align: usize,
|
|
114
|
+
) -> wasmtime::Result<usize> {
|
|
115
|
+
let len = len as u32 as usize;
|
|
116
|
+
let end = len
|
|
117
|
+
.checked_mul(size)
|
|
118
|
+
.and_then(|bytes| to_address(at, 0).checked_add(bytes));
|
|
119
|
+
let memory = memory_of(caller)?;
|
|
120
|
+
match end {
|
|
121
|
+
Some(end) if end <= memory.data_size(caller.as_context_mut()) => {}
|
|
122
|
+
_ => {
|
|
123
|
+
return Err(wasmtime::Error::msg(
|
|
124
|
+
"a list the guest named lies outside its memory",
|
|
125
|
+
))
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
if !to_address(at, 0).is_multiple_of(align) {
|
|
129
|
+
return Err(wasmtime::Error::msg(
|
|
130
|
+
"a list the guest named is not aligned",
|
|
131
|
+
));
|
|
132
|
+
}
|
|
133
|
+
Ok(len)
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/// What one call may have the host copy out of the guest's memory, the
|
|
137
|
+
/// hostcall fuel wasmtime hands each host call, as preview1's calls spend it.
|
|
138
|
+
/// Each list a call lifts spends its bytes first, so lists naming one region
|
|
139
|
+
/// of memory over and over cannot multiply what the host holds.
|
|
140
|
+
pub(crate) struct Fuel(usize);
|
|
141
|
+
|
|
142
|
+
impl Fuel {
|
|
143
|
+
pub(crate) fn new(caller: &mut Caller<'_, impl Sized>) -> Self {
|
|
144
|
+
Self(caller.as_context_mut().hostcall_fuel())
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/// Spend `len` elements of `size` bytes, or trap once the call's fuel is
|
|
148
|
+
/// gone, as wasmtime's `consume_fuel_array`.
|
|
149
|
+
pub(crate) fn spend(&mut self, len: usize, size: usize) -> wasmtime::Result<()> {
|
|
150
|
+
self.0 = len
|
|
151
|
+
.checked_mul(size)
|
|
152
|
+
.and_then(|bytes| self.0.checked_sub(bytes))
|
|
153
|
+
.ok_or_else(|| {
|
|
154
|
+
wasmtime::Error::msg("the guest had a call copy more than its hostcall fuel allows")
|
|
155
|
+
})?;
|
|
156
|
+
Ok(())
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
pub(crate) fn load_list<S: Scalar>(
|
|
161
|
+
caller: &mut Caller<'_, impl Sized>,
|
|
162
|
+
fuel: &mut Fuel,
|
|
163
|
+
at: i32,
|
|
164
|
+
len: i32,
|
|
165
|
+
) -> wasmtime::Result<Vec<S>> {
|
|
166
|
+
let len = checked_list_len(caller, at, len, S::SIZE, S::SIZE)?;
|
|
167
|
+
fuel.spend(len, S::SIZE)?;
|
|
168
|
+
let mut bytes = vec![0; len * S::SIZE];
|
|
169
|
+
read(caller, to_address(at, 0), &mut bytes)?;
|
|
170
|
+
Ok((0..len)
|
|
171
|
+
.map(|i| S::from_le(&bytes[i * S::SIZE..][..S::SIZE]))
|
|
172
|
+
.collect())
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
/// The string at `at`, `len` bytes of UTF-8 as the Canonical ABI encodes one;
|
|
176
|
+
/// other bytes trap, as the ABI's lift does.
|
|
177
|
+
pub(crate) fn load_string(
|
|
178
|
+
caller: &mut Caller<'_, impl Sized>,
|
|
179
|
+
fuel: &mut Fuel,
|
|
180
|
+
at: i32,
|
|
181
|
+
len: i32,
|
|
182
|
+
) -> wasmtime::Result<String> {
|
|
183
|
+
let len = checked_list_len(caller, at, len, 1, 1)?;
|
|
184
|
+
fuel.spend(len, 1)?;
|
|
185
|
+
let mut bytes = vec![0; len];
|
|
186
|
+
read(caller, to_address(at, 0), &mut bytes)?;
|
|
187
|
+
String::from_utf8(bytes).map_err(|_| invalid("string"))
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
/// Room for `size` bytes on `align` in the guest's memory, from its
|
|
191
|
+
/// `cabi_realloc`; room outside its memory or off its alignment traps, as
|
|
192
|
+
/// wasmtime checks `realloc`'s return.
|
|
193
|
+
pub(crate) fn realloc(
|
|
194
|
+
caller: &mut Caller<'_, impl Sized>,
|
|
195
|
+
size: i32,
|
|
196
|
+
align: usize,
|
|
197
|
+
) -> wasmtime::Result<i32> {
|
|
198
|
+
let realloc = caller
|
|
199
|
+
.get_export("cabi_realloc")
|
|
200
|
+
.and_then(Extern::into_func)
|
|
201
|
+
.ok_or_else(|| wasmtime::Error::msg("the guest exports no cabi_realloc"))?
|
|
202
|
+
.typed::<(i32, i32, i32, i32), i32>(caller.as_context_mut())?;
|
|
203
|
+
let at = realloc.call(caller.as_context_mut(), (0, 0, align as i32, size))?;
|
|
204
|
+
checked_list_len(caller, at, size, 1, align)?;
|
|
205
|
+
Ok(at)
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
pub(crate) fn store_list<S: Scalar>(
|
|
209
|
+
caller: &mut Caller<'_, impl Sized>,
|
|
210
|
+
list: &[S],
|
|
211
|
+
align: usize,
|
|
212
|
+
) -> wasmtime::Result<(i32, i32)> {
|
|
213
|
+
let mut bytes = vec![0; list.len() * S::SIZE];
|
|
214
|
+
for (i, value) in list.iter().enumerate() {
|
|
215
|
+
value.to_le(&mut bytes[i * S::SIZE..][..S::SIZE]);
|
|
216
|
+
}
|
|
217
|
+
let len = i32::try_from(list.len())
|
|
218
|
+
.map_err(|_| wasmtime::Error::msg("a list too long for the guest"))?;
|
|
219
|
+
let at = realloc(caller, bytes.len() as i32, align)?;
|
|
220
|
+
write(caller, to_address(at, 0), &bytes)?;
|
|
221
|
+
Ok((at, len))
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
/// The trap a value the guest encoded wrongly ends the run with.
|
|
225
|
+
pub(crate) fn invalid(what: &str) -> wasmtime::Error {
|
|
226
|
+
wasmtime::Error::msg(format!("the guest passed an invalid {what}"))
|
|
227
|
+
}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
//! The host side of each WIT error a preview2 import answers, as wasmtime's
|
|
2
|
+
//! `trappable_error_type` gives one: a host method answers the guest's error or
|
|
3
|
+
//! traps through one `?`, and the generated glue turns it back into the WIT
|
|
4
|
+
//! error.
|
|
5
|
+
|
|
6
|
+
use kobako_runtime::Errno;
|
|
7
|
+
|
|
8
|
+
use super::bindings::wasi_http_types_0_2_12 as http;
|
|
9
|
+
use super::bindings::wasi_sockets_network_0_2_12 as network;
|
|
10
|
+
use super::sockets::to_error_code;
|
|
11
|
+
|
|
12
|
+
/// The error `E` the guest reads, or a trap ending the run, as wasmtime-wasi's
|
|
13
|
+
/// `TrappableError`.
|
|
14
|
+
#[derive(Debug)]
|
|
15
|
+
pub(crate) enum TrappableError<E> {
|
|
16
|
+
Error(E),
|
|
17
|
+
Trap(wasmtime::Error),
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
impl<E> TrappableError<E> {
|
|
21
|
+
/// The error the guest reads, or the trap.
|
|
22
|
+
pub(crate) fn downcast(self) -> wasmtime::Result<E> {
|
|
23
|
+
match self {
|
|
24
|
+
Self::Error(err) => Ok(err),
|
|
25
|
+
Self::Trap(trap) => Err(trap),
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
impl<E> From<wasmtime::Error> for TrappableError<E> {
|
|
31
|
+
fn from(trap: wasmtime::Error) -> Self {
|
|
32
|
+
Self::Trap(trap)
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
pub(crate) type SocketError = TrappableError<network::ErrorCode>;
|
|
37
|
+
pub(crate) type HttpError = TrappableError<http::ErrorCode>;
|
|
38
|
+
pub(crate) type HeaderError = TrappableError<http::HeaderError>;
|
|
39
|
+
|
|
40
|
+
impl From<network::ErrorCode> for SocketError {
|
|
41
|
+
fn from(code: network::ErrorCode) -> Self {
|
|
42
|
+
Self::Error(code)
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/// A socket's failure, by the code its POSIX name maps to, as wasmtime-wasi's
|
|
47
|
+
/// `SocketError` takes an `io::Error`.
|
|
48
|
+
impl From<Errno> for SocketError {
|
|
49
|
+
fn from(err: Errno) -> Self {
|
|
50
|
+
Self::Error(to_error_code(&err))
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
impl From<http::ErrorCode> for HttpError {
|
|
55
|
+
fn from(code: http::ErrorCode) -> Self {
|
|
56
|
+
Self::Error(code)
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
impl From<http::HeaderError> for HeaderError {
|
|
61
|
+
fn from(err: http::HeaderError) -> Self {
|
|
62
|
+
Self::Error(err)
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/// A stream's failure, as wasmtime-wasi-io's `StreamError`: the end, an error
|
|
67
|
+
/// the guest may read, or a trap.
|
|
68
|
+
#[derive(Debug)]
|
|
69
|
+
pub(crate) enum StreamError {
|
|
70
|
+
Closed,
|
|
71
|
+
LastOperationFailed(Errno),
|
|
72
|
+
Trap(wasmtime::Error),
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
impl From<wasmtime::Error> for StreamError {
|
|
76
|
+
fn from(trap: wasmtime::Error) -> Self {
|
|
77
|
+
Self::Trap(trap)
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/// A broken pipe is the stream's end; anything else is an error the guest may
|
|
82
|
+
/// read.
|
|
83
|
+
impl From<Errno> for StreamError {
|
|
84
|
+
fn from(err: Errno) -> Self {
|
|
85
|
+
match err {
|
|
86
|
+
Errno::BrokenPipe => Self::Closed,
|
|
87
|
+
err => Self::LastOperationFailed(err),
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/// A host method's answer split as the generated glue splits it: the trap
|
|
93
|
+
/// apart from the result the guest reads.
|
|
94
|
+
#[cfg(test)]
|
|
95
|
+
pub(crate) trait IntoAnswer<T, E> {
|
|
96
|
+
fn into_answer(self) -> wasmtime::Result<Result<T, E>>;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
#[cfg(test)]
|
|
100
|
+
impl<T, E> IntoAnswer<T, E> for Result<T, TrappableError<E>> {
|
|
101
|
+
fn into_answer(self) -> wasmtime::Result<Result<T, E>> {
|
|
102
|
+
match self {
|
|
103
|
+
Ok(answer) => Ok(Ok(answer)),
|
|
104
|
+
Err(TrappableError::Error(err)) => Ok(Err(err)),
|
|
105
|
+
Err(TrappableError::Trap(trap)) => Err(trap),
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
#[cfg(test)]
|
|
111
|
+
impl<T> IntoAnswer<T, StreamError> for Result<T, StreamError> {
|
|
112
|
+
fn into_answer(self) -> wasmtime::Result<Result<T, StreamError>> {
|
|
113
|
+
match self {
|
|
114
|
+
Err(StreamError::Trap(trap)) => Err(trap),
|
|
115
|
+
answer => Ok(answer),
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|