Properly clone the request for ServeDir's fallback (#258)

tower-rs · Apr 28, 2022 · 241a52f · 241a52f
1 parent 8f4d27c
commit 241a52f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/tower-http/src/services/fs/serve_dir/mod.rs b/tower-http/src/services/fs/serve_dir/mod.rs
@@ -290,17 +290,17 @@ where
         };
 
         let fallback_and_request = self.fallback.as_mut().map(|fallback| {
-            let mut req = Request::new(body);
-            *req.method_mut() = req.method().clone();
-            *req.uri_mut() = req.uri().clone();
-            *req.headers_mut() = req.headers().clone();
-            *req.extensions_mut() = extensions;
+            let mut fallback_req = Request::new(body);
+            *fallback_req.method_mut() = req.method().clone();
+            *fallback_req.uri_mut() = req.uri().clone();
+            *fallback_req.headers_mut() = req.headers().clone();
+            *fallback_req.extensions_mut() = extensions;
 
             // get the ready fallback and leave a non-ready clone in its place
             let clone = fallback.clone();
             let fallback = std::mem::replace(fallback, clone);
 
-            (fallback, req)
+            (fallback, fallback_req)
         });
 
         let buf_chunk_size = self.buf_chunk_size;

diff --git a/tower-http/src/services/fs/serve_dir/tests.rs b/tower-http/src/services/fs/serve_dir/tests.rs
@@ -585,8 +585,11 @@ async fn last_modified() {
 
 #[tokio::test]
 async fn with_fallback_svc() {
-    async fn fallback<B>(_: Request<B>) -> io::Result<Response<Body>> {
-        Ok(Response::new(Body::from("from fallback")))
+    async fn fallback<B>(req: Request<B>) -> io::Result<Response<Body>> {
+        Ok(Response::new(Body::from(format!(
+            "from fallback {}",
+            req.uri().path()
+        ))))
     }
 
     let svc = ServeDir::new("..").fallback(tower::service_fn(fallback));
@@ -600,7 +603,7 @@ async fn with_fallback_svc() {
     assert_eq!(res.status(), StatusCode::OK);
 
     let body = body_into_text(res.into_body()).await;
-    assert_eq!(body, "from fallback");
+    assert_eq!(body, "from fallback /doesnt-exist");
 }
 
 #[tokio::test]