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,58 @@
|
|
|
1
|
+
//! The TLS the outbound seam ends on the host. It trusts the OS's own store,
|
|
2
|
+
//! so a revoked or added root follows the host's patches rather than a kobako
|
|
3
|
+
//! release.
|
|
4
|
+
|
|
5
|
+
use std::sync::{Arc, OnceLock};
|
|
6
|
+
|
|
7
|
+
use rustls::crypto::CryptoProvider;
|
|
8
|
+
use rustls::ClientConfig;
|
|
9
|
+
use rustls_platform_verifier::Verifier;
|
|
10
|
+
|
|
11
|
+
static PLATFORM: OnceLock<Option<(Arc<CryptoProvider>, Arc<Verifier>)>> = OnceLock::new();
|
|
12
|
+
|
|
13
|
+
/// The OS's store and the provider verifying against it, built once per
|
|
14
|
+
/// process, `None` where the platform offers no store. Its first build reads
|
|
15
|
+
/// the environment, `SSL_CERT_FILE` on Linux among it, so it is built as the
|
|
16
|
+
/// first network entry is made, on the Host App's thread building its
|
|
17
|
+
/// Sandbox, rather than on the reactor beside another reading it; a later
|
|
18
|
+
/// change to that environment is not seen.
|
|
19
|
+
pub(crate) fn load_platform_verifier() -> Option<&'static (Arc<CryptoProvider>, Arc<Verifier>)> {
|
|
20
|
+
PLATFORM
|
|
21
|
+
.get_or_init(|| {
|
|
22
|
+
let provider = Arc::new(rustls::crypto::ring::default_provider());
|
|
23
|
+
let verifier = Verifier::new(provider.clone()).ok()?;
|
|
24
|
+
Some((provider, Arc::new(verifier)))
|
|
25
|
+
})
|
|
26
|
+
.as_ref()
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/// A client configuration trusting the OS's store, over ring, with a session
|
|
30
|
+
/// store of its own, so no session one Invocation opened resumes in another;
|
|
31
|
+
/// `None` where the platform offers no store to verify against.
|
|
32
|
+
pub fn new_platform_tls() -> Option<Arc<ClientConfig>> {
|
|
33
|
+
let (provider, verifier) = load_platform_verifier()?;
|
|
34
|
+
let config = ClientConfig::builder_with_provider(provider.clone())
|
|
35
|
+
.with_safe_default_protocol_versions()
|
|
36
|
+
.ok()?
|
|
37
|
+
.dangerous()
|
|
38
|
+
.with_custom_certificate_verifier(verifier.clone())
|
|
39
|
+
.with_no_client_auth();
|
|
40
|
+
Some(Arc::new(config))
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
#[cfg(test)]
|
|
44
|
+
mod tests {
|
|
45
|
+
use super::*;
|
|
46
|
+
|
|
47
|
+
#[test]
|
|
48
|
+
fn each_configuration_holds_a_session_store_of_its_own() {
|
|
49
|
+
let (Some(first), Some(second)) = (new_platform_tls(), new_platform_tls()) else {
|
|
50
|
+
return;
|
|
51
|
+
};
|
|
52
|
+
assert!(
|
|
53
|
+
!Arc::ptr_eq(&first, &second),
|
|
54
|
+
"two outbound seams must each hold their own TLS configuration, so no session one \
|
|
55
|
+
Invocation opened resumes in another"
|
|
56
|
+
);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
@@ -0,0 +1,279 @@
|
|
|
1
|
+
//! The TCP link under an HTTP request: the connector that reaches the one
|
|
2
|
+
//! authority a request named, and the connection it opened. The connector
|
|
3
|
+
//! dials through a TCP socket of the Invocation's own, as an egress proxy
|
|
4
|
+
//! dials through the kernel, so its upstream passes the socket layer's
|
|
5
|
+
//! filter, holds a virtual port, and counts its buffers against the
|
|
6
|
+
//! Invocation's memory, as a guest's socket does.
|
|
7
|
+
|
|
8
|
+
use std::fmt;
|
|
9
|
+
use std::future::poll_fn;
|
|
10
|
+
use std::io;
|
|
11
|
+
use std::net::{IpAddr, Shutdown, SocketAddr};
|
|
12
|
+
use std::pin::Pin;
|
|
13
|
+
use std::sync::{Arc, OnceLock};
|
|
14
|
+
use std::task::{Context, Poll};
|
|
15
|
+
use std::time::Instant;
|
|
16
|
+
|
|
17
|
+
use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
|
|
18
|
+
|
|
19
|
+
use super::connections::Place;
|
|
20
|
+
use super::http::HttpError;
|
|
21
|
+
use super::lookup::NameLookup;
|
|
22
|
+
use super::namespace::TcpSockets;
|
|
23
|
+
use super::socket::{BindHash, Destination};
|
|
24
|
+
use super::{Namespace, ProtoOps, ProtocolFamily, SockOpt, TcpSock};
|
|
25
|
+
use crate::cred::Cred;
|
|
26
|
+
use crate::errno::CarriedErrno;
|
|
27
|
+
use crate::network::{Host, Protocol, Ruleset};
|
|
28
|
+
use crate::wait::WaitQueueHead;
|
|
29
|
+
use crate::Errno;
|
|
30
|
+
|
|
31
|
+
/// The only dialer the outbound seam has: it reaches the one authority the
|
|
32
|
+
/// request named, resolving a name on the host and dialing each real address
|
|
33
|
+
/// in turn through a socket the ruleset filters.
|
|
34
|
+
pub struct Connector {
|
|
35
|
+
port: u16,
|
|
36
|
+
ruleset: Arc<Ruleset>,
|
|
37
|
+
family: Arc<dyn ProtocolFamily>,
|
|
38
|
+
/// Where the dial goes.
|
|
39
|
+
target: Target,
|
|
40
|
+
ports: Arc<BindHash>,
|
|
41
|
+
tcp_sockets: Arc<TcpSockets>,
|
|
42
|
+
cred: Arc<Cred>,
|
|
43
|
+
/// The request's place, which a lookup of the authority holds too.
|
|
44
|
+
place: Arc<Place>,
|
|
45
|
+
/// When a connect opened, which its exchange's wait for the head starts
|
|
46
|
+
/// from.
|
|
47
|
+
pub(crate) connected: Arc<OnceLock<Instant>>,
|
|
48
|
+
/// The queue its exchange's waiters sleep on, woken as the connect opens,
|
|
49
|
+
/// so a wait bound by the connect's timeout takes the head's.
|
|
50
|
+
pub(crate) wait: Option<Arc<WaitQueueHead>>,
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
impl Connector {
|
|
54
|
+
/// The connector for `host` at `port` in `net`, dialing as `cred` and
|
|
55
|
+
/// holding the request's `place`, which a lookup of a named host holds
|
|
56
|
+
/// too.
|
|
57
|
+
pub(crate) fn new(
|
|
58
|
+
net: &Namespace,
|
|
59
|
+
cred: &Arc<Cred>,
|
|
60
|
+
host: Host,
|
|
61
|
+
port: u16,
|
|
62
|
+
place: Arc<Place>,
|
|
63
|
+
) -> Self {
|
|
64
|
+
let target = match host {
|
|
65
|
+
Host::Address(ip) => Target::Address(ip),
|
|
66
|
+
Host::Name(name) => Target::Named {
|
|
67
|
+
lookup: NameLookup::start_holding(
|
|
68
|
+
net.resolver().clone(),
|
|
69
|
+
name.clone(),
|
|
70
|
+
place.clone(),
|
|
71
|
+
)
|
|
72
|
+
.map_err(|_| HttpError::ConnectionLimitReached),
|
|
73
|
+
name,
|
|
74
|
+
},
|
|
75
|
+
};
|
|
76
|
+
Self {
|
|
77
|
+
port,
|
|
78
|
+
ruleset: net.ruleset().clone(),
|
|
79
|
+
family: net.family().clone(),
|
|
80
|
+
target,
|
|
81
|
+
ports: net.ports_of(Protocol::Http).clone(),
|
|
82
|
+
tcp_sockets: net.tcp_sockets().clone(),
|
|
83
|
+
cred: cred.clone(),
|
|
84
|
+
place,
|
|
85
|
+
connected: Arc::default(),
|
|
86
|
+
wait: None,
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/// The host and port the request named.
|
|
91
|
+
pub fn authority(&self) -> (String, u16) {
|
|
92
|
+
let host = match &self.target {
|
|
93
|
+
Target::Address(ip) => ip.to_string(),
|
|
94
|
+
Target::Named { name, .. } => name.clone(),
|
|
95
|
+
};
|
|
96
|
+
(host, self.port)
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/// A connection to the authority, once one of its addresses answers. The
|
|
100
|
+
/// connector tries each real address in turn, as an HTTP client's
|
|
101
|
+
/// connector does, while a guest's TCP socket keeps a loop of its own; an
|
|
102
|
+
/// address the filter refuses is passed over, and none admitted is
|
|
103
|
+
/// denied.
|
|
104
|
+
pub async fn dial(&self) -> Result<Transport, HttpError> {
|
|
105
|
+
let dests = match &self.target {
|
|
106
|
+
Target::Address(ip) => vec![Destination::Literal(SocketAddr::new(*ip, self.port))],
|
|
107
|
+
Target::Named { lookup, .. } => {
|
|
108
|
+
let lookup = lookup.as_ref().map_err(|err| *err)?;
|
|
109
|
+
poll_fn(|cx| lookup.poll_answer(cx))
|
|
110
|
+
.await
|
|
111
|
+
.map_err(|_| HttpError::DnsError)?
|
|
112
|
+
.into_iter()
|
|
113
|
+
.map(|real| Destination::Named {
|
|
114
|
+
name: lookup.name().to_string(),
|
|
115
|
+
real,
|
|
116
|
+
port: self.port,
|
|
117
|
+
})
|
|
118
|
+
.collect()
|
|
119
|
+
}
|
|
120
|
+
};
|
|
121
|
+
let mut last = HttpError::Denied;
|
|
122
|
+
for dest in &dests {
|
|
123
|
+
let sock = TcpSock::create_kern(&self.family, &self.tcp_sockets, &self.cred)
|
|
124
|
+
.map_err(|err| HttpError::from_errno(&err))?;
|
|
125
|
+
// Set before the dial, so the host socket takes it as it is
|
|
126
|
+
// made, as an HTTP client writes each request whole; a guest's
|
|
127
|
+
// own socket keeps Linux's default.
|
|
128
|
+
sock.setsockopt(SockOpt::NoDelay, 1)
|
|
129
|
+
.map_err(|err| HttpError::from_errno(&err))?;
|
|
130
|
+
match sock.connect_upstream(&self.ports, &self.ruleset, dest, &self.place) {
|
|
131
|
+
Err(Errno::PermissionDenied) => continue,
|
|
132
|
+
Err(err) => {
|
|
133
|
+
last = HttpError::from_errno(&err);
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
136
|
+
Ok(()) => {}
|
|
137
|
+
}
|
|
138
|
+
let connection = Transport { sock };
|
|
139
|
+
match connection.wait_for_connect().await {
|
|
140
|
+
Ok(()) => {
|
|
141
|
+
let _ = self.connected.set(Instant::now());
|
|
142
|
+
if let Some(wait) = &self.wait {
|
|
143
|
+
wait.wake_up();
|
|
144
|
+
}
|
|
145
|
+
return Ok(connection);
|
|
146
|
+
}
|
|
147
|
+
Err(err) => last = HttpError::from_errno(&err),
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
Err(last)
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
/// Where a connector dials: a literal address, or a named authority and its
|
|
155
|
+
/// lookup, started on the thread that sends the request, as a guest's own
|
|
156
|
+
/// lookup is, so the reactor never makes the call a Resolver may block on.
|
|
157
|
+
enum Target {
|
|
158
|
+
Address(IpAddr),
|
|
159
|
+
Named {
|
|
160
|
+
name: String,
|
|
161
|
+
lookup: Result<Arc<NameLookup>, HttpError>,
|
|
162
|
+
},
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
impl fmt::Debug for Connector {
|
|
166
|
+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
167
|
+
f.debug_struct("Connector")
|
|
168
|
+
.field("host", &self.authority().0)
|
|
169
|
+
.field("port", &self.port)
|
|
170
|
+
.finish()
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
/// The connection the connector opened: its TCP socket, read and written
|
|
175
|
+
/// through tokio's I/O traits, a task waiting on the socket's wait queue as a
|
|
176
|
+
/// guest's poll does.
|
|
177
|
+
pub struct Transport {
|
|
178
|
+
sock: Arc<TcpSock>,
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
impl Transport {
|
|
182
|
+
/// Wait until the connect under way settles, as Linux's
|
|
183
|
+
/// `inet_wait_for_connect` waits for.
|
|
184
|
+
async fn wait_for_connect(&self) -> Result<(), Errno> {
|
|
185
|
+
poll_fn(|cx| self.attempt(cx, || self.sock.take_connect_outcome())).await
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
/// `op` once it stops answering `WouldBlock`, the task added to the
|
|
189
|
+
/// socket's wait queue first, so a wake between the two is not lost.
|
|
190
|
+
fn attempt<T>(
|
|
191
|
+
&self,
|
|
192
|
+
cx: &mut Context<'_>,
|
|
193
|
+
mut op: impl FnMut() -> Result<T, Errno>,
|
|
194
|
+
) -> Poll<Result<T, Errno>> {
|
|
195
|
+
match op() {
|
|
196
|
+
Err(Errno::WouldBlock) => {}
|
|
197
|
+
done => return Poll::Ready(done),
|
|
198
|
+
}
|
|
199
|
+
self.sock.sk_sleep().add(cx.waker());
|
|
200
|
+
match op() {
|
|
201
|
+
Err(Errno::WouldBlock) => Poll::Pending,
|
|
202
|
+
done => Poll::Ready(done),
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
/// `err` as the I/O error tokio-rustls and hyper carry, holding the failure
|
|
208
|
+
/// itself so `Errno::from_io_error` reads back the very one the socket
|
|
209
|
+
/// answered.
|
|
210
|
+
fn to_io(err: Errno) -> io::Error {
|
|
211
|
+
io::Error::other(CarriedErrno(err))
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
impl AsyncRead for Transport {
|
|
215
|
+
fn poll_read(
|
|
216
|
+
self: Pin<&mut Self>,
|
|
217
|
+
cx: &mut Context<'_>,
|
|
218
|
+
buf: &mut ReadBuf<'_>,
|
|
219
|
+
) -> Poll<io::Result<()>> {
|
|
220
|
+
let this = self.get_mut();
|
|
221
|
+
let read = this.attempt(cx, || this.sock.recvmsg(buf.initialize_unfilled()));
|
|
222
|
+
read.map(|read| read.map(|(n, _)| buf.advance(n)).map_err(to_io))
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
impl AsyncWrite for Transport {
|
|
227
|
+
fn poll_write(
|
|
228
|
+
self: Pin<&mut Self>,
|
|
229
|
+
cx: &mut Context<'_>,
|
|
230
|
+
buf: &[u8],
|
|
231
|
+
) -> Poll<io::Result<usize>> {
|
|
232
|
+
let this = self.get_mut();
|
|
233
|
+
this.attempt(cx, || this.sock.sendmsg(buf)).map_err(to_io)
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
|
|
237
|
+
Poll::Ready(Ok(()))
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
fn poll_shutdown(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
|
|
241
|
+
Poll::Ready(self.sock.shutdown(Shutdown::Write).map_err(to_io))
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
/// The connection's end releases its socket, which sends what it still
|
|
246
|
+
/// holds before its FIN, as a closed socket does.
|
|
247
|
+
impl Drop for Transport {
|
|
248
|
+
fn drop(&mut self) {
|
|
249
|
+
self.sock.release();
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
#[cfg(test)]
|
|
254
|
+
mod tests {
|
|
255
|
+
use super::*;
|
|
256
|
+
|
|
257
|
+
// A failure the upstream socket answers reaches the HTTP seam through
|
|
258
|
+
// tokio-rustls and hyper, which carry only io::Error.
|
|
259
|
+
#[test]
|
|
260
|
+
fn a_sockets_failure_reads_back_as_itself_through_an_io_error() {
|
|
261
|
+
let failures = [
|
|
262
|
+
Errno::ConnectionReset,
|
|
263
|
+
Errno::TimedOut,
|
|
264
|
+
Errno::OutOfMemory,
|
|
265
|
+
Errno::HostUnreachable,
|
|
266
|
+
];
|
|
267
|
+
assert_eq!(
|
|
268
|
+
(
|
|
269
|
+
failures
|
|
270
|
+
.clone()
|
|
271
|
+
.map(|err| Errno::from_io_error(&to_io(err))),
|
|
272
|
+
HttpError::from_tls(&to_io(Errno::OutOfMemory))
|
|
273
|
+
),
|
|
274
|
+
(failures, HttpError::Internal),
|
|
275
|
+
"a failure the upstream socket answers must read back as the same errno once it \
|
|
276
|
+
crosses an io::Error, so memory the socket could not reserve answers internal-error"
|
|
277
|
+
);
|
|
278
|
+
}
|
|
279
|
+
}
|