Fix panic in path::{peek, tail, full} when URI is in authority or ast…

…erisk form
seanmonstar · May 19, 2020 · 68e26af · 68e26af
1 parent c983a2d
commit 68e26af
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/filters/path.rs b/src/filters/path.rs
@@ -465,8 +465,8 @@ fn path_and_query(route: &Route) -> PathAndQuery {
     route
         .uri()
         .path_and_query()
-        .expect("server URIs should always have path_and_query")
-        .clone()
+        .cloned()
+        .unwrap_or_else(|| PathAndQuery::from_static(""))
 }
 
 /// Convenient way to chain multiple path filters together.

diff --git a/tests/path.rs b/tests/path.rs
@@ -303,6 +303,14 @@ async fn full_path() {
     // does not modify matching
     let m = full_path.and(foo).and(bar);
     assert!(warp::test::request().path("/foo/bar").matches(&m).await);
+
+    // doesn't panic on authority-form
+    let ex = warp::test::request()
+        .path("localhost:1234")
+        .filter(&full_path)
+        .await
+        .unwrap();
+    assert_eq!(ex.as_str(), "/");
 }
 
 #[tokio::test]