aboutsummaryrefslogtreecommitdiffstats
path: root/src/listing.rs
diff options
context:
space:
mode:
authormarawan ragab <marawan31@gmail.com>2020-05-10 21:14:51 +0000
committermarawan ragab <marawan31@gmail.com>2020-05-10 21:14:51 +0000
commit848557762c1c4eed2ba16713ead97308d1841220 (patch)
tree9514661da1dbcf2169077044d995af89673a1a7c /src/listing.rs
parentsmall improvment to buffer usage (diff)
downloadminiserve-848557762c1c4eed2ba16713ead97308d1841220.tar.gz
miniserve-848557762c1c4eed2ba16713ead97308d1841220.zip
make sure archiving is opt-in
Diffstat (limited to 'src/listing.rs')
-rw-r--r--src/listing.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/listing.rs b/src/listing.rs
index d28824c..45b3732 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -136,7 +136,8 @@ pub fn directory_listing<S>(
random_route: Option<String>,
default_color_scheme: ColorScheme,
upload_route: String,
- archives_enabled: bool,
+ tar_enabled: bool,
+ zip_enabled: bool,
) -> Result<HttpResponse, io::Error> {
let serve_path = req.path();
@@ -250,7 +251,7 @@ pub fn directory_listing<S>(
let color_scheme = query_params.theme.unwrap_or(default_color_scheme);
if let Some(compression_method) = query_params.download {
- if !archives_enabled {
+ if !compression_method.is_enabled(tar_enabled, zip_enabled) {
return Ok(HttpResponse::Forbidden()
.content_type("text/html; charset=utf-8")
.body(
@@ -332,7 +333,8 @@ pub fn directory_listing<S>(
file_upload,
&upload_route,
&current_dir.display().to_string(),
- archives_enabled,
+ tar_enabled,
+ zip_enabled,
)
.into_string(),
))