1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
|
This patch is based on the upstream commit described below, adapted for use
in the Debian package by Peter Michael Green.
commit c06dac5c61458271931093aa876a7db588278e4f
Author: Perry Lorier <git@isomer.meta.net.nz>
Date: Fri Dec 29 10:49:43 2023 +0000
Bump version of hyper to 1.0
Index: erbium-core/src/http.rs
===================================================================
--- erbium-core.orig/src/http.rs
+++ erbium-core/src/http.rs
@@ -20,7 +20,13 @@
use crate::acl;
use ::prometheus;
use erbium_net::addr::{tokio_to_unixaddr, NetAddr, ToNetAddr as _};
-use hyper::{Body, Request, Response};
+use http_body_util::Full;
+use hyper::{
+ body::{Body, Bytes},
+ Request, Response,
+};
+use hyper_util::rt::TokioIo;
+
use std::convert::Infallible;
// TODO: the code here that depends on nix should move into erbium-net
use erbium_net::nix;
@@ -69,24 +75,28 @@ trait Accepter {
}
#[async_trait]
-impl Accepter for tokio::net::UnixListener {
- type AcceptedSocket = tokio::net::UnixStream;
+impl Accepter for TokioIo<tokio::net::UnixListener> {
+ type AcceptedSocket = TokioIo<tokio::net::UnixStream>;
async fn accept_connection(&self) -> Result<(Self::AcceptedSocket, NetAddr), std::io::Error> {
- self.accept()
+ self.inner()
+ .accept()
.await
- .map(|(sock, addr)| (sock, tokio_to_unixaddr(&addr).to_net_addr()))
+ .map(|(sock, addr)| (TokioIo::new(sock), tokio_to_unixaddr(&addr).to_net_addr()))
}
}
#[async_trait]
-impl Accepter for tokio::net::TcpListener {
- type AcceptedSocket = tokio::net::TcpStream;
+impl Accepter for TokioIo<tokio::net::TcpListener> {
+ type AcceptedSocket = TokioIo<tokio::net::TcpStream>;
async fn accept_connection(&self) -> Result<(Self::AcceptedSocket, NetAddr), std::io::Error> {
- self.accept().await.map(|(sock, addr)| (sock, addr.into()))
+ self.inner()
+ .accept()
+ .await
+ .map(|(sock, addr)| (TokioIo::new(sock), addr.into()))
}
}
-async fn serve_metrics(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
+async fn serve_metrics<IB: Body>(_req: Request<IB>) -> Result<Response<Full<Bytes>>, Infallible> {
use prometheus::{Encoder, TextEncoder};
// Register & measure some metrics.
@@ -106,10 +116,10 @@ async fn serve_metrics(_req: Request<Bod
.unwrap())
}
-async fn serve_leases(
- _req: Request<Body>,
+async fn serve_leases<IB: Body>(
+ _req: Request<IB>,
dhcp: &std::sync::Arc<crate::dhcp::DhcpService>,
-) -> Result<Response<Body>, Infallible> {
+) -> Result<Response<Full<Bytes>>, Infallible> {
let mut leases = dhcp.get_leases().await;
leases.sort();
let buffer = format!(
@@ -144,7 +154,7 @@ async fn serve_leases(
.unwrap())
}
-fn permission_denied() -> Response<Body> {
+fn permission_denied() -> Response<Full<Bytes>> {
use hyper::StatusCode;
Response::builder()
.status(StatusCode::FORBIDDEN)
@@ -167,7 +177,7 @@ fn require_http_permission(
acl: &[acl::Acl],
client: &acl::Attributes,
perm: acl::PermissionType,
-) -> Option<Response<Body>> {
+) -> Option<Response<Full<Bytes>>> {
match acl::require_permission(acl, client, perm) {
Ok(()) => None,
Err(err) => {
@@ -177,12 +187,12 @@ fn require_http_permission(
}
}
-async fn serve_request(
+async fn serve_request<IB: Body>(
conf: crate::config::SharedConfig,
- req: Request<Body>,
+ req: Request<IB>,
addr: std::sync::Arc<NetAddr>,
dhcp: std::sync::Arc<crate::dhcp::DhcpService>,
-) -> Result<Response<Body>, Infallible> {
+) -> Result<Response<Full<Bytes>>, Infallible> {
use hyper::{Method, StatusCode};
let client = acl::Attributes { addr: *addr };
@@ -236,8 +246,7 @@ async fn run_listener<L>(
) -> Result<(), hyper::Error>
where
L: Accepter + Unpin,
- <L as Accepter>::AcceptedSocket:
- Unpin + tokio::io::AsyncWrite + tokio::io::AsyncRead + Send + 'static,
+ <L as Accepter>::AcceptedSocket: Unpin + hyper::rt::Write + hyper::rt::Read + Send + 'static,
{
use hyper::service::service_fn;
@@ -253,9 +262,8 @@ where
let dhcp_copy = dhcp.clone();
let srv = move |req| serve_request(conf_copy.clone(), req, addr.clone(), dhcp_copy.clone());
tokio::task::spawn(async move {
- if let Err(http_err) = hyper::server::conn::Http::new()
- .http1_only(true)
- .http1_keep_alive(true)
+ if let Err(http_err) = hyper::server::conn::http1::Builder::new()
+ .keep_alive(true)
.serve_connection(stream, service_fn(srv))
.await
{
@@ -281,7 +289,11 @@ pub async fn run(
let listener = TcpListener::bind((std::net::Ipv4Addr::from(s.ip()), s.port()))
.await
.map_err(|e| Error::ListenError(s.to_string(), e))?;
- tokio::task::spawn(run_listener(conf.clone(), dhcp.clone(), listener));
+ tokio::task::spawn(run_listener(
+ conf.clone(),
+ dhcp.clone(),
+ TokioIo::new(listener),
+ ));
}
Some(Inet6) => {
let s = addr.as_sockaddr_in6().unwrap();
@@ -289,7 +301,11 @@ pub async fn run(
let listener = TcpListener::bind((s.ip(), s.port()))
.await
.map_err(|e| Error::ListenError(s.to_string(), e))?;
- tokio::task::spawn(run_listener(conf.clone(), dhcp.clone(), listener));
+ tokio::task::spawn(run_listener(
+ conf.clone(),
+ dhcp.clone(),
+ TokioIo::new(listener),
+ ));
}
Some(Unix) => {
let s = addr.to_unix_addr().unwrap();
@@ -360,7 +376,11 @@ pub async fn run(
panic!("Unknown unix listener!");
}
log::trace!("Starting listener on {:?}", listener);
- tokio::task::spawn(run_listener(conf.clone(), dhcp.clone(), listener));
+ tokio::task::spawn(run_listener(
+ conf.clone(),
+ dhcp.clone(),
+ TokioIo::new(listener),
+ ));
}
_ => panic!("Unknown listener type!"),
}
Index: erbium-core/Cargo.toml
===================================================================
--- erbium-core.orig/Cargo.toml
+++ erbium-core/Cargo.toml
@@ -59,17 +59,25 @@ version = "0.3.8"
[dependencies.hmac]
version = "0.12.1"
+[dependencies.http-body-util]
+version = "0.1"
+
[dependencies.hyper]
-version = "0.14.5"
+version = "1.1"
features = [
"server",
"http1",
- "stream",
- "runtime",
- "tcp",
+# "stream",
+# "runtime",
+# "tcp",
]
optional = true
+[dependencies.hyper-util]
+version = "0.1.2"
+features = ["tokio"]
+optional = true
+
[dependencies.lazy_static]
version = "1.4"
@@ -122,5 +130,6 @@ full = [
http = [
"hyper",
"dhcp",
+ "hyper-util",
]
radv = []
|
