fix: percent decode path segments

tower-http/Cargo.toml

@@ -21,6 +21,7 @@ http-body = "0.4.1"
 pin-project = "1"
 tower-layer = "0.3"
 tower-service = "0.3"
+percent-encoding = "2.1.0"
 
 # optional dependencies
 async-compression = { version = "0.3", optional = true, features = ["tokio"] }

tower-http/src/services/fs/serve_dir.rs

@@ -12,6 +12,7 @@ use std::{
 };
 use tokio::fs::File;
 use tower_service::Service;
+use percent_encoding::percent_decode;
 
 /// Service that serves files from a given directory and all its sub directories.
 ///
@@ -66,6 +67,9 @@ impl<ReqBody> Service<Request<ReqBody>> for ServeDir {
         // build and validate the path
         let path = req.uri().path();
         let path = path.trim_start_matches('/');
+        let path_decoded = percent_decode(path.as_ref()).decode_utf8_lossy().to_string();
+        let path = path_decoded.as_str();
+
         let mut full_path = self.base.clone();
         for seg in path.split('/') {
             if seg.starts_with("..") || seg.contains('\\') {
@@ -327,4 +331,29 @@ mod tests {
         let bytes = hyper::body::to_bytes(body).await.unwrap();
         String::from_utf8(bytes.to_vec()).unwrap()
     }
+
+    #[tokio::test]
+    async fn access_cjk_percent_encoded_uri_path() {
+        let cjk_filename = "你好世界.txt";
+        // percent encoding present of 你好世界.txt
+        let cjk_filename_encoded = "%E4%BD%A0%E5%A5%BD%E4%B8%96%E7%95%8C.txt";
+
+        let tmp_dir = std::env::temp_dir();
+        let tmp_filename = std::path::Path::new(tmp_dir.as_path()).join(cjk_filename);
+        let file_created = tokio::fs::File::create(&tmp_filename).await;
+        assert_eq!(file_created.is_ok(), true);
+
+        let svc = ServeDir::new(tmp_dir.clone());
+
+        let req = Request::builder()
+            .uri("/".to_string() + cjk_filename_encoded)
+            .body(Body::empty())
+            .unwrap();
+        let res = svc.oneshot(req).await.unwrap();
+
+        assert_eq!(res.status(), StatusCode::OK);
+        assert_eq!(res.headers()["content-type"], "text/plain");
+        let file_removed = tokio::fs::remove_file(&tmp_filename).await;
+        assert_eq!(file_removed.is_ok(), true);
+    }
 }