From 22299ccd501324fc348788c65e67e2080c705547 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Tue, 8 Jul 2025 05:15:47 +0000 Subject: feat(router): Add missing trailing slash corrector --- src/router.rs | 26 +++++++++++++++++++------- src/router_option.rs | 6 +++++- 2 files changed, 24 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/router.rs b/src/router.rs index a82ea1e..461d698 100644 --- a/src/router.rs +++ b/src/router.rs @@ -423,13 +423,25 @@ impl Router { let mut path = url.path().to_string(); let mut route = self.routes.at(&path); - if route.is_err() - && self.options.contains(&RouterOption::TrimTrailingSlashes) - && path.ends_with('/') - && path != "/" - { - path = path.trim_end_matches('/').to_string(); - route = self.routes.at(&path); + if route.is_err() { + if self.options.contains(&RouterOption::TrimTrailingSlashes) + && path.ends_with('/') + && path != "/" + { + path = path.trim_end_matches('/').to_string(); + route = self.routes.at(&path); + } else if self + .options + .contains(&RouterOption::AddMissingTrailingSlash) + && !path.ends_with('/') + { + let path_with_slash = format!("{path}/"); + + if self.routes.at(&path_with_slash).is_ok() { + path = path_with_slash; + route = self.routes.at(&path); + } + } } let peer_certificate = stream.ssl().peer_certificate(); diff --git a/src/router_option.rs b/src/router_option.rs index c99f3ab..2672a42 100644 --- a/src/router_option.rs +++ b/src/router_option.rs @@ -1,6 +1,10 @@ /// Options that can be set for the `Router` #[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)] pub enum RouterOption { - /// Trim trailing slashes from the URL path + /// Trim trailing slashes from the URL path if it is present and a route + /// match exists TrimTrailingSlashes, + /// Add a trailing slash to the URL path if it is missing and a route + /// match exists + AddMissingTrailingSlash, } -- cgit v1.2.3