Inject connection informations in the request extension

crates/cli/src/commands/server.rs

@@ -25,7 +25,11 @@ use mas_config::RootConfig;
 use mas_email::Mailer;
 use mas_handlers::{AppState, MatrixHomeserver};
 use mas_http::ServerLayer;
-use mas_listener::{maybe_tls::MaybeTlsAcceptor, proxy_protocol::MaybeProxyAcceptor};
+use mas_listener::{
+    info::{ConnectionInfoAcceptor, IntoMakeServiceWithConnection},
+    maybe_tls::MaybeTlsAcceptor,
+    proxy_protocol::MaybeProxyAcceptor,
+};
 use mas_policy::PolicyFactory;
 use mas_router::UrlBuilder;
 use mas_storage::MIGRATOR;
@@ -276,6 +280,7 @@ impl Options {
                 info!("Listening on {addresses:?} with resources {resources:?} {additional}", resources = &config.resources);
 
                 let router = crate::server::build_router(&state, &config.resources).layer(ServerLayer::new(config.name.clone()));
+                let make_service = IntoMakeServiceWithConnection::new(router);
 
                 async move {
                     let tls_config = if let Some(tls_config) = config.tls.as_ref() {
@@ -288,9 +293,10 @@ impl Options {
                         .try_for_each_concurrent(None, move |listener| {
                             let listener = MaybeTlsAcceptor::new(tls_config.clone(), listener);
                             let listener = MaybeProxyAcceptor::new(listener, config.proxy_protocol);
+                            let listener = ConnectionInfoAcceptor::new(listener);
 
                             Server::builder(listener)
-                                .serve(router.clone().into_make_service())
+                                .serve(make_service.clone())
                                 .with_graceful_shutdown(signal.clone())
                         })
                         .await?;

crates/cli/src/server.rs

@@ -19,13 +19,14 @@ use std::{
 };
 
 use anyhow::Context;
-use axum::{body::HttpBody, Router};
+use axum::{body::HttpBody, Extension, Router};
 use listenfd::ListenFd;
 use mas_config::{HttpBindConfig, HttpResource, HttpTlsConfig, UnixOrTcp};
 use mas_handlers::AppState;
-use mas_listener::unix_or_tcp::UnixOrTcpListener;
+use mas_listener::{info::Connection, unix_or_tcp::UnixOrTcpListener};
 use mas_router::Route;
 use rustls::ServerConfig;
+use tokio::sync::OnceCell;
 
 #[allow(clippy::trait_duplication_in_bounds)]
 pub fn build_router<B>(state: &Arc<AppState>, resources: &[HttpResource]) -> Router<AppState, B>
@@ -60,6 +61,16 @@ where
             mas_config::HttpResource::Compat => {
                 router.merge(mas_handlers::compat_router(state.clone()))
             }
+            // TODO: do a better handler here
+            mas_config::HttpResource::ConnectionInfo => router.route(
+                "/connection-info",
+                axum::routing::get(
+                    |connection: Extension<Arc<OnceCell<Connection>>>| async move {
+                        let connection = connection.get().unwrap();
+                        format!("{connection:?}")
+                    },
+                ),
+            ),
         }
     }