Merge pull request #1329 from dyc3/disable-indexing

add `--disable-indexing` cli flag to completely disable directory indexing

4 files changed, 20 insertions, 1 deletions

diff --git a/src/args.rs b/src/args.rs
index 7e3668b..3fb0ede 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -293,6 +293,13 @@ pub struct CliArgs {
     /// Enable README.md rendering in directories
     #[arg(long, env = "MINISERVE_README")]
     pub readme: bool,
+
+    /// Disable indexing
+    ///
+    /// This will prevent directory listings from being generated
+    /// and return an error instead.
+    #[arg(short = 'I', long, env = "MINISERVE_DISABLE_INDEXING")]
+    pub disable_indexing: bool,
 }
 
 /// Checks whether an interface is valid, i.e. it can be parsed into an IP address
diff --git a/src/config.rs b/src/config.rs
index 43414b2..3643502 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -146,6 +146,9 @@ pub struct MiniserveConfig {
     /// If enabled, render the readme from the current directory
     pub readme: bool,
 
+    /// If enabled, indexing is disabled.
+    pub disable_indexing: bool,
+
     /// If set, use provided rustls config for TLS
     #[cfg(feature = "tls")]
     pub tls_rustls_config: Option<rustls::ServerConfig>,
@@ -311,6 +314,7 @@ impl MiniserveConfig {
             hide_theme_selector: args.hide_theme_selector,
             show_wget_footer: args.show_wget_footer,
             readme: args.readme,
+            disable_indexing: args.disable_indexing,
             tls_rustls_config: tls_rustls_server_config,
             compress_response: args.compress_response,
         })
diff --git a/src/listing.rs b/src/listing.rs
index 855abef..64cdaca 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -161,6 +161,14 @@ pub fn directory_listing(
     let current_user: Option<&CurrentUser> = extensions.get::<CurrentUser>();
 
     let conf = req.app_data::<crate::MiniserveConfig>().unwrap();
+    if conf.disable_indexing {
+        return Ok(ServiceResponse::new(
+            req.clone(),
+            HttpResponse::NotFound()
+                .content_type(mime::TEXT_PLAIN_UTF_8)
+                .body("File not found."),
+        ));
+    }
     let serve_path = req.path();
 
     let base = Path::new(serve_path);
diff --git a/src/renderer.rs b/src/renderer.rs
index 3b62704..b691bca 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -687,7 +687,7 @@ pub fn render_error(
                         p { (error) }
                     }
                     // WARN don't expose random route!
-                    @if conf.route_prefix.is_empty() {
+                    @if conf.route_prefix.is_empty() && !conf.disable_indexing {
                         div.error-nav {
                             a.error-back href=(return_address) {
                                 "Go back to file listing"