Skip to content

Commit 0370e00

Browse files
erebeerebe
committed
Update example low-level-rustls to axum 0.7
1 parent b13b9d2 commit 0370e00

File tree

2 files changed

+114
-103
lines changed

2 files changed

+114
-103
lines changed

‎examples/low-level-rustls/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ publish = false
66

77
[dependencies]
88
axum = { path = "../../axum" }
9-
futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
9+
futures-util = { version = "0.3", default-features = false }
1010
hyper = { version = "1.0.0", features = ["full"] }
11-
rustls-pemfile = "0.3"
11+
hyper-util = { version = "0.1" }
12+
rustls-pemfile = "1.0.4"
1213
tokio = { version = "1", features = ["full"] }
13-
tokio-rustls = "0.23"
14+
tokio-rustls = "0.24.1"
1415
tower = { version = "0.4", features = ["make"] }
16+
tower-service = "0.3.2"
1517
tracing = "0.1"
1618
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

‎examples/low-level-rustls/src/main.rs

Lines changed: 109 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -4,105 +4,114 @@
44
//! cargo run -p example-low-level-rustls
55
//! ```
66
7-
// TODO
8-
fn main() {
9-
eprint!("this example has not yet been updated to hyper 1.0");
7+
use axum::{extract::Request, routing::get, Router};
8+
use futures_util::pin_mut;
9+
use hyper::body::Incoming;
10+
use hyper_util::rt::{TokioExecutor, TokioIo};
11+
use rustls_pemfile::{certs, pkcs8_private_keys};
12+
use std::{
13+
fs::File,
14+
io::BufReader,
15+
path::{Path, PathBuf},
16+
sync::Arc,
17+
};
18+
use tokio::net::TcpListener;
19+
use tokio_rustls::{
20+
rustls::{Certificate, PrivateKey, ServerConfig},
21+
TlsAcceptor,
22+
};
23+
use tower_service::Service;
24+
use tracing::{error, info, warn};
25+
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
26+
27+
#[tokio::main]
28+
async fn main() {
29+
tracing_subscriber::registry()
30+
.with(
31+
tracing_subscriber::EnvFilter::try_from_default_env()
32+
.unwrap_or_else(|_| "example_low_level_rustls=debug".into()),
33+
)
34+
.with(tracing_subscriber::fmt::layer())
35+
.init();
36+
37+
let rustls_config = rustls_server_config(
38+
PathBuf::from(env!("CARGO_MANIFEST_DIR"))
39+
.join("self_signed_certs")
40+
.join("key.pem"),
41+
PathBuf::from(env!("CARGO_MANIFEST_DIR"))
42+
.join("self_signed_certs")
43+
.join("cert.pem"),
44+
);
45+
46+
let tls_acceptor = TlsAcceptor::from(rustls_config);
47+
let bind = "[::1]:3000";
48+
let tcp_listener = TcpListener::bind(bind).await.unwrap();
49+
info!("HTTPS server listening on {bind}. To contact curl -k https://localhost:3000");
50+
let app = Router::new().route("/", get(handler));
51+
52+
pin_mut!(tcp_listener);
53+
loop {
54+
let tower_service = app.clone();
55+
let tls_acceptor = tls_acceptor.clone();
56+
57+
// Wait for new tcp connection
58+
let (cnx, addr) = tcp_listener.accept().await.unwrap();
59+
60+
tokio::spawn(async move {
61+
// Wait for tls handshake to happen
62+
let Ok(stream) = tls_acceptor.accept(cnx).await else {
63+
error!("error during tls handshake connection from {}", addr);
64+
return;
65+
};
66+
67+
// Hyper has its own `AsyncRead` and `AsyncWrite` traits and doesn't use tokio.
68+
// `TokioIo` converts between them.
69+
let stream = TokioIo::new(stream);
70+
71+
// Hyper has also its own `Service` trait and doesn't use tower. We can use
72+
// `hyper::service::service_fn` to create a hyper `Service` that calls our app through
73+
// `tower::Service::call`.
74+
let hyper_service = hyper::service::service_fn(move |request: Request<Incoming>| {
75+
// We have to clone `tower_service` because hyper's `Service` uses `&self` whereas
76+
// tower's `Service` requires `&mut self`.
77+
//
78+
// We don't need to call `poll_ready` since `Router` is always ready.
79+
tower_service.clone().call(request)
80+
});
81+
82+
let ret = hyper_util::server::conn::auto::Builder::new(TokioExecutor::new())
83+
.serve_connection_with_upgrades(stream, hyper_service)
84+
.await;
85+
86+
if let Err(err) = ret {
87+
warn!("error serving connection from {}: {}", addr, err);
88+
}
89+
});
90+
}
1091
}
1192

12-
// use axum::{extract::Request, routing::get, Router};
13-
// use futures_util::future::poll_fn;
14-
// use hyper::server::{
15-
// accept::Accept,
16-
// conn::{AddrIncoming, Http},
17-
// };
18-
// use rustls_pemfile::{certs, pkcs8_private_keys};
19-
// use std::{
20-
// fs::File,
21-
// io::BufReader,
22-
// path::{Path, PathBuf},
23-
// pin::Pin,
24-
// sync::Arc,
25-
// };
26-
// use tokio::net::TcpListener;
27-
// use tokio_rustls::{
28-
// rustls::{Certificate, PrivateKey, ServerConfig},
29-
// TlsAcceptor,
30-
// };
31-
// use tower::make::MakeService;
32-
// use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
33-
34-
// #[tokio::main]
35-
// async fn main() {
36-
// tracing_subscriber::registry()
37-
// .with(
38-
// tracing_subscriber::EnvFilter::try_from_default_env()
39-
// .unwrap_or_else(|_| "example_tls_rustls=debug".into()),
40-
// )
41-
// .with(tracing_subscriber::fmt::layer())
42-
// .init();
43-
44-
// let rustls_config = rustls_server_config(
45-
// PathBuf::from(env!("CARGO_MANIFEST_DIR"))
46-
// .join("self_signed_certs")
47-
// .join("key.pem"),
48-
// PathBuf::from(env!("CARGO_MANIFEST_DIR"))
49-
// .join("self_signed_certs")
50-
// .join("cert.pem"),
51-
// );
52-
53-
// let acceptor = TlsAcceptor::from(rustls_config);
54-
55-
// let listener = TcpListener::bind("127.0.0.1:3000").await.unwrap();
56-
// let mut listener = AddrIncoming::from_listener(listener).unwrap();
57-
58-
// let protocol = Arc::new(Http::new());
59-
60-
// let mut app = Router::<()>::new()
61-
// .route("/", get(handler))
62-
// .into_make_service();
63-
64-
// loop {
65-
// let stream = poll_fn(|cx| Pin::new(&mut listener).poll_accept(cx))
66-
// .await
67-
// .unwrap()
68-
// .unwrap();
69-
70-
// let acceptor = acceptor.clone();
71-
72-
// let protocol = protocol.clone();
73-
74-
// let svc = MakeService::<_, Request<hyper::Body>>::make_service(&mut app, &stream);
75-
76-
// tokio::spawn(async move {
77-
// if let Ok(stream) = acceptor.accept(stream).await {
78-
// let _ = protocol.serve_connection(stream, svc.await.unwrap()).await;
79-
// }
80-
// });
81-
// }
82-
// }
83-
84-
// async fn handler() -> &'static str {
85-
// "Hello, World!"
86-
// }
87-
88-
// fn rustls_server_config(key: impl AsRef<Path>, cert: impl AsRef<Path>) -> Arc<ServerConfig> {
89-
// let mut key_reader = BufReader::new(File::open(key).unwrap());
90-
// let mut cert_reader = BufReader::new(File::open(cert).unwrap());
91-
92-
// let key = PrivateKey(pkcs8_private_keys(&mut key_reader).unwrap().remove(0));
93-
// let certs = certs(&mut cert_reader)
94-
// .unwrap()
95-
// .into_iter()
96-
// .map(Certificate)
97-
// .collect();
98-
99-
// let mut config = ServerConfig::builder()
100-
// .with_safe_defaults()
101-
// .with_no_client_auth()
102-
// .with_single_cert(certs, key)
103-
// .expect("bad certificate/key");
104-
105-
// config.alpn_protocols = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
106-
107-
// Arc::new(config)
108-
// }
93+
async fn handler() -> &'static str {
94+
"Hello, World!"
95+
}
96+
97+
fn rustls_server_config(key: impl AsRef<Path>, cert: impl AsRef<Path>) -> Arc<ServerConfig> {
98+
let mut key_reader = BufReader::new(File::open(key).unwrap());
99+
let mut cert_reader = BufReader::new(File::open(cert).unwrap());
100+
101+
let key = PrivateKey(pkcs8_private_keys(&mut key_reader).unwrap().remove(0));
102+
let certs = certs(&mut cert_reader)
103+
.unwrap()
104+
.into_iter()
105+
.map(Certificate)
106+
.collect();
107+
108+
let mut config = ServerConfig::builder()
109+
.with_safe_defaults()
110+
.with_no_client_auth()
111+
.with_single_cert(certs, key)
112+
.expect("bad certificate/key");
113+
114+
config.alpn_protocols = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
115+
116+
Arc::new(config)
117+
}

0 commit comments

Comments
 (0)