update deps + simplify with new https redirect svc

Author: GlenDC

Cargo.lock

@@ -3,6 +3,7 @@ use std::time::Duration;
 
 use rama::{
     Layer as _,
+    combinators::Either,
     error::{BoxError, ErrorContext as _},
     graceful::{self, ShutdownGuard},
     http::{server::HttpServer, tls::CertIssuerHttpClient},
@@ -64,14 +65,11 @@ async fn spawn_service_http(
     interface: Interface,
     https_enabled: bool,
 ) -> Result<(), BoxError> {
-    let svc = AddExtensionLayer::new(Protocol::HTTP).into_layer(
-        self::service::load_http_service(if https_enabled {
-            self::service::ServiceMode::Http
-        } else {
-            self::service::ServiceMode::HttpOnly
-        })
-        .await?,
-    );
+    let svc = if https_enabled {
+        Either::A(self::service::load_http_service().await?)
+    } else {
+        Either::B(self::service::load_https_service().await?)
+    };
 
     let http_server = HttpServer::auto(Executor::graceful(guard.clone())).service(svc);
     let tcp_server = HaProxyLayer::new().with_peek(true).into_layer(http_server);
@@ -108,7 +106,7 @@ async fn spawn_service_https(guard: ShutdownGuard, interface: Interface) -> Resu
         TlsAcceptorData::try_from(tls_server_config).context("create acceptor data")?;
 
     let svc = AddExtensionLayer::new(Protocol::HTTPS)
-        .into_layer(self::service::load_http_service(self::service::ServiceMode::Https).await?);
+        .into_layer(self::service::load_http_service().await?);
 
     let http_server = HttpServer::auto(executor).service(svc);
     let tcp_server = (

src/main.rs

@@ -2,7 +2,6 @@ use std::{convert::Infallible, sync::Arc, time::Duration};
 
 use rama::{
     Layer as _, Service,
-    combinators::Either3,
     error::{ErrorContext as _, OpaqueError},
     http::{
         Body, HeaderName, HeaderValue, Request, Response,
@@ -12,29 +11,16 @@ use rama::{
             required_header::AddRequiredResponseHeadersLayer, set_header::SetResponseHeaderLayer,
             trace::TraceLayer,
         },
-        service::{fs::DirectoryServeMode, web::Router},
+        service::{fs::DirectoryServeMode, redirect::RedirectHttpToHttps, web::Router},
     },
     net::http::uri::UriMatchReplaceRule,
     utils::include_dir::include_dir,
 };
 
-#[derive(Debug, Clone, Copy)]
-pub enum ServiceMode {
-    Http,
-    HttpOnly,
-    Https,
-}
-
-pub async fn load_http_service(
-    mode: ServiceMode,
-) -> Result<impl Service<Request, Response = Response, Error = Infallible>, OpaqueError> {
-    let app = Router::new().dir_embed_with_serve_mode(
-        "/",
-        include_dir!("$CARGO_MANIFEST_DIR/src/service/legacy"),
-        DirectoryServeMode::AppendIndexHtml,
-    );
-
-    Ok((
+fn apply_common_middleware(
+    service: impl Service<Request, Response = Response, Error = Infallible>,
+) -> impl Service<Request, Response = Response, Error = Infallible> {
+    (
         MapResponseBodyLayer::new(Body::new),
         TraceLayer::new_for_http(),
         SetResponseHeaderLayer::if_not_present_typed(
@@ -46,21 +32,31 @@ pub async fn load_http_service(
             HeaderValue::from_static("fly.io"),
         ),
         cors::CorsLayer::permissive(),
-        UriMatchRedirectLayer::permanent(Arc::new(match mode {
-            ServiceMode::Https => Either3::A(
-                UriMatchReplaceRule::try_new("https://www.*", "https://$1")
-                    .context("create www to APEX redirect rule")?,
-            ),
-            ServiceMode::Http => Either3::B([
-                UriMatchReplaceRule::try_new("http://www.*", "https://$1")
-                    .context("create www to APEX + https upgrade redirect rule")?,
-                UriMatchReplaceRule::http_to_https(),
-            ]),
-            ServiceMode::HttpOnly => Either3::C(
-                UriMatchReplaceRule::try_new("http://www.*", "http://$1")
-                    .context("create www to APEX redirect rule")?,
-            ),
-        })),
     )
-        .into_layer(app))
+        .into_layer(service)
+}
+
+pub async fn load_http_service()
+-> Result<impl Service<Request, Response = Response, Error = Infallible>, OpaqueError> {
+    let app = RedirectHttpToHttps::new().with_match_replace_uri_rule(
+        UriMatchReplaceRule::try_new("http://www.*", "https://www.$1")
+            .context("create APEX to root uri replace rule")?,
+    );
+    Ok(apply_common_middleware(app))
+}
+
+pub async fn load_https_service()
+-> Result<impl Service<Request, Response = Response, Error = Infallible>, OpaqueError> {
+    let app = Router::new().dir_embed_with_serve_mode(
+        "/",
+        include_dir!("$CARGO_MANIFEST_DIR/src/service/legacy"),
+        DirectoryServeMode::AppendIndexHtml,
+    );
+
+    let middlewares = UriMatchRedirectLayer::permanent(Arc::new(
+        UriMatchReplaceRule::try_new("https://www.*", "https://$1")
+            .context("create www to APEX redirect rule")?,
+    ));
+
+    Ok(apply_common_middleware(middlewares.into_layer(app)))
 }