feat: add option --allow-search (#62)

diff --git a/README.md b/README.md
index 9d34b586ce398d37832a0fb06622675d6a5daf17..9043ed57d7bebd2f4ca5447786c18c2881f47ec6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -57,6 +57,7 @@ OPTIONS:
     -A, --allow-all              Allow all operations
         --allow-upload           Allow upload files/folders
         --allow-delete           Allow delete files/folders
+        --allow-search           Allow search files/folders
         --allow-symlink          Allow symlink to files/folders outside root directory
         --enable-cors            Enable CORS, sets `Access-Control-Allow-Origin: *`
         --render-index           Serve index.html when requesting a directory, returns 404 if not found index.html

diff --git a/assets/index.css b/assets/index.css
index 4cbf7efc5281af980513414bbbd1c4d68ff7ec32..ab0e96c3a8e34b00b0bf22432614693bb508e6fd 100644 (file)
--- a/assets/index.css
+++ b/assets/index.css
@@ -10,7 +10,7 @@ body {
 }
 
 .hidden {
-  display: none;
+  display: none !important;
 }
 
 .head {

diff --git a/assets/index.html b/assets/index.html
index 8cabff5ed8d49775db3446e63d15a946d113b2aa..d94c568445cea21445048a9479e4a29ed082bb9f 100644 (file)
--- a/assets/index.html
+++ b/assets/index.html
@@ -22,7 +22,7 @@
         <input type="file" id="file" name="file" multiple>
       </div>
     </div>
-    <form class="searchbar">
+    <form class="searchbar hidden">
       <div class="icon">
         <svg width="16" height="16" fill="currentColor" viewBox="0 0 16 16"><path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"/></svg>
       </div>

diff --git a/assets/index.js b/assets/index.js
index e09671cb1998463c5038d6afcc106b54ae73e74b..df92c7c73c76c67960ff926495132717fe738eed 100644 (file)
--- a/assets/index.js
+++ b/assets/index.js
@@ -339,10 +339,14 @@ function ready() {
   $uploadersTable = document.querySelector(".uploaders-table");
   $emptyFolder = document.querySelector(".empty-folder");
 
-  if (params.q) {
-    document.getElementById('search').value = params.q;
+  if (DATA.allow_search) {
+    document.querySelector(".searchbar").classList.remove("hidden");
+    if (params.q) {
+      document.getElementById('search').value = params.q;
+    }
   }
 
+
   addBreadcrumb(DATA.href, DATA.uri_prefix);
   if (Array.isArray(DATA.paths)) {
     const len = DATA.paths.length;

diff --git a/src/args.rs b/src/args.rs
index e43d349801fc5b983c6f968255bcae5d3401177b..425311202b3b7699b267572e77491990feae5d32 100644 (file)
--- a/src/args.rs
+++ b/src/args.rs
@@ -81,6 +81,11 @@ fn app() -> Command<'static> {
                 .long("allow-delete")
                 .help("Allow delete files/folders"),
         )
+        .arg(
+            Arg::new("allow-search")
+                .long("allow-search")
+                .help("Allow search files/folders"),
+        )
         .arg(
             Arg::new("allow-symlink")
                 .long("allow-symlink")
@@ -136,6 +141,7 @@ pub struct Args {
     pub auth: AccessControl,
     pub allow_upload: bool,
     pub allow_delete: bool,
+    pub allow_search: bool,
     pub allow_symlink: bool,
     pub render_index: bool,
     pub render_spa: bool,
@@ -179,6 +185,7 @@ impl Args {
         let auth = AccessControl::new(&auth, &uri_prefix)?;
         let allow_upload = matches.is_present("allow-all") || matches.is_present("allow-upload");
         let allow_delete = matches.is_present("allow-all") || matches.is_present("allow-delete");
+        let allow_search = matches.is_present("allow-all") || matches.is_present("allow-search");
         let allow_symlink = matches.is_present("allow-all") || matches.is_present("allow-symlink");
         let render_index = matches.is_present("render-index");
         let render_try_index = matches.is_present("render-try-index");
@@ -204,6 +211,7 @@ impl Args {
             enable_cors,
             allow_delete,
             allow_upload,
+            allow_search,
             allow_symlink,
             render_index,
             render_try_index,

diff --git a/src/server.rs b/src/server.rs
index a2d3d2f23f52ac7a685c12ab737d72079f6544e7..06cd0f8d2e24edee1ac6303bedb98bc0085de55a 100644 (file)
--- a/src/server.rs
+++ b/src/server.rs
@@ -133,6 +133,7 @@ impl Server {
 
         let allow_upload = self.args.allow_upload;
         let allow_delete = self.args.allow_delete;
+        let allow_search = self.args.allow_search;
         let render_index = self.args.render_index;
         let render_spa = self.args.render_spa;
         let render_try_index = self.args.render_try_index;
@@ -152,8 +153,8 @@ impl Server {
                             .await?;
                     } else if query == "zip" {
                         self.handle_zip_dir(path, head_only, &mut res).await?;
-                    } else if let Some(q) = query.strip_prefix("q=") {
-                        let q = decode_uri(q).unwrap_or_default();
+                    } else if allow_search && query.starts_with("q=") {
+                        let q = decode_uri(&query[2..]).unwrap_or_default();
                         self.handle_query_dir(path, &q, head_only, &mut res).await?;
                     } else {
                         self.handle_ls_dir(path, true, head_only, &mut res).await?;
@@ -696,6 +697,7 @@ impl Server {
             paths,
             allow_upload: self.args.allow_upload,
             allow_delete: self.args.allow_delete,
+            allow_search: self.args.allow_search,
             dir_exists: exist,
         };
         let data = serde_json::to_string(&data).unwrap();
@@ -824,6 +826,7 @@ struct IndexData {
     paths: Vec<PathItem>,
     allow_upload: bool,
     allow_delete: bool,
+    allow_search: bool,
     dir_exists: bool,
 }
 

diff --git a/tests/allow.rs b/tests/allow.rs
index 86756050e202ecd276d0f13774552c7c738f6182..6a1f4cdb922982717b0f71940f2913b291634b1e 100644 (file)
--- a/tests/allow.rs
+++ b/tests/allow.rs
@@ -59,3 +59,15 @@ fn allow_upload_delete_can_override(#[with(&["-A"])] server: TestServer) -> Resu
     assert_eq!(resp.status(), 201);
     Ok(())
 }
+
+#[rstest]
+fn allow_search(#[with(&["--allow-search"])] server: TestServer) -> Result<(), Error> {
+    let resp = reqwest::blocking::get(format!("{}?q={}", server.url(), "test.html"))?;
+    assert_eq!(resp.status(), 200);
+    let paths = utils::retrive_index_paths(&resp.text()?);
+    assert!(!paths.is_empty());
+    for p in paths {
+        assert!(p.contains(&"test.html"));
+    }
+    Ok(())
+}

diff --git a/tests/http.rs b/tests/http.rs
index 0e5a430e2ed8cd12663ec8fb697b3d75d34d7512..38253fe4c2bcca61f2407d0ea30edd3e10c08125 100644 (file)
--- a/tests/http.rs
+++ b/tests/http.rs
@@ -63,7 +63,7 @@ fn head_dir_zip(server: TestServer) -> Result<(), Error> {
 }
 
 #[rstest]
-fn get_dir_search(server: TestServer) -> Result<(), Error> {
+fn get_dir_search(#[with(&["-A"])] server: TestServer) -> Result<(), Error> {
     let resp = reqwest::blocking::get(format!("{}?q={}", server.url(), "test.html"))?;
     assert_eq!(resp.status(), 200);
     let paths = utils::retrive_index_paths(&resp.text()?);
@@ -75,7 +75,7 @@ fn get_dir_search(server: TestServer) -> Result<(), Error> {
 }
 
 #[rstest]
-fn get_dir_search2(server: TestServer) -> Result<(), Error> {
+fn get_dir_search2(#[with(&["-A"])] server: TestServer) -> Result<(), Error> {
     let resp = reqwest::blocking::get(format!("{}?q={}", server.url(), "😀.data"))?;
     assert_eq!(resp.status(), 200);
     let paths = utils::retrive_index_paths(&resp.text()?);
@@ -87,7 +87,7 @@ fn get_dir_search2(server: TestServer) -> Result<(), Error> {
 }
 
 #[rstest]
-fn head_dir_search(server: TestServer) -> Result<(), Error> {
+fn head_dir_search(#[with(&["-A"])] server: TestServer) -> Result<(), Error> {
     let resp = fetch!(b"HEAD", format!("{}?q={}", server.url(), "test.html")).send()?;
     assert_eq!(resp.status(), 200);
     assert_eq!(