0
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
1 //! A convenience crate for optionally supporting systemd socket activation.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
2 //!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
3 //! ## About
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
4 //!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
5 //! The goal of this crate is to make socket activation with systemd in your project trivial.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
6 //! It provides a replacement for `std::net::SocketAddr` that allows parsing the bind address from string just like the one from `std`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
7 //! but on top of that also allows `systemd://socket_name` format that tells it to use systemd activation with given socket name.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
8 //! Then it provides a method to bind the address which will return the socket from systemd if available.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
9 //!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
10 //! The provided type supports conversions from various types of strings and also `serde` and `parse_arg` via feature flag.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
11 //! Thanks to this the change to your code should be minimal - parsing will continue to work, it'll just allow a new format.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
12 //! You only need to change the code to use `SocketAddr::bind()` instead of `TcpListener::bind()` for binding.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
13 //!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
14 //! Further, the crate also provides convenience methods for binding `tokio` 0.2, 0.3, and
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
15 //! `async_std` sockets if the appropriate features are activated.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
16 //!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
17 //! ## Example
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
18 //!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
19 //! ```no_run
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
20 //! use systemd_socket::SocketAddr;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
21 //! use std::convert::TryFrom;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
22 //! use std::io::Write;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
23 //!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
24 //! let mut args = std::env::args_os();
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
25 //! let program_name = args.next().expect("unknown program name");
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
26 //! let socket_addr = args.next().expect("missing socket address");
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
27 //! let socket_addr = SocketAddr::try_from(socket_addr).expect("failed to parse socket address");
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
28 //! let socket = socket_addr.bind().expect("failed to bind socket");
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
29 //!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
30 //! loop {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
31 //! let _ = socket
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
32 //! .accept()
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
33 //! .expect("failed to accept connection")
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
34 //! .0
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
35 //! .write_all(b"Hello world!")
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
36 //! .map_err(|err| eprintln!("Failed to send {}", err));
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
37 //! }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
38 //! ```
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
39 //!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
40 //! ## Features
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
41 //!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
42 //! * `serde` - implements `serde::Deserialize` for `SocketAddr`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
43 //! * `parse_arg` - implements `parse_arg::ParseArg` for `SocketAddr`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
44 //! * `tokio_0_2` - adds `bind_tokio_0_2` convenience method to `SocketAddr`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
45 //! * `tokio_0_3` - adds `bind_tokio_0_3` convenience method to `SocketAddr`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
46 //! * `async_std` - adds `bind_async_std` convenience method to `SocketAddr`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
47
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
48 #![deny(missing_docs)]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
49
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
50 pub mod error;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
51
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
52 use std::convert::{TryFrom, TryInto};
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
53 use std::fmt;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
54 use std::ffi::{OsStr, OsString};
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
55 use crate::error::*;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
56
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
57 pub(crate) mod systemd_sockets {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
58 use std::fmt;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
59 use std::sync::Mutex;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
60 use libsystemd::activation::FileDescriptor;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
61 use libsystemd::errors::Error as LibSystemdError;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
62 use libsystemd::errors::Result as LibSystemdResult;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
63
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
64 #[derive(Debug)]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
65 pub(crate) struct Error(&'static Mutex<LibSystemdError>);
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
66
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
67 impl fmt::Display for Error {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
68 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
69 fmt::Display::fmt(&*self.0.lock().expect("mutex poisoned"), f)
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
70 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
71 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
72
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
73 // No source we can't keep the mutex locked
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
74 impl std::error::Error for Error {}
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
75
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
76 pub(crate) fn take(name: &str) -> Result<Option<FileDescriptor>, Error> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
77 match &*SYSTEMD_SOCKETS {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
78 Ok(sockets) => Ok(sockets.take(name)),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
79 Err(error) => Err(Error(error))
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
80 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
81 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
82
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
83 struct SystemdSockets(std::sync::Mutex<std::collections::HashMap<String, FileDescriptor>>);
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
84
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
85 impl SystemdSockets {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
86 fn new() -> LibSystemdResult<Self> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
87 // MUST BE true FOR SAFETY!!!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
88 let map = libsystemd::activation::receive_descriptors_with_names(/*unset env = */ true)?.into_iter().map(|(fd, name)| (name, fd)).collect();
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
89 Ok(SystemdSockets(Mutex::new(map)))
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
90 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
91
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
92 fn take(&self, name: &str) -> Option<FileDescriptor> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
93 // MUST remove THE SOCKET FOR SAFETY!!!
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
94 self.0.lock().expect("poisoned mutex").remove(name)
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
95 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
96 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
97
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
98 lazy_static::lazy_static! {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
99 // We don't panic in order to let the application handle the error later
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
100 static ref SYSTEMD_SOCKETS: Result<SystemdSockets, Mutex<LibSystemdError>> = SystemdSockets::new().map_err(Mutex::new);
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
101 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
102 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
103
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
104 /// Socket address that can be an ordinary address or a systemd socket
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
105 ///
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
106 /// This is the core type of this crate that abstracts possible addresses.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
107 /// It can be (fallibly) converted from various types of strings or deserialized with `serde`.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
108 /// After it's created, it can be bound as `TcpListener` from `std` or even `tokio` or `async_std`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
109 /// if the appropriate feature is enabled.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
110 ///
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
111 /// Optional dependencies on `parse_arg` and `serde` make it trivial to use with
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
112 /// [`configure_me`](https://crates.io/crates/configure_me).
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
113 #[derive(Debug)]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
114 #[cfg_attr(feature = "serde", derive(serde_crate::Deserialize), serde(crate = "serde_crate", try_from = "serde_str_helpers::DeserBorrowStr"))]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
115 pub struct SocketAddr(SocketAddrInner);
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
116
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
117 impl SocketAddr {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
118 /// Creates `std::net::TcpListener`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
119 ///
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
120 /// This method either `binds` the socket, if the address was provided or uses systemd socket
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
121 /// if the socket name was provided.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
122 pub fn bind(self) -> Result<std::net::TcpListener, BindError> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
123 self._bind().map(|(socket, _)| socket)
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
124 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
125
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
126 /// Creates `tokio::net::TcpListener`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
127 ///
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
128 /// To be specific, it binds the socket and converts it to `tokio` 0.2 socket.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
129 ///
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
130 /// This method either `binds` the socket, if the address was provided or uses systemd socket
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
131 /// if the socket name was provided.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
132 #[cfg(feature = "tokio_0_2")]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
133 pub fn bind_tokio_0_2(self) -> Result<tokio_0_2::net::TcpListener, TokioBindError> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
134 let (socket, addr) = self._bind()?;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
135 socket.try_into().map_err(|error| TokioConversionError { addr, error, }.into())
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
136 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
137
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
138 /// Creates `tokio::net::TcpListener`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
139 ///
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
140 /// To be specific, it binds the socket and converts it to `tokio` 0.3 socket.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
141 ///
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
142 /// This method either `binds` the socket, if the address was provided or uses systemd socket
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
143 /// if the socket name was provided.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
144 #[cfg(feature = "tokio_0_3")]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
145 pub fn bind_tokio_0_3(self) -> Result<tokio_0_3::net::TcpListener, TokioBindError> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
146 let (socket, addr) = self._bind()?;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
147 socket.try_into().map_err(|error| TokioConversionError { addr, error, }.into())
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
148 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
149
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
150 /// Creates `async_std::net::TcpListener`
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
151 ///
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
152 /// To be specific, it binds the socket and converts it to `async_std` socket.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
153 ///
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
154 /// This method either `binds` the socket, if the address was provided or uses systemd socket
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
155 /// if the socket name was provided.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
156 #[cfg(feature = "async-std")]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
157 pub fn bind_async_std(self) -> Result<async_std::net::TcpListener, BindError> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
158 let (socket, _) = self._bind()?;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
159 Ok(socket.into())
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
160 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
161
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
162 // We can't impl<T: Deref<Target=str> + Into<String>> TryFrom<T> for SocketAddr because of orphan
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
163 // rules.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
164 fn try_from_generic<'a, T>(string: T) -> Result<Self, ParseError> where T: 'a + std::ops::Deref<Target=str> + Into<String> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
165 if string.starts_with(SYSTEMD_PREFIX) {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
166 match string[SYSTEMD_PREFIX.len()..].chars().enumerate().find(|(_, c)| !c.is_ascii() || *c < ' ' || *c == ':') {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
167 None => Ok(SocketAddr(SocketAddrInner::Systemd(string.into()))),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
168 Some((pos, c)) => Err(ParseErrorInner::InvalidCharacter { string: string.into(), c, pos, }.into()),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
169 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
170 } else {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
171 Ok(string.parse().map(SocketAddrInner::Ordinary).map(SocketAddr).map_err(ParseErrorInner::SocketAddr)?)
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
172 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
173 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
174
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
175 fn _bind(self) -> Result<(std::net::TcpListener, SocketAddrInner), BindError> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
176 match self.0 {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
177 SocketAddrInner::Ordinary(addr) => match std::net::TcpListener::bind(addr) {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
178 Ok(socket) => Ok((socket, SocketAddrInner::Ordinary(addr))),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
179 Err(error) => Err(BindErrorInner::BindFailed { addr, error, }.into()),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
180 },
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
181 SocketAddrInner::Systemd(socket_name) => {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
182 use libsystemd::activation::IsType;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
183 use std::os::unix::io::{FromRawFd, IntoRawFd};
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
184
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
185 let socket = systemd_sockets::take(&socket_name[SYSTEMD_PREFIX.len()..]).map_err(BindErrorInner::ReceiveDescriptors)?;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
186 // Safety: The environment variable is unset, so that no other calls can get the
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
187 // descriptors. The descriptors are taken from the map, not cloned, so they can't
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
188 // be duplicated.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
189 unsafe {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
190 // match instead of combinators to avoid cloning socket_name
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
191 match socket {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
192 Some(socket) if socket.is_inet() => Ok((std::net::TcpListener::from_raw_fd(socket.into_raw_fd()), SocketAddrInner::Systemd(socket_name))),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
193 Some(_) => Err(BindErrorInner::NotInetSocket(socket_name).into()),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
194 None => Err(BindErrorInner::MissingDescriptor(socket_name).into())
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
195 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
196 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
197 },
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
198 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
199 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
200 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
201
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
202 /// Displays the address in format that can be parsed again.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
203 ///
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
204 /// **Important: While I don't expect this impl to change, don't rely on it!**
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
205 /// It should be used mostly for debugging/logging.
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
206 impl fmt::Display for SocketAddr {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
207 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
208 fmt::Display::fmt(&self.0, f)
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
209 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
210 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
211
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
212 impl fmt::Display for SocketAddrInner {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
213 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
214 match self {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
215 SocketAddrInner::Ordinary(addr) => fmt::Display::fmt(addr, f),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
216 SocketAddrInner::Systemd(addr) => fmt::Display::fmt(addr, f),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
217 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
218 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
219 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
220
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
221 // PartialEq for testing, I'm not convinced it should be exposed
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
222 #[derive(Debug, PartialEq)]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
223 enum SocketAddrInner {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
224 Ordinary(std::net::SocketAddr),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
225 Systemd(String),
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
226 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
227
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
228 const SYSTEMD_PREFIX: &str = "systemd://";
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
229
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
230 impl std::str::FromStr for SocketAddr {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
231 type Err = ParseError;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
232
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
233 fn from_str(s: &str) -> Result<Self, Self::Err> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
234 SocketAddr::try_from_generic(s)
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
235 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
236 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
237
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
238 impl<'a> TryFrom<&'a str> for SocketAddr {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
239 type Error = ParseError;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
240
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
241 fn try_from(s: &'a str) -> Result<Self, Self::Error> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
242 SocketAddr::try_from_generic(s)
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
243 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
244 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
245
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
246 impl TryFrom<String> for SocketAddr {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
247 type Error = ParseError;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
248
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
249 fn try_from(s: String) -> Result<Self, Self::Error> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
250 SocketAddr::try_from_generic(s)
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
251 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
252 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
253
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
254 impl<'a> TryFrom<&'a OsStr> for SocketAddr {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
255 type Error = ParseOsStrError;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
256
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
257 fn try_from(s: &'a OsStr) -> Result<Self, Self::Error> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
258 s.to_str().ok_or(ParseOsStrError::InvalidUtf8)?.try_into().map_err(Into::into)
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
259 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
260 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
261
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
262 impl TryFrom<OsString> for SocketAddr {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
263 type Error = ParseOsStrError;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
264
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
265 fn try_from(s: OsString) -> Result<Self, Self::Error> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
266 s.into_string().map_err(|_| ParseOsStrError::InvalidUtf8)?.try_into().map_err(Into::into)
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
267 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
268 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
269
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
270 #[cfg(feature = "serde")]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
271 impl<'a> TryFrom<serde_str_helpers::DeserBorrowStr<'a>> for SocketAddr {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
272 type Error = ParseError;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
273
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
274 fn try_from(s: serde_str_helpers::DeserBorrowStr<'a>) -> Result<Self, Self::Error> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
275 SocketAddr::try_from_generic(std::borrow::Cow::from(s))
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
276 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
277 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
278
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
279 #[cfg(feature = "parse_arg")]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
280 impl parse_arg::ParseArg for SocketAddr {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
281 type Error = ParseOsStrError;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
282
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
283 fn describe_type<W: fmt::Write>(mut writer: W) -> fmt::Result {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
284 std::net::SocketAddr::describe_type(&mut writer)?;
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
285 write!(writer, " or a systemd socket name prefixed with systemd://")
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
286 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
287
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
288 fn parse_arg(arg: &OsStr) -> Result<Self, Self::Error> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
289 arg.try_into()
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
290 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
291
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
292 fn parse_owned_arg(arg: OsString) -> Result<Self, Self::Error> {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
293 arg.try_into()
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
294 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
295 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
296
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
297 #[cfg(test)]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
298 mod tests {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
299 use super::{SocketAddr, SocketAddrInner};
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
300
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
301 #[test]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
302 fn parse_ordinary() {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
303 assert_eq!("127.0.0.1:42".parse::<SocketAddr>().unwrap().0, SocketAddrInner::Ordinary(([127, 0, 0, 1], 42).into()));
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
304 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
305
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
306 #[test]
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
307 fn parse_systemd() {
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
308 assert_eq!("systemd://foo".parse::<SocketAddr>().unwrap().0, SocketAddrInner::Systemd("systemd://foo".to_owned()));
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
309 }
|
Martin Habovstiak <martin.habovstiak@gmail.com>
parents:
diff
changeset
|
310 }
|