From e5b713b04a5bb79d5857eebc56489ac761e5eb59 Mon Sep 17 00:00:00 2001
From: Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>
Date: Wed, 26 May 2021 12:42:29 +0300
Subject: [PATCH] files: Fix `redirect_to_slash_directory()` when used with
 `show_files_listing()` (#2225)

---
 actix-files/CHANGES.md     |  2 ++
 actix-files/src/lib.rs     | 15 ++++++++++++++-
 actix-files/src/service.rs | 23 +++++++++++++----------
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/actix-files/CHANGES.md b/actix-files/CHANGES.md
index 0586a2fd..12b70c13 100644
--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@@ -3,9 +3,11 @@
 ## Unreleased - 2021-xx-xx
 * `NamedFile` now implements `ServiceFactory` and `HttpServiceFactory` making it much more useful in routing. For example, it can be used directly as a default service. [#2135]
 * For symbolic links, `Content-Disposition` header no longer shows the filename of the original file. [#2156]
+* `Files::redirect_to_slash_directory()` now works as expected when used with `Files::show_files_listing()`. [#2225]
 
 [#2135]: https://github.com/actix/actix-web/pull/2135
 [#2156]: https://github.com/actix/actix-web/pull/2156
+[#2225]: https://github.com/actix/actix-web/pull/2225
 
 
 ## 0.6.0-beta.4 - 2021-04-02
diff --git a/actix-files/src/lib.rs b/actix-files/src/lib.rs
index 0384ff2b..aa5960b5 100644
--- a/actix-files/src/lib.rs
+++ b/actix-files/src/lib.rs
@@ -632,7 +632,7 @@ mod tests {
 
     #[actix_rt::test]
     async fn test_redirect_to_slash_directory() {
-        // should not redirect if no index
+        // should not redirect if no index and files listing is disabled
         let srv = test::init_service(
             App::new().service(Files::new("/", ".").redirect_to_slash_directory()),
         )
@@ -654,6 +654,19 @@ mod tests {
         let resp = test::call_service(&srv, req).await;
         assert_eq!(resp.status(), StatusCode::FOUND);
 
+        // should redirect if files listing is enabled
+        let srv = test::init_service(
+            App::new().service(
+                Files::new("/", ".")
+                    .show_files_listing()
+                    .redirect_to_slash_directory(),
+            ),
+        )
+        .await;
+        let req = TestRequest::with_uri("/tests").to_request();
+        let resp = test::call_service(&srv, req).await;
+        assert_eq!(resp.status(), StatusCode::FOUND);
+
         // should not redirect if the path is wrong
         let req = TestRequest::with_uri("/not_existing").to_request();
         let resp = test::call_service(&srv, req).await;
diff --git a/actix-files/src/service.rs b/actix-files/src/service.rs
index 31e1434b..831115dc 100644
--- a/actix-files/src/service.rs
+++ b/actix-files/src/service.rs
@@ -89,17 +89,20 @@ impl Service<ServiceRequest> for FilesService {
         }
 
         if path.is_dir() {
+            if self.redirect_to_slash
+                && !req.path().ends_with('/')
+                && (self.index.is_some() || self.show_index)
+            {
+                let redirect_to = format!("{}/", req.path());
+
+                return Box::pin(ok(req.into_response(
+                    HttpResponse::Found()
+                        .insert_header((header::LOCATION, redirect_to))
+                        .finish(),
+                )));
+            }
+
             if let Some(ref redir_index) = self.index {
-                if self.redirect_to_slash && !req.path().ends_with('/') {
-                    let redirect_to = format!("{}/", req.path());
-
-                    return Box::pin(ok(req.into_response(
-                        HttpResponse::Found()
-                            .insert_header((header::LOCATION, redirect_to))
-                            .finish(),
-                    )));
-                }
-
                 let path = path.join(redir_index);
 
                 match NamedFile::open(path) {