From 8d29fac1244aa32647e4ffc85ac682fd72decc80 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Fri, 26 Feb 2021 14:56:43 +0600
Subject: [PATCH] partial matches keep garbage in segments

---
 ntex-router/CHANGES.txt     |  4 ++++
 ntex-router/Cargo.toml      |  2 +-
 ntex-router/src/lib.rs      |  2 +-
 ntex-router/src/path.rs     |  1 +
 ntex-router/src/resource.rs | 14 +++++++++++++
 ntex-router/src/tree.rs     | 40 +++++++++++++++++++++++++++++++++----
 6 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/ntex-router/CHANGES.txt b/ntex-router/CHANGES.txt
index 111d9a6f..07f98d71 100644
--- a/ntex-router/CHANGES.txt
+++ b/ntex-router/CHANGES.txt
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.4.1] - 2021-02-26
+
+* Fix: partial matches keep garbage in segments
+
 ## [0.4.0] - 2021-02-23
 
 * Upgrade to bytestring 1.0
diff --git a/ntex-router/Cargo.toml b/ntex-router/Cargo.toml
index afb1fbe1..721d254d 100644
--- a/ntex-router/Cargo.toml
+++ b/ntex-router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-router"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Path router"
 keywords = ["ntex"]
diff --git a/ntex-router/src/lib.rs b/ntex-router/src/lib.rs
index f788437c..b8786d1a 100644
--- a/ntex-router/src/lib.rs
+++ b/ntex-router/src/lib.rs
@@ -9,7 +9,7 @@ mod router;
 mod tree;
 
 pub use self::de::PathDeserializer;
-pub use self::path::Path;
+pub use self::path::{Path, PathIter};
 pub use self::resource::ResourceDef;
 pub use self::router::{ResourceInfo, Router, RouterBuilder};
 
diff --git a/ntex-router/src/path.rs b/ntex-router/src/path.rs
index 2dc72b48..56ea1dcd 100644
--- a/ntex-router/src/path.rs
+++ b/ntex-router/src/path.rs
@@ -170,6 +170,7 @@ impl<T: ResourcePath> Path<T> {
     }
 }
 
+/// Iterator to items in parameter container
 #[derive(Debug)]
 pub struct PathIter<'a, T> {
     idx: usize,
diff --git a/ntex-router/src/resource.rs b/ntex-router/src/resource.rs
index f5166842..cf790899 100644
--- a/ntex-router/src/resource.rs
+++ b/ntex-router/src/resource.rs
@@ -992,4 +992,18 @@ mod tests {
         assert_eq!(tree.find(&mut Path::new("/test")), Some(4));
         assert_eq!(tree.find(&mut Path::new("/test/index.html")), Some(4));
     }
+
+    #[test]
+    fn test_with_some_match() {
+        let mut tree = Tree::new(&ResourceDef::new("/p/{tp}/{id}/{r}"), 1);
+        tree.insert(&ResourceDef::new("/p/ih/{tp}/d/{id}/sid/{r}/r/{s}"), 3);
+
+        let mut p = Path::new("/p/ih/def/d/abc/sid/5bddc58f/r/srv");
+        assert_eq!(tree.find(&mut p), Some(3));
+        assert_eq!(p.get("tp"), Some("def"));
+        assert_eq!(p.get("id"), Some("abc"));
+        assert_eq!(p.get("r"), Some("5bddc58f"));
+        assert_eq!(p.get("s"), Some("srv"));
+        assert_eq!(p.len(), 4);
+    }
 }
diff --git a/ntex-router/src/tree.rs b/ntex-router/src/tree.rs
index 610f97f7..0c4ea398 100644
--- a/ntex-router/src/tree.rs
+++ b/ntex-router/src/tree.rs
@@ -255,7 +255,7 @@ impl Tree {
                 .children
                 .iter()
                 .map(|x| {
-                    x.find_inner2(
+                    x.find_inner_wrapped(
                         path,
                         resource,
                         check,
@@ -289,7 +289,7 @@ impl Tree {
             path
         };
 
-        if let Some((val, skip)) = self.find_inner2(
+        if let Some((val, skip)) = self.find_inner_wrapped(
             path,
             resource,
             check,
@@ -307,6 +307,38 @@ impl Tree {
         }
     }
 
+    #[allow(clippy::too_many_arguments)]
+    fn find_inner_wrapped<T, R, F>(
+        &self,
+        path: &str,
+        resource: &R,
+        check: &F,
+        skip: usize,
+        segments: &mut Vec<(&'static str, PathItem)>,
+        insensitive: bool,
+        base_skip: isize,
+    ) -> Option<(usize, usize)>
+    where
+        T: ResourcePath,
+        R: Resource<T>,
+        F: Fn(usize, &R) -> bool,
+    {
+        let len = segments.len();
+        let res = self.find_inner2(
+            path,
+            resource,
+            check,
+            skip,
+            segments,
+            insensitive,
+            base_skip,
+        );
+        if res.is_none() {
+            segments.truncate(len);
+        }
+        res
+    }
+
     #[allow(clippy::too_many_arguments)]
     fn find_inner2<T, R, F>(
         &self,
@@ -477,7 +509,7 @@ impl Tree {
                                             .children
                                             .iter()
                                             .map(|x| {
-                                                x.find_inner2(
+                                                x.find_inner_wrapped(
                                                     p,
                                                     resource,
                                                     check,
@@ -517,7 +549,7 @@ impl Tree {
                         .children
                         .iter()
                         .map(|x| {
-                            x.find_inner2(
+                            x.find_inner_wrapped(
                                 path,
                                 resource,
                                 check,