Add very barebones middleware to remove HTML comments

endsong_web/Cargo.toml

@@ -18,3 +18,4 @@ urlencoding = "2.1"
 serde = "1.0"
 plotly = { version = "0.11", features = ["with-axum"] }
 chrono = "0.4"
+regex = "1.11"

endsong_web/src/layers.rs

@@ -0,0 +1,48 @@
+//! Contains custom [`tower`] [`tower::Layer`]s used here
+//! or functions used later with [`axum::middleware::from_fn`]
+
+use axum::{
+    body::{self, Body},
+    extract::Request,
+    http::header::CONTENT_TYPE,
+    middleware::Next,
+    response::Response,
+};
+use regex::Regex;
+use tracing::trace;
+
+/// Removes HTML comments from `text/html` responses
+///
+/// # Panics
+///
+/// I hope it doesn't panic.
+pub async fn remove_html_comments(request: Request, next: Next) -> Response {
+    trace!("removing HTML comments");
+    let response = next.run(request).await;
+    let headers = response.headers().clone();
+
+    let Some(content_type) = response.headers().get(CONTENT_TYPE) else {
+        return response;
+    };
+
+    // thanks chat gippity
+    if content_type.to_str().unwrap_or("").starts_with("text/html") {
+        if let Ok(body_bytes) = body::to_bytes(response.into_body(), usize::MAX).await {
+            let body_str = String::from_utf8_lossy(&body_bytes);
+            // Use regex to remove HTML comments
+            let re = Regex::new(r"<!--.*?-->").unwrap();
+            let cleaned_body = re.replace_all(&body_str, "").to_string();
+
+            // Rebuild the response with the cleaned body
+            let body = Body::from(cleaned_body);
+            let mut response = Response::builder();
+            let h = response.headers_mut().unwrap();
+            *h = headers;
+            response.body(body).unwrap()
+        } else {
+            Response::new("body".into())
+        }
+    } else {
+        response
+    }
+}

endsong_web/src/lib.rs

@@ -22,6 +22,7 @@ pub mod album;
 pub mod artist;
 pub mod artists;
 pub mod history;
+pub mod layers;
 pub mod song;
 pub mod r#static;
 

endsong_web/src/main.rs

@@ -17,9 +17,10 @@
 #![warn(clippy::allow_attributes_without_reason)]
 #![warn(clippy::allow_attributes)]
 
-use endsong_web::{album, artist, artists, history, r#static, song};
+use endsong_web::{album, artist, artists, history, layers, r#static, song};
 use endsong_web::{index, not_found, top_artists, AppState};
 
+use axum::middleware;
 use axum::{routing::get, routing::post, Router};
 use endsong::prelude::*;
 use tower_http::compression::CompressionLayer;
@@ -77,6 +78,7 @@ async fn main() {
         .route("/history/datepicker", post(history::date_picker))
         .with_state(state)
         .fallback(not_found)
+        .layer(middleware::from_fn(layers::remove_html_comments))
         .layer(compression);
 
     let listener = tokio::net::TcpListener::bind("127.0.0.1:3000")