Mirror WASIp{2,3} sockets implementations (#11379)

This is an implementation of #11362 but for the `wasi:sockets`
implementation of WASIp2. This additionally internalizes much of the
WASIp3 implementation with `pub(crate)` to avoid unnecessarily exposing
implementation details of the crate.

Author: alexcrichton

crates/wasi/src/ctx.rs

@@ -12,7 +12,6 @@ use std::mem;
 use std::net::SocketAddr;
 use std::path::Path;
 use std::pin::Pin;
-use std::sync::Arc;
 use tokio::io::{stderr, stdin, stdout};
 
 /// Builder-style structure used to create a [`WasiCtx`].
@@ -390,7 +389,7 @@ impl WasiCtxBuilder {
             + Sync
             + 'static,
     {
-        self.sockets.socket_addr_check = SocketAddrCheck(Arc::new(check));
+        self.sockets.socket_addr_check = SocketAddrCheck::new(check);
         self
     }
 

crates/wasi/src/lib.rs

@@ -34,7 +34,6 @@ pub use self::ctx::{WasiCtx, WasiCtxBuilder};
 pub use self::error::{I32Exit, TrappableError};
 pub use self::filesystem::{DirPerms, FilePerms, OpenMode};
 pub use self::random::{Deterministic, thread_rng};
-pub use self::sockets::{AllowedNetworkUses, SocketAddrUse};
 pub use self::view::{WasiCtxView, WasiView};
 #[doc(no_inline)]
 pub use async_trait::async_trait;

crates/wasi/src/p2/host/instance_network.rs

@@ -1,13 +1,13 @@
-use crate::p2::WasiCtxView;
 use crate::p2::bindings::sockets::instance_network;
 use crate::p2::network::Network;
+use crate::sockets::WasiSocketsCtxView;
 use wasmtime::component::Resource;
 
-impl instance_network::Host for WasiCtxView<'_> {
+impl instance_network::Host for WasiSocketsCtxView<'_> {
     fn instance_network(&mut self) -> Result<Resource<Network>, anyhow::Error> {
         let network = Network {
-            socket_addr_check: self.ctx.sockets.socket_addr_check.clone(),
-            allow_ip_name_lookup: self.ctx.sockets.allowed_network_uses.ip_name_lookup,
+            socket_addr_check: self.ctx.socket_addr_check.clone(),
+            allow_ip_name_lookup: self.ctx.allowed_network_uses.ip_name_lookup,
         };
         let network = self.table.push(network)?;
         Ok(network)

crates/wasi/src/p2/host/network.rs

@@ -1,15 +1,16 @@
+use crate::p2::SocketError;
 use crate::p2::bindings::sockets::network::{
     self, ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Ipv4SocketAddress,
     Ipv6SocketAddress,
 };
-use crate::p2::{SocketError, WasiCtxView};
+use crate::sockets::WasiSocketsCtxView;
 use crate::sockets::util::{from_ipv4_addr, from_ipv6_addr, to_ipv4_addr, to_ipv6_addr};
 use anyhow::Error;
 use rustix::io::Errno;
 use std::io;
 use wasmtime::component::Resource;
 
-impl network::Host for WasiCtxView<'_> {
+impl network::Host for WasiSocketsCtxView<'_> {
     fn convert_error_code(&mut self, error: SocketError) -> anyhow::Result<ErrorCode> {
         error.downcast()
     }
@@ -25,7 +26,7 @@ impl network::Host for WasiCtxView<'_> {
     }
 }
 
-impl crate::p2::bindings::sockets::network::HostNetwork for WasiCtxView<'_> {
+impl crate::p2::bindings::sockets::network::HostNetwork for WasiSocketsCtxView<'_> {
     fn drop(&mut self, this: Resource<network::Network>) -> Result<(), anyhow::Error> {
         self.table.delete(this)?;
 

crates/wasi/src/p2/host/tcp.rs

@@ -1,9 +1,9 @@
+use crate::p2::SocketResult;
 use crate::p2::bindings::{
     sockets::network::{IpAddressFamily, IpSocketAddress, Network},
     sockets::tcp::{self, ShutdownType},
 };
-use crate::p2::{SocketResult, WasiCtxView};
-use crate::sockets::{SocketAddrUse, SocketAddressFamily};
+use crate::sockets::{SocketAddrUse, SocketAddressFamily, WasiSocketsCtxView};
 use std::net::SocketAddr;
 use std::time::Duration;
 use wasmtime::component::Resource;
@@ -12,16 +12,16 @@ use wasmtime_wasi_io::{
     streams::{DynInputStream, DynOutputStream},
 };
 
-impl tcp::Host for WasiCtxView<'_> {}
+impl tcp::Host for WasiSocketsCtxView<'_> {}
 
-impl crate::p2::host::tcp::tcp::HostTcpSocket for WasiCtxView<'_> {
+impl crate::p2::host::tcp::tcp::HostTcpSocket for WasiSocketsCtxView<'_> {
     async fn start_bind(
         &mut self,
         this: Resource<tcp::TcpSocket>,
         network: Resource<Network>,
         local_address: IpSocketAddress,
     ) -> SocketResult<()> {
-        self.ctx.sockets.allowed_network_uses.check_allowed_tcp()?;
+        self.ctx.allowed_network_uses.check_allowed_tcp()?;
         let network = self.table.get(&network)?;
         let local_address: SocketAddr = local_address.into();
 
@@ -48,7 +48,7 @@ impl crate::p2::host::tcp::tcp::HostTcpSocket for WasiCtxView<'_> {
         network: Resource<Network>,
         remote_address: IpSocketAddress,
     ) -> SocketResult<()> {
-        self.ctx.sockets.allowed_network_uses.check_allowed_tcp()?;
+        self.ctx.allowed_network_uses.check_allowed_tcp()?;
         let network = self.table.get(&network)?;
         let remote_address: SocketAddr = remote_address.into();
 
@@ -78,7 +78,7 @@ impl crate::p2::host::tcp::tcp::HostTcpSocket for WasiCtxView<'_> {
     }
 
     fn start_listen(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<()> {
-        self.ctx.sockets.allowed_network_uses.check_allowed_tcp()?;
+        self.ctx.allowed_network_uses.check_allowed_tcp()?;
         let socket = self.table.get_mut(&this)?;
 
         socket.start_listen()
@@ -97,7 +97,7 @@ impl crate::p2::host::tcp::tcp::HostTcpSocket for WasiCtxView<'_> {
         Resource<DynInputStream>,
         Resource<DynOutputStream>,
     )> {
-        self.ctx.sockets.allowed_network_uses.check_allowed_tcp()?;
+        self.ctx.allowed_network_uses.check_allowed_tcp()?;
         let socket = self.table.get_mut(&this)?;
 
         let (tcp_socket, input, output) = socket.accept()?;
@@ -281,10 +281,8 @@ impl crate::p2::host::tcp::tcp::HostTcpSocket for WasiCtxView<'_> {
 }
 
 pub mod sync {
-    use wasmtime::component::Resource;
-
     use crate::p2::{
-        SocketError, WasiCtxView,
+        SocketError,
         bindings::{
             sockets::{
                 network::Network,
@@ -297,10 +295,12 @@ pub mod sync {
         },
     };
     use crate::runtime::in_tokio;
+    use crate::sockets::WasiSocketsCtxView;
+    use wasmtime::component::Resource;
 
-    impl tcp::Host for WasiCtxView<'_> {}
+    impl tcp::Host for WasiSocketsCtxView<'_> {}
 
-    impl HostTcpSocket for WasiCtxView<'_> {
+    impl HostTcpSocket for WasiSocketsCtxView<'_> {
         fn start_bind(
             &mut self,
             self_: Resource<TcpSocket>,

crates/wasi/src/p2/host/tcp_create_socket.rs

@@ -1,9 +1,10 @@
+use crate::p2::SocketResult;
 use crate::p2::bindings::{sockets::network::IpAddressFamily, sockets::tcp_create_socket};
 use crate::p2::tcp::TcpSocket;
-use crate::p2::{SocketResult, WasiCtxView};
+use crate::sockets::WasiSocketsCtxView;
 use wasmtime::component::Resource;
 
-impl tcp_create_socket::Host for WasiCtxView<'_> {
+impl tcp_create_socket::Host for WasiSocketsCtxView<'_> {
     fn create_tcp_socket(
         &mut self,
         address_family: IpAddressFamily,

crates/wasi/src/p2/host/udp.rs

@@ -1,13 +1,15 @@
 use crate::p2::bindings::sockets::network::{ErrorCode, IpAddressFamily, IpSocketAddress, Network};
 use crate::p2::bindings::sockets::udp;
 use crate::p2::udp::{IncomingDatagramStream, OutgoingDatagramStream, SendState, UdpState};
-use crate::p2::{Pollable, SocketError, SocketResult, WasiCtxView};
+use crate::p2::{Pollable, SocketError, SocketResult};
 use crate::sockets::util::{
     get_ip_ttl, get_ipv6_unicast_hops, is_valid_address_family, is_valid_remote_address,
     receive_buffer_size, send_buffer_size, set_receive_buffer_size, set_send_buffer_size,
     set_unicast_hop_limit, udp_bind, udp_disconnect,
 };
-use crate::sockets::{MAX_UDP_DATAGRAM_SIZE, SocketAddrUse, SocketAddressFamily};
+use crate::sockets::{
+    MAX_UDP_DATAGRAM_SIZE, SocketAddrUse, SocketAddressFamily, WasiSocketsCtxView,
+};
 use anyhow::anyhow;
 use async_trait::async_trait;
 use io_lifetimes::AsSocketlike;
@@ -17,16 +19,16 @@ use tokio::io::Interest;
 use wasmtime::component::Resource;
 use wasmtime_wasi_io::poll::DynPollable;
 
-impl udp::Host for WasiCtxView<'_> {}
+impl udp::Host for WasiSocketsCtxView<'_> {}
 
-impl udp::HostUdpSocket for WasiCtxView<'_> {
+impl udp::HostUdpSocket for WasiSocketsCtxView<'_> {
     async fn start_bind(
         &mut self,
         this: Resource<udp::UdpSocket>,
         network: Resource<Network>,
         local_address: IpSocketAddress,
     ) -> SocketResult<()> {
-        self.ctx.sockets.allowed_network_uses.check_allowed_udp()?;
+        self.ctx.allowed_network_uses.check_allowed_udp()?;
 
         match self.table.get(&this)?.udp_state {
             UdpState::Default => {}
@@ -274,7 +276,7 @@ impl udp::HostUdpSocket for WasiCtxView<'_> {
     }
 }
 
-impl udp::HostIncomingDatagramStream for WasiCtxView<'_> {
+impl udp::HostIncomingDatagramStream for WasiSocketsCtxView<'_> {
     fn receive(
         &mut self,
         this: Resource<udp::IncomingDatagramStream>,
@@ -362,7 +364,7 @@ impl Pollable for IncomingDatagramStream {
     }
 }
 
-impl udp::HostOutgoingDatagramStream for WasiCtxView<'_> {
+impl udp::HostOutgoingDatagramStream for WasiSocketsCtxView<'_> {
     fn check_send(&mut self, this: Resource<udp::OutgoingDatagramStream>) -> SocketResult<u64> {
         let stream = self.table.get_mut(&this)?;
 
@@ -506,7 +508,7 @@ pub mod sync {
     use wasmtime::component::Resource;
 
     use crate::p2::{
-        SocketError, WasiCtxView,
+        SocketError,
         bindings::{
             sockets::{
                 network::Network,
@@ -526,10 +528,11 @@ pub mod sync {
         },
     };
     use crate::runtime::in_tokio;
+    use crate::sockets::WasiSocketsCtxView;
 
-    impl udp::Host for WasiCtxView<'_> {}
+    impl udp::Host for WasiSocketsCtxView<'_> {}
 
-    impl HostUdpSocket for WasiCtxView<'_> {
+    impl HostUdpSocket for WasiSocketsCtxView<'_> {
         fn start_bind(
             &mut self,
             self_: Resource<UdpSocket>,
@@ -628,7 +631,7 @@ pub mod sync {
         }
     }
 
-    impl HostIncomingDatagramStream for WasiCtxView<'_> {
+    impl HostIncomingDatagramStream for WasiSocketsCtxView<'_> {
         fn receive(
             &mut self,
             self_: Resource<IncomingDatagramStream>,
@@ -667,7 +670,7 @@ pub mod sync {
         }
     }
 
-    impl HostOutgoingDatagramStream for WasiCtxView<'_> {
+    impl HostOutgoingDatagramStream for WasiSocketsCtxView<'_> {
         fn check_send(
             &mut self,
             self_: Resource<OutgoingDatagramStream>,

crates/wasi/src/p2/host/udp_create_socket.rs

@@ -1,9 +1,10 @@
+use crate::p2::SocketResult;
 use crate::p2::bindings::{sockets::network::IpAddressFamily, sockets::udp_create_socket};
 use crate::p2::udp::UdpSocket;
-use crate::p2::{SocketResult, WasiCtxView};
+use crate::sockets::WasiSocketsCtxView;
 use wasmtime::component::Resource;
 
-impl udp_create_socket::Host for WasiCtxView<'_> {
+impl udp_create_socket::Host for WasiSocketsCtxView<'_> {
     fn create_udp_socket(
         &mut self,
         address_family: IpAddressFamily,

crates/wasi/src/p2/ip_name_lookup.rs

@@ -1,7 +1,8 @@
+use crate::p2::SocketError;
 use crate::p2::bindings::sockets::ip_name_lookup::{Host, HostResolveAddressStream};
 use crate::p2::bindings::sockets::network::{ErrorCode, IpAddress, Network};
-use crate::p2::{SocketError, WasiCtxView};
 use crate::runtime::{AbortOnDropJoinHandle, spawn_blocking};
+use crate::sockets::WasiSocketsCtxView;
 use anyhow::Result;
 use std::mem;
 use std::net::ToSocketAddrs;
@@ -17,7 +18,7 @@ pub enum ResolveAddressStream {
     Done(Result<vec::IntoIter<IpAddress>, SocketError>),
 }
 
-impl Host for WasiCtxView<'_> {
+impl Host for WasiSocketsCtxView<'_> {
     fn resolve_addresses(
         &mut self,
         network: Resource<Network>,
@@ -37,7 +38,7 @@ impl Host for WasiCtxView<'_> {
     }
 }
 
-impl HostResolveAddressStream for WasiCtxView<'_> {
+impl HostResolveAddressStream for WasiSocketsCtxView<'_> {
     fn resolve_next_address(
         &mut self,
         resource: Resource<ResolveAddressStream>,

crates/wasi/src/p2/mod.rs

@@ -224,6 +224,7 @@
 use crate::cli::{WasiCli, WasiCliView};
 use crate::clocks::{WasiClocks, WasiClocksView};
 use crate::random::WasiRandom;
+use crate::sockets::{WasiSockets, WasiSocketsView};
 use crate::{WasiCtxView, WasiView};
 use wasmtime::component::{HasData, Linker, ResourceTable};
 
@@ -323,8 +324,8 @@ pub fn add_to_linker_with_options_async<T: WasiView>(
 
     let l = linker;
     bindings::filesystem::types::add_to_linker::<T, HasWasi>(l, T::ctx)?;
-    bindings::sockets::tcp::add_to_linker::<T, HasWasi>(l, T::ctx)?;
-    bindings::sockets::udp::add_to_linker::<T, HasWasi>(l, T::ctx)?;
+    bindings::sockets::tcp::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
+    bindings::sockets::udp::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     Ok(())
 }
 
@@ -356,11 +357,11 @@ where
     cli::terminal_stdin::add_to_linker::<T, WasiCli>(l, T::cli)?;
     cli::terminal_stdout::add_to_linker::<T, WasiCli>(l, T::cli)?;
     cli::terminal_stderr::add_to_linker::<T, WasiCli>(l, T::cli)?;
-    sockets::tcp_create_socket::add_to_linker::<T, HasWasi>(l, T::ctx)?;
-    sockets::udp_create_socket::add_to_linker::<T, HasWasi>(l, T::ctx)?;
-    sockets::instance_network::add_to_linker::<T, HasWasi>(l, T::ctx)?;
-    sockets::network::add_to_linker::<T, HasWasi>(l, &options.into(), T::ctx)?;
-    sockets::ip_name_lookup::add_to_linker::<T, HasWasi>(l, T::ctx)?;
+    sockets::tcp_create_socket::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
+    sockets::udp_create_socket::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
+    sockets::instance_network::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
+    sockets::network::add_to_linker::<T, WasiSockets>(l, &options.into(), T::sockets)?;
+    sockets::ip_name_lookup::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     Ok(())
 }
 
@@ -467,8 +468,8 @@ pub fn add_to_linker_with_options_sync<T: WasiView>(
 
     let l = linker;
     bindings::sync::filesystem::types::add_to_linker::<T, HasWasi>(l, T::ctx)?;
-    bindings::sync::sockets::tcp::add_to_linker::<T, HasWasi>(l, T::ctx)?;
-    bindings::sync::sockets::udp::add_to_linker::<T, HasWasi>(l, T::ctx)?;
+    bindings::sync::sockets::tcp::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
+    bindings::sync::sockets::udp::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     Ok(())
 }