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
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
//! Generates the host side of the WASI 0.2 imports a Guest Binary links as a
|
|
2
|
+
//! core module, from the vendored WIT, as wiggle generates preview1's from
|
|
3
|
+
//! `witx/`.
|
|
4
|
+
|
|
5
|
+
#[path = "build/preview2.rs"]
|
|
6
|
+
mod preview2;
|
|
7
|
+
|
|
8
|
+
fn main() {
|
|
9
|
+
let wit = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("wit/deps");
|
|
10
|
+
println!("cargo:rerun-if-changed=build/preview2.rs");
|
|
11
|
+
println!("cargo:rerun-if-changed={}", wit.display());
|
|
12
|
+
let out = std::path::Path::new(&std::env::var("OUT_DIR").expect("cargo sets OUT_DIR"))
|
|
13
|
+
.join("preview2_bindings.rs");
|
|
14
|
+
let source = preview2::generate(&wit).expect("the vendored WIT generates");
|
|
15
|
+
std::fs::write(&out, source).expect("OUT_DIR takes the generated bindings");
|
|
16
|
+
}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
//! Reading the Guest Binary's declared ABI version
|
|
2
|
-
//! accept or refuse
|
|
1
|
+
//! Reading the Guest Binary's declared ABI version, from its export names,
|
|
2
|
+
//! for the endpoint to accept or refuse, once the artifact has shown it
|
|
3
|
+
//! instantiates.
|
|
3
4
|
//!
|
|
4
5
|
//! An artifact reports one ABI version, so the answer belongs to the
|
|
5
6
|
//! module and not to the sandbox asking for it. The check therefore runs
|
|
6
7
|
//! alongside the `InstancePre` it guards (`crate::instance_pre`) and is
|
|
7
|
-
//! amortised with it, rather than once per `Driver::
|
|
8
|
+
//! amortised with it, rather than once per `Driver::from_file`.
|
|
8
9
|
|
|
9
10
|
use std::time::Duration;
|
|
10
11
|
|
|
@@ -19,41 +20,28 @@ use kobako_runtime::error::{SetupError, Trap};
|
|
|
19
20
|
|
|
20
21
|
/// An absent or unequal version is a deterministic artifact fault, so
|
|
21
22
|
/// every failure is a `SetupError`. `setup_timeout` bounds instantiating
|
|
22
|
-
/// the artifact
|
|
23
|
-
///
|
|
23
|
+
/// the artifact, so a start function that never returns fails construction
|
|
24
|
+
/// instead of hanging it.
|
|
24
25
|
pub(crate) fn verify(
|
|
25
26
|
pre: &InstancePre<Invocation>,
|
|
26
27
|
setup_timeout: Option<Duration>,
|
|
27
28
|
) -> Result<(), SetupError> {
|
|
28
29
|
let wasi = Wasi::for_probe().map_err(|t| SetupError::Dead(t.to_string()))?;
|
|
29
|
-
// The memory
|
|
30
|
+
// The memory budget stays off: it arms per invocation, and the probe is
|
|
30
31
|
// none.
|
|
31
|
-
let mut store = WtStore::new(load_engine()?, Invocation::new(
|
|
32
|
+
let mut store = WtStore::new(load_engine()?, Invocation::new(wasi));
|
|
32
33
|
trap::arm_deadline(&mut store, setup_timeout);
|
|
33
34
|
let past_deadline = |err: &wasmtime::Error| {
|
|
34
|
-
matches!(trap::
|
|
35
|
+
matches!(trap::cap_trap_of(err), Some(Trap::Timeout(_))).then(|| {
|
|
35
36
|
SetupError::Dead(format!(
|
|
36
37
|
"the Guest Binary did not finish being set up within {:?}",
|
|
37
38
|
setup_timeout.unwrap_or_default()
|
|
38
39
|
))
|
|
39
40
|
})
|
|
40
41
|
};
|
|
41
|
-
|
|
42
|
-
.
|
|
43
|
-
|
|
44
|
-
let Ok(probe) =
|
|
45
|
-
instance.get_typed_func::<(), u32>(store.as_context_mut(), "__kobako_abi_version")
|
|
46
|
-
else {
|
|
47
|
-
return endpoint::verify_abi_version(None);
|
|
48
|
-
};
|
|
49
|
-
let reported = probe.call(store.as_context_mut(), ()).map_err(|e| {
|
|
50
|
-
past_deadline(&e).unwrap_or_else(|| {
|
|
51
|
-
SetupError::Dead(format!(
|
|
52
|
-
"failed to read the Guest Binary's ABI version: {e}"
|
|
53
|
-
))
|
|
54
|
-
})
|
|
55
|
-
})?;
|
|
56
|
-
endpoint::verify_abi_version(Some(reported))
|
|
42
|
+
pre.instantiate(store.as_context_mut())
|
|
43
|
+
.map_err(|e| past_deadline(&e).unwrap_or_else(|| trap::to_setup_error(e)))?;
|
|
44
|
+
endpoint::verify_abi_version(pre.module().exports().map(|export| export.name()))
|
|
57
45
|
}
|
|
58
46
|
|
|
59
47
|
#[cfg(test)]
|
|
@@ -73,21 +61,13 @@ mod tests {
|
|
|
73
61
|
env!("CARGO_MANIFEST_DIR"),
|
|
74
62
|
"/../../test/fixtures/minimal_spinning_start.wat"
|
|
75
63
|
);
|
|
76
|
-
let config = Config
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
memory_limit: None,
|
|
80
|
-
stdout_limit: None,
|
|
81
|
-
stderr_limit: None,
|
|
82
|
-
open_file_limit: None,
|
|
83
|
-
profile: Profile::Hermetic,
|
|
84
|
-
security: Vec::new(),
|
|
85
|
-
};
|
|
86
|
-
let built = Driver::new(Path::new(FIXTURE), config);
|
|
64
|
+
let mut config = Config::for_profile(Profile::Hermetic);
|
|
65
|
+
config.limits.setup_timeout = Some(Duration::from_millis(300));
|
|
66
|
+
let built = Driver::from_file(Path::new(FIXTURE), config);
|
|
87
67
|
assert!(
|
|
88
68
|
matches!(&built, Err(SetupError::Dead(message)) if message.contains("within 300ms")),
|
|
89
|
-
"a Guest Binary whose start never returns
|
|
90
|
-
|
|
69
|
+
"a Guest Binary whose start never returns must fail the Driver's construction once \
|
|
70
|
+
the setup deadline passes, saying so"
|
|
91
71
|
);
|
|
92
72
|
}
|
|
93
73
|
}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
//! The guest's time and entropy at the WASI layer — the one ambient
|
|
2
|
-
//! authority that separates the hermetic
|
|
2
|
+
//! authority that separates the hermetic profile from permissive. `Wasi::new`
|
|
3
3
|
//! wires the frozen sources on `Hermetic` and the live clock on
|
|
4
|
-
//! `Permissive`; `Clocks` is what the guest
|
|
4
|
+
//! `Permissive`; `Clocks` is what the guest reads its time from under either.
|
|
5
5
|
//!
|
|
6
6
|
//! `wasmtime-wasi`'s `WasiCtxBuilder` defaults the guest's `wasi:clocks` to
|
|
7
7
|
//! the host wall / monotonic clock and `wasi:random` to a fresh per-context
|
|
8
8
|
//! seed. No allowlisted mrbgem reaches these preview1 imports today
|
|
9
9
|
//! (`build_config/wasi.rb`), but a future libc-backed gem would silently
|
|
10
10
|
//! obtain real time and host entropy — a covert timing channel and a
|
|
11
|
-
//! nondeterminism source the hermetic
|
|
11
|
+
//! nondeterminism source the hermetic profile deliberately excludes.
|
|
12
12
|
//! Pinning the clocks to the Unix epoch and the RNG to a constant stream
|
|
13
13
|
//! makes that denial a property of the host, not merely of the gem allowlist.
|
|
14
14
|
//!
|
|
@@ -16,11 +16,14 @@
|
|
|
16
16
|
//! wasmtime epoch interruption against a host `Instant`, never the guest's
|
|
17
17
|
//! frozen `wasi:clocks/monotonic-clock`.
|
|
18
18
|
|
|
19
|
-
use std::time::{Duration, Instant
|
|
19
|
+
use std::time::{Duration, Instant};
|
|
20
20
|
|
|
21
|
+
use wasmtime_wasi::clocks::WallClock;
|
|
21
22
|
use wasmtime_wasi::random::Deterministic;
|
|
22
23
|
use wasmtime_wasi::{HostMonotonicClock, HostWallClock};
|
|
23
24
|
|
|
25
|
+
use crate::preview2::to_nanos;
|
|
26
|
+
|
|
24
27
|
/// Wall clock frozen at the Unix epoch — the guest observes no real time.
|
|
25
28
|
pub(crate) struct FrozenWallClock;
|
|
26
29
|
|
|
@@ -75,39 +78,51 @@ impl HostMonotonicClock for LiveMonotonicClock {
|
|
|
75
78
|
}
|
|
76
79
|
|
|
77
80
|
fn now(&self) -> u64 {
|
|
78
|
-
|
|
81
|
+
to_nanos(self.origin.elapsed())
|
|
79
82
|
}
|
|
80
83
|
}
|
|
81
84
|
|
|
82
|
-
/// The
|
|
83
|
-
///
|
|
85
|
+
/// The host's wall clock, read as wasmtime-wasi's own. The guest's
|
|
86
|
+
/// `clock_time_get` and a wait it subscribes to share it, so both agree on
|
|
87
|
+
/// what a time means.
|
|
88
|
+
#[derive(Clone, Copy)]
|
|
89
|
+
pub(crate) struct LiveWallClock;
|
|
90
|
+
|
|
91
|
+
impl HostWallClock for LiveWallClock {
|
|
92
|
+
fn resolution(&self) -> Duration {
|
|
93
|
+
WallClock.resolution()
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
fn now(&self) -> Duration {
|
|
97
|
+
WallClock.now()
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/// The clocks the guest observes, which a clock subscription reads its
|
|
102
|
+
/// absolute time against.
|
|
84
103
|
#[derive(Clone, Copy)]
|
|
85
104
|
pub(crate) enum Clocks {
|
|
86
105
|
Frozen,
|
|
87
|
-
Live
|
|
106
|
+
Live {
|
|
107
|
+
monotonic: LiveMonotonicClock,
|
|
108
|
+
wall: LiveWallClock,
|
|
109
|
+
},
|
|
88
110
|
}
|
|
89
111
|
|
|
90
112
|
impl Clocks {
|
|
91
113
|
pub(crate) fn monotonic_now(&self) -> u64 {
|
|
92
114
|
match self {
|
|
93
115
|
Self::Frozen => FrozenMonotonicClock.now(),
|
|
94
|
-
Self::Live
|
|
116
|
+
Self::Live { monotonic, .. } => monotonic.now(),
|
|
95
117
|
}
|
|
96
118
|
}
|
|
97
119
|
|
|
98
120
|
pub(crate) fn wall_now(&self) -> u64 {
|
|
99
121
|
let since_epoch = match self {
|
|
100
122
|
Self::Frozen => FrozenWallClock.now(),
|
|
101
|
-
Self::Live
|
|
102
|
-
.duration_since(UNIX_EPOCH)
|
|
103
|
-
.unwrap_or(Duration::ZERO),
|
|
123
|
+
Self::Live { wall, .. } => wall.now(),
|
|
104
124
|
};
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
/// Whether a wait on these clocks takes host time.
|
|
109
|
-
pub(crate) fn advances(&self) -> bool {
|
|
110
|
-
matches!(self, Self::Live(_))
|
|
125
|
+
to_nanos(since_epoch)
|
|
111
126
|
}
|
|
112
127
|
}
|
|
113
128
|
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
//! Module JIT compilation across multiple sandbox constructions, the
|
|
7
7
|
//! driver keeps a process-scope shared Engine and a per-path Module
|
|
8
8
|
//! cache. Both are transparent to frontends, which construct a
|
|
9
|
-
//! `Driver` via `Driver::
|
|
9
|
+
//! `Driver` via `Driver::from_file` and never see Engine or Module.
|
|
10
10
|
//!
|
|
11
11
|
//! Across processes, the Cranelift compile cost is amortised by a
|
|
12
12
|
//! best-effort `.cwasm` disk cache keyed by the SHA-256 of the Guest
|
|
@@ -31,6 +31,7 @@ use sha2::{Digest, Sha256};
|
|
|
31
31
|
use wasmtime::{Config as WtConfig, Engine as WtEngine, Module as WtModule};
|
|
32
32
|
|
|
33
33
|
use kobako_runtime::error::SetupError;
|
|
34
|
+
use kobako_runtime::fork::ProcessLocal;
|
|
34
35
|
|
|
35
36
|
static SHARED_ENGINE: OnceLock<WtEngine> = OnceLock::new();
|
|
36
37
|
static MODULE_CACHE: OnceLock<Mutex<HashMap<PathBuf, WtModule>>> = OnceLock::new();
|
|
@@ -47,9 +48,10 @@ const EPOCH_TICK: Duration = Duration::from_millis(10);
|
|
|
47
48
|
/// The exceptions proposal is on because the mruby wasi build emits
|
|
48
49
|
/// new-style exception handling (`-mllvm -wasm-use-legacy-eh=false`) for
|
|
49
50
|
/// its setjmp path. Epoch interruption backs the wall-clock cap, driven by
|
|
50
|
-
/// one
|
|
51
|
+
/// one ticker thread per process.
|
|
51
52
|
pub(crate) fn load_engine() -> Result<&'static WtEngine, SetupError> {
|
|
52
53
|
if let Some(engine) = SHARED_ENGINE.get() {
|
|
54
|
+
spawn_epoch_ticker(engine);
|
|
53
55
|
return Ok(engine);
|
|
54
56
|
}
|
|
55
57
|
let mut config = WtConfig::new();
|
|
@@ -58,24 +60,30 @@ pub(crate) fn load_engine() -> Result<&'static WtEngine, SetupError> {
|
|
|
58
60
|
let engine =
|
|
59
61
|
WtEngine::new(&config).map_err(|e| SetupError::Dead(format!("engine init: {e}")))?;
|
|
60
62
|
let engine = SHARED_ENGINE.get_or_init(|| engine);
|
|
61
|
-
spawn_epoch_ticker(engine
|
|
63
|
+
spawn_epoch_ticker(engine);
|
|
62
64
|
Ok(engine)
|
|
63
65
|
}
|
|
64
66
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
67
|
+
/// The ticker is the process's own: a forked child, which inherits the Engine
|
|
68
|
+
/// but no thread, starts one of its own, or no deadline would fire in it.
|
|
69
|
+
fn spawn_epoch_ticker(engine: &WtEngine) {
|
|
70
|
+
static TICKER: ProcessLocal<()> = ProcessLocal::new();
|
|
71
|
+
TICKER.with(|ticker| {
|
|
72
|
+
if ticker.is_none() {
|
|
73
|
+
let engine = engine.clone();
|
|
74
|
+
thread::Builder::new()
|
|
75
|
+
.name("kobako-epoch-ticker".into())
|
|
76
|
+
.spawn(move || loop {
|
|
77
|
+
thread::sleep(EPOCH_TICK);
|
|
78
|
+
engine.increment_epoch();
|
|
79
|
+
})
|
|
80
|
+
.expect("spawn kobako-epoch-ticker thread");
|
|
81
|
+
*ticker = Some(());
|
|
82
|
+
}
|
|
75
83
|
});
|
|
76
84
|
}
|
|
77
85
|
|
|
78
|
-
/// A missing file answers `SetupError::
|
|
86
|
+
/// A missing file answers `SetupError::GuestBinaryNotFound`, the common state of
|
|
79
87
|
/// a fresh clone before `rake compile`.
|
|
80
88
|
pub(crate) fn load_module(path: &Path) -> Result<WtModule, SetupError> {
|
|
81
89
|
let cache = MODULE_CACHE.get_or_init(|| Mutex::new(HashMap::new()));
|
|
@@ -90,7 +98,7 @@ pub(crate) fn load_module(path: &Path) -> Result<WtModule, SetupError> {
|
|
|
90
98
|
}
|
|
91
99
|
|
|
92
100
|
if !path.exists() {
|
|
93
|
-
return Err(SetupError::
|
|
101
|
+
return Err(SetupError::GuestBinaryNotFound(format!(
|
|
94
102
|
"Sandbox runtime not found at {}",
|
|
95
103
|
path.display()
|
|
96
104
|
)));
|
|
@@ -1,73 +1,77 @@
|
|
|
1
1
|
//! The caps a `Driver` applies to every invocation.
|
|
2
2
|
//!
|
|
3
|
-
//!
|
|
3
|
+
//! What a frontend forwards into `Driver::from_file`. A plain value carrier
|
|
4
4
|
//! owned by the `Driver` — distinct from the process-wide engine/module
|
|
5
5
|
//! `crate::cache` (which is shared across every sandbox) and from the
|
|
6
6
|
//! per-invocation `crate::invocation::Invocation` (which the wasm engine
|
|
7
7
|
//! mutates from inside a run).
|
|
8
8
|
//!
|
|
9
|
-
//!
|
|
10
|
-
//!
|
|
11
|
-
//!
|
|
9
|
+
//! The caps and the profile are the runtime's own types, which the SDK's
|
|
10
|
+
//! `kobako::Options` holds as well; this struct alone may name a wasmtime
|
|
11
|
+
//! type, as an engine-free host must still be able to build the SDK.
|
|
12
12
|
//! The security modules are the Driver's own, as Linux's LSMs are the
|
|
13
|
-
//! kernel's: whoever builds the Driver hands them here
|
|
13
|
+
//! kernel's: whoever builds the Driver hands them here, and the network's
|
|
14
|
+
//! backends with them, as gVisor takes one network stack for each sandbox.
|
|
14
15
|
|
|
15
16
|
use std::sync::Arc;
|
|
16
|
-
use std::time::Duration;
|
|
17
17
|
|
|
18
|
+
use kobako_runtime::limits::Limits;
|
|
19
|
+
use kobako_runtime::net::Backends;
|
|
18
20
|
use kobako_runtime::profile::Profile;
|
|
19
|
-
use kobako_runtime::
|
|
21
|
+
use kobako_runtime::security::SecurityOperations;
|
|
20
22
|
|
|
21
|
-
/// The caps and requested isolation profile for one `Driver`.
|
|
22
|
-
/// any cap field disables that cap.
|
|
23
|
+
/// The caps and requested isolation profile for one `Driver`.
|
|
23
24
|
#[non_exhaustive]
|
|
24
25
|
pub struct Config {
|
|
25
|
-
///
|
|
26
|
-
///
|
|
27
|
-
pub
|
|
28
|
-
///
|
|
29
|
-
///
|
|
30
|
-
|
|
31
|
-
///
|
|
32
|
-
/// grows beyond the image it starts from.
|
|
33
|
-
pub memory_limit: Option<usize>,
|
|
34
|
-
/// Byte cap for guest stdout capture; output past it is dropped and
|
|
35
|
-
/// the capture marked truncated.
|
|
36
|
-
pub stdout_limit: Option<usize>,
|
|
37
|
-
/// Byte cap for guest stderr capture, the same as `stdout_limit`.
|
|
38
|
-
pub stderr_limit: Option<usize>,
|
|
39
|
-
/// Descriptors one invocation may hold open, the standard ones and
|
|
40
|
-
/// each Mount's preopen included; an open past it answers `MFILE`.
|
|
41
|
-
/// Only the guest's descriptors count, as `RLIMIT_NOFILE` counts a
|
|
42
|
-
/// process's: the host descriptors a Filesystem holds behind one are
|
|
43
|
-
/// its own, up to two for a file and one for each Layer holding a
|
|
44
|
-
/// directory, Directory Layers alone holding any.
|
|
45
|
-
pub open_file_limit: Option<usize>,
|
|
46
|
-
/// Isolation posture the frontend requested. `Hermetic` freezes
|
|
47
|
-
/// ambient time and entropy, `Permissive` leaves the live WASI
|
|
48
|
-
/// sources, and `Driver::profile` declares it back as the built
|
|
49
|
-
/// posture.
|
|
26
|
+
/// The caps every invocation runs under; `None` on any of them disables
|
|
27
|
+
/// that cap.
|
|
28
|
+
pub limits: Limits,
|
|
29
|
+
/// Isolation profile the frontend requested. `Hermetic` freezes
|
|
30
|
+
/// ambient time and entropy, `Permissive` gives the live host clocks
|
|
31
|
+
/// and entropy, and `Driver::profile` declares it back as the built
|
|
32
|
+
/// profile.
|
|
50
33
|
pub profile: Profile,
|
|
51
34
|
/// Security modules every invocation is judged by, each asked in order
|
|
52
35
|
/// after kobako's own rules and before any Mount's Policy, as Linux
|
|
53
36
|
/// stacks the LSMs it was booted with.
|
|
54
37
|
pub security: Vec<Arc<dyn SecurityOperations>>,
|
|
38
|
+
/// What every network entry of an invocation dials and looks names up
|
|
39
|
+
/// through, beneath the rules its entries make.
|
|
40
|
+
pub network: Backends,
|
|
55
41
|
}
|
|
56
42
|
|
|
57
43
|
impl Default for Config {
|
|
58
|
-
///
|
|
59
|
-
///
|
|
60
|
-
/// each output channel, 1024 open files, and the hermetic floor.
|
|
44
|
+
/// A Sandbox's default caps and floor, no security module beyond
|
|
45
|
+
/// kobako's own, and the host's own network.
|
|
61
46
|
fn default() -> Self {
|
|
62
47
|
Config {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
memory_limit: Some(4 << 20),
|
|
66
|
-
stdout_limit: Some(1 << 20),
|
|
67
|
-
stderr_limit: Some(1 << 20),
|
|
68
|
-
open_file_limit: Some(1024),
|
|
69
|
-
profile: Profile::Hermetic,
|
|
48
|
+
limits: Limits::default(),
|
|
49
|
+
profile: Profile::default(),
|
|
70
50
|
security: Vec::new(),
|
|
51
|
+
network: Backends::default(),
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
#[cfg(test)]
|
|
57
|
+
impl Config {
|
|
58
|
+
/// A config at `profile` that sets no cap, so a test names only the cap it
|
|
59
|
+
/// witnesses.
|
|
60
|
+
pub(crate) fn for_profile(profile: Profile) -> Self {
|
|
61
|
+
let mut limits = Limits::default();
|
|
62
|
+
limits.timeout = None;
|
|
63
|
+
limits.setup_timeout = None;
|
|
64
|
+
limits.memory_limit = None;
|
|
65
|
+
limits.stdout_limit = None;
|
|
66
|
+
limits.stderr_limit = None;
|
|
67
|
+
limits.open_file_limit = None;
|
|
68
|
+
limits.open_connection_limit = None;
|
|
69
|
+
limits.connection_limit = None;
|
|
70
|
+
Config {
|
|
71
|
+
limits,
|
|
72
|
+
profile,
|
|
73
|
+
security: Vec::new(),
|
|
74
|
+
network: Backends::default(),
|
|
71
75
|
}
|
|
72
76
|
}
|
|
73
77
|
}
|
|
@@ -76,34 +80,14 @@ impl Default for Config {
|
|
|
76
80
|
mod tests {
|
|
77
81
|
use super::*;
|
|
78
82
|
|
|
79
|
-
// Literal values, so a drift from the defaults the SDK's Options and
|
|
80
|
-
// the Ruby frontend apply fails here.
|
|
81
83
|
#[test]
|
|
82
84
|
fn a_default_config_carries_every_frontends_default_caps() {
|
|
83
85
|
let config = Config::default();
|
|
84
86
|
assert_eq!(
|
|
85
|
-
(
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
config.stdout_limit,
|
|
90
|
-
config.stderr_limit,
|
|
91
|
-
config.open_file_limit,
|
|
92
|
-
config.profile,
|
|
93
|
-
config.security.len()
|
|
94
|
-
),
|
|
95
|
-
(
|
|
96
|
-
Some(Duration::from_secs(60)),
|
|
97
|
-
Some(Duration::from_secs(10)),
|
|
98
|
-
Some(4 * 1024 * 1024),
|
|
99
|
-
Some(1024 * 1024),
|
|
100
|
-
Some(1024 * 1024),
|
|
101
|
-
Some(1024),
|
|
102
|
-
Profile::Hermetic,
|
|
103
|
-
0
|
|
104
|
-
),
|
|
105
|
-
"Config::default must carry the caps every frontend defaults to, and no security \
|
|
106
|
-
module beyond kobako's own"
|
|
87
|
+
(config.limits, config.profile, config.security.len()),
|
|
88
|
+
(Limits::default(), Profile::Hermetic, 0),
|
|
89
|
+
"Config::default must carry the runtime's default caps and the hermetic floor, and \
|
|
90
|
+
no security module beyond kobako's own"
|
|
107
91
|
);
|
|
108
92
|
}
|
|
109
93
|
}
|