fix: use approach from @Benjamin-L

Author: LeoBorai

Cargo.lock

@@ -42,6 +42,7 @@ hyper = { version = "0.14.20", features = ["http1", "server", "stream", "tcp"] }
 hyper-rustls = { version = "0.23.0", features = ["webpki-roots"] }
 local-ip-address = "0.4.5"
 mime_guess = "2.0.4"
+percent-encoding = "2.1.0"
 rustls = "0.20.6"
 rustls-pemfile = "1.0.0"
 serde = { version = "1.0.139", features = ["derive"] }

Cargo.toml

@@ -17,6 +17,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use crate::utils::fmt::{format_bytes, format_system_date};
+use crate::utils::url_encode::{decode_uri, encode_uri};
 
 use self::directory_entry::{DirectoryEntry, DirectoryIndex};
 use self::http_utils::{make_http_file_response, CacheControlDirective};
@@ -64,9 +65,8 @@ impl<'a> FileServer {
 
         if let Some(path_and_query) = uri_parts.path_and_query {
             let path = path_and_query.path();
-            let path = path.replace("%20", " ");
 
-            return Ok(PathBuf::from_str(&path)?);
+            return decode_uri(path);
         }
 
         Ok(PathBuf::from_str("/")?)
@@ -199,8 +199,9 @@ impl<'a> FileServer {
     fn make_dir_entry_link(root_dir: &Path, entry_path: &Path) -> String {
         let root_dir = root_dir.to_str().unwrap();
         let entry_path = entry_path.to_str().unwrap();
+        let path_buf = PathBuf::from_str(&entry_path[root_dir.len()..]).unwrap();
 
-        (&entry_path[root_dir.len()..]).replace(" ", "%20")
+        encode_uri(&path_buf)
     }
 }
 

src/addon/file_server/mod.rs

@@ -1,3 +1,4 @@
 pub mod error;
 pub mod fmt;
 pub mod signal;
+pub mod url_encode;

src/utils/mod.rs

@@ -0,0 +1,96 @@
+use anyhow::{Error, Result};
+use percent_encoding::{
+    percent_decode, percent_encode, utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC,
+};
+use std::os::unix::ffi::OsStrExt;
+use std::path::PathBuf;
+use std::str::FromStr;
+
+pub const PERCENT_ENCODE_SET: &AsciiSet = &NON_ALPHANUMERIC
+    .remove(b'-')
+    .remove(b'_')
+    .remove(b'.')
+    .remove(b'~');
+
+pub fn encode_uri(file_path: &PathBuf) -> String {
+    file_path
+        .iter()
+        .filter(|c| c.to_str().unwrap().ne("/"))
+        .flat_map(|component| {
+            let segment = match component.to_str() {
+                Some(component) => utf8_percent_encode(component, PERCENT_ENCODE_SET),
+                None => {
+                    let bytes = {
+                        #[cfg(windows)]
+                        {
+                            let mut bytes = Vec::with_capacity(component.len() * 2);
+
+                            for wc in component.encode_wide() {
+                                let wc = wc.to_be_bytes();
+
+                                bytes.push(wc[0]);
+                                bytes.push(wc[1]);
+                            }
+
+                            bytes
+                        }
+
+                        #[cfg(not(windows))]
+                        component.as_bytes()
+                    };
+
+                    percent_encode(&bytes, PERCENT_ENCODE_SET)
+                }
+            };
+
+            std::iter::once("/").chain(segment)
+        })
+        .collect::<String>()
+}
+
+pub fn decode_uri(file_path: &str) -> Result<PathBuf> {
+    let path_string = file_path
+        .split('/')
+        .map(|encoded_part| {
+            let decode = percent_decode(encoded_part.as_bytes());
+            let decode = decode.decode_utf8_lossy();
+
+            decode.to_string()
+        })
+        .collect::<Vec<String>>()
+        .join("/");
+
+    PathBuf::from_str(&path_string).map_err(|err| Error::msg(err.to_string()))
+}
+
+#[cfg(test)]
+mod tests {
+    use std::path::PathBuf;
+    use std::str::FromStr;
+
+    use super::{decode_uri, encode_uri};
+
+    #[test]
+    fn encodes_uri() {
+        let file_path = "/these are important files/do_not_delete/file name.txt";
+        let file_path = PathBuf::from_str(file_path).unwrap();
+        let file_path = encode_uri(&file_path);
+
+        assert_eq!(
+            file_path,
+            "/these%20are%20important%20files/do_not_delete/file%20name.txt"
+        );
+    }
+
+    #[test]
+    fn decodes_uri() {
+        let file_path = "these%20are%20important%20files/do_not_delete/file%20name.txt";
+        let file_path = decode_uri(&file_path).unwrap();
+        let file_path = file_path.to_str().unwrap();
+
+        assert_eq!(
+            file_path,
+            "these are important files/do_not_delete/file name.txt"
+        );
+    }
+}