From 489c7d04c824339faf085418c48bd44c75a6da80 Mon Sep 17 00:00:00 2001
From: cyqsimon <28627918+cyqsimon@users.noreply.github.com>
Date: Thu, 23 Mar 2023 07:35:31 +0800
Subject: Create shared file utiity module

---
 src/config.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/config.rs')

diff --git a/src/config.rs b/src/config.rs
index 8976d35..d52b231 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -16,7 +16,7 @@ use rustls_pemfile as pemfile;
 use crate::{
     args::{CliArgs, MediaType},
     auth::RequiredAuth,
-    file_upload::sanitize_path,
+    file_utils::sanitize_path,
     renderer::ThemeSlug,
 };
 
-- 
cgit v1.2.3


From 2cd6debc0906b2487bcaf794630514ec3016152c Mon Sep 17 00:00:00 2001
From: cyqsimon <28627918+cyqsimon@users.noreply.github.com>
Date: Tue, 5 Sep 2023 16:32:20 +0800
Subject: Minor code style refactors

---
 src/config.rs | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'src/config.rs')

diff --git a/src/config.rs b/src/config.rs
index d52b231..50b7343 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -234,6 +234,21 @@ impl MiniserveConfig {
             })
         });
 
+        let allowed_upload_dir = args
+            .allowed_upload_dir
+            .as_ref()
+            .map(|v| {
+                v.iter()
+                    .map(|p| {
+                        sanitize_path(p, false)
+                            .map(|p| p.display().to_string().replace("\\", "/"))
+                            .ok_or(anyhow!("Illegal path {p:?}: upward traversal not allowed"))
+                    })
+                    .collect()
+            })
+            .transpose()?
+            .unwrap_or_default();
+
         Ok(MiniserveConfig {
             verbose: args.verbose,
             path: args.path.unwrap_or_else(|| PathBuf::from(".")),
@@ -254,18 +269,7 @@ impl MiniserveConfig {
             show_qrcode: args.qrcode,
             mkdir_enabled: args.mkdir_enabled,
             file_upload: args.allowed_upload_dir.is_some(),
-            allowed_upload_dir: args
-                .allowed_upload_dir
-                .unwrap_or_default()
-                .iter()
-                .map(|x| {
-                    sanitize_path(x, false)
-                        .unwrap()
-                        .to_str()
-                        .unwrap()
-                        .replace('\\', "/")
-                })
-                .collect(),
+            allowed_upload_dir,
             uploadable_media_type,
             tar_enabled: args.enable_tar,
             tar_gz_enabled: args.enable_tar_gz,
-- 
cgit v1.2.3


From e19370505ff8b428c9ba3daeba830c5785d95a0a Mon Sep 17 00:00:00 2001
From: cyqsimon <28627918+cyqsimon@users.noreply.github.com>
Date: Tue, 5 Sep 2023 18:13:51 +0800
Subject: Fix clippy complaints

---
 src/config.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/config.rs')

diff --git a/src/config.rs b/src/config.rs
index 50b7343..0959e81 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -241,7 +241,7 @@ impl MiniserveConfig {
                 v.iter()
                     .map(|p| {
                         sanitize_path(p, false)
-                            .map(|p| p.display().to_string().replace("\\", "/"))
+                            .map(|p| p.display().to_string().replace('\\', "/"))
                             .ok_or(anyhow!("Illegal path {p:?}: upward traversal not allowed"))
                     })
                     .collect()
-- 
cgit v1.2.3