Merge 3a0e22b9f8 into 9021b82b91

actix-files/CHANGES.md

@@ -3,6 +3,9 @@
 ## Unreleased
 
 - Minimum supported Rust version (MSRV) is now 1.88.
+- `PathBufWrap` & `UriSegmentError` made public. [#3694]
+
+[#3694]: https://github.com/actix/actix-web/pull/3699
 
 ## 0.6.9
 

actix-files/src/files.rs

@@ -38,7 +38,7 @@ use crate::{
 pub struct Files {
     mount_path: String,
     directory: PathBuf,
-    index: Option<String>,
+    indexes: Vec<String>,
     show_index: bool,
     redirect_to_slash: bool,
     with_permanent_redirect: bool,
@@ -63,7 +63,7 @@ impl Clone for Files {
     fn clone(&self) -> Self {
         Self {
             directory: self.directory.clone(),
-            index: self.index.clone(),
+            indexes: self.indexes.clone(),
             show_index: self.show_index,
             redirect_to_slash: self.redirect_to_slash,
             with_permanent_redirect: self.with_permanent_redirect,
@@ -112,7 +112,7 @@ impl Files {
         Files {
             mount_path: mount_path.trim_end_matches('/').to_owned(),
             directory: dir,
-            index: None,
+            indexes: Vec::new(),
             show_index: false,
             redirect_to_slash: false,
             with_permanent_redirect: false,
@@ -206,15 +206,19 @@ impl Files {
         self
     }
 
-    /// Set index file
+    /// Set an index file
     ///
     /// Shows specific index file for directories instead of
     /// showing files listing.
     ///
+    /// This function can be called multiple times to configure
+    /// a list of index fallbacks with their priority set to the
+    /// order of their addition.
+    ///
     /// If the index file is not found, files listing is shown as a fallback if
     /// [`Files::show_files_listing()`] is set.
     pub fn index_file<T: Into<String>>(mut self, index: T) -> Self {
-        self.index = Some(index.into());
+        self.indexes.push(index.into());
         self
     }
 
@@ -388,7 +392,7 @@ impl ServiceFactory<ServiceRequest> for Files {
     fn new_service(&self, _: ()) -> Self::Future {
         let mut inner = FilesServiceInner {
             directory: self.directory.clone(),
-            index: self.index.clone(),
+            indexes: self.indexes.clone(),
             show_index: self.show_index,
             redirect_to_slash: self.redirect_to_slash,
             default: None,

actix-files/src/service.rs

@@ -29,7 +29,7 @@ impl Deref for FilesService {
 
 pub struct FilesServiceInner {
     pub(crate) directory: PathBuf,
-    pub(crate) index: Option<String>,
+    pub(crate) indexes: Vec<String>,
     pub(crate) show_index: bool,
     pub(crate) redirect_to_slash: bool,
     pub(crate) default: Option<HttpService>,
@@ -145,7 +145,7 @@ impl Service<ServiceRequest> for FilesService {
             if path.is_dir() {
                 if this.redirect_to_slash
                     && !req.path().ends_with('/')
-                    && (this.index.is_some() || this.show_index)
+                    && (!this.indexes.is_empty() || this.show_index)
                 {
                     let redirect_to = format!("{}/", req.path());
 
@@ -160,15 +160,18 @@ impl Service<ServiceRequest> for FilesService {
                     return Ok(req.into_response(response));
                 }
 
-                match this.index {
+                let index = this
-                    Some(ref index) => {
+                    .indexes
-                        let named_path = path.join(index);
+                    .iter()
-                        match NamedFile::open_async(named_path).await {
+                    .map(|i| path.join(i))
-                            Ok(named_file) => Ok(this.serve_named_file(req, named_file)),
+                    .find(|p| p.exists());
-                            Err(_) if this.show_index => Ok(this.show_index(req, path)),
+
-                            Err(err) => this.handle_err(err, req).await,
+                match index {
-                        }
+                    Some(ref named_path) => match NamedFile::open_async(named_path).await {
-                    }
+                        Ok(named_file) => Ok(this.serve_named_file(req, named_file)),
+                        Err(_) if this.show_index => Ok(this.show_index(req, path)),
+                        Err(err) => this.handle_err(err, req).await,
+                    },
                     None if this.show_index => Ok(this.show_index(req, path)),
                     None => Ok(ServiceResponse::from_err(
                         FilesError::IsDirectory,