middleware::log_request: Move OriginalPath code into NormalizePath middleware

Author: Turbo87

src/middleware/log_request.rs

@@ -7,6 +7,7 @@ use crate::util::request_header;
 use conduit::{header, RequestExt, StatusCode};
 use conduit_cookie::RequestSession;
 
+use crate::middleware::normalize_path::OriginalPath;
 use crate::middleware::request_timing::ResponseTime;
 use std::fmt::{self, Display, Formatter};
 
@@ -15,15 +16,7 @@ const SLOW_REQUEST_THRESHOLD_MS: u64 = 1000;
 #[derive(Default)]
 pub(super) struct LogRequests();
 
-struct OriginalPath(String);
-
 impl Middleware for LogRequests {
-    fn before(&self, req: &mut dyn RequestExt) -> BeforeResult {
-        let path = OriginalPath(req.path().to_string());
-        req.mut_extensions().insert(path);
-        Ok(())
-    }
-
     fn after(&self, req: &mut dyn RequestExt, res: AfterResult) -> AfterResult {
         let response_time = req.extensions().find::<ResponseTime>().unwrap();
 

src/middleware/normalize_path.rs

@@ -4,12 +4,18 @@ use super::prelude::*;
 
 use std::path::{Component, Path, PathBuf};
 
+pub struct OriginalPath(pub String);
+
 pub struct NormalizePath;
 
 impl Middleware for NormalizePath {
     fn before(&self, req: &mut dyn RequestExt) -> BeforeResult {
         let path = req.path();
+        let original_path = OriginalPath(path.to_string());
+
         if !(path.contains("//") || path.contains("/.")) {
+            req.mut_extensions().insert(original_path);
+
             // Avoid allocations if rewriting is unnecessary
             return Ok(());
         }
@@ -40,6 +46,7 @@ impl Middleware for NormalizePath {
             .to_string(); // non-Unicode is replaced with U+FFFD REPLACEMENT CHARACTER
 
         add_custom_metadata(req, "normalized_path", path.clone());
+        req.mut_extensions().insert(original_path);
         *req.path_mut() = path;
         Ok(())
     }