Add ServiceConfig::default_service

CHANGES.md

@@ -3,8 +3,10 @@
 ## Unreleased - 2021-xx-xx
 ### Added
 * Re-export actix-service `ServiceFactory` in `dev` module. [#2325]
+* Add `ServiceConfig::default_service`. [#2338]
 
 [#2325]: https://github.com/actix/actix-web/pull/2325
+[#2338]: https://github.com/actix/actix-web/pull/2338
 
 
 ## 4.0.0-beta.8 - 2021-06-26
@@ -169,7 +171,7 @@
 ### Removed
 * Public modules `middleware::{normalize, err_handlers}`. All necessary middleware structs are now
   exposed directly by the `middleware` module.
-* Remove `actix-threadpool` as dependency. `actix_threadpool::BlockingError` error type can be imported 
+* Remove `actix-threadpool` as dependency. `actix_threadpool::BlockingError` error type can be imported
   from `actix_web::error` module. [#1878]
 
 [#1812]: https://github.com/actix/actix-web/pull/1812
@@ -262,7 +264,7 @@
 
 ## 3.0.0-beta.4 - 2020-09-09
 ### Added
-* `middleware::NormalizePath` now has configurable behavior for either always having a trailing 
+* `middleware::NormalizePath` now has configurable behavior for either always having a trailing
   slash, or as the new addition, always trimming trailing slashes. [#1639]
 
 ### Changed

src/app.rs

@@ -205,6 +205,10 @@ where
         self.services.extend(cfg.services);
         self.external.extend(cfg.external);
         self.extensions.extend(cfg.app_data);
+        if let Some(default) = cfg.default {
+            self.default = Some(default);
+        }
+
         self
     }
 

src/config.rs

@@ -3,7 +3,7 @@ use std::rc::Rc;
 
 use actix_http::Extensions;
 use actix_router::ResourceDef;
-use actix_service::{boxed, IntoServiceFactory, ServiceFactory};
+use actix_service::{boxed, IntoServiceFactory, ServiceFactory, ServiceFactoryExt};
 
 use crate::data::Data;
 use crate::error::Error;
@@ -185,6 +185,7 @@ pub struct ServiceConfig {
     pub(crate) services: Vec<Box<dyn AppServiceFactory>>,
     pub(crate) external: Vec<ResourceDef>,
     pub(crate) app_data: Extensions,
+    pub(crate) default: Option<Rc<HttpNewService>>,
 }
 
 impl ServiceConfig {
@@ -193,6 +194,7 @@ impl ServiceConfig {
             services: Vec::new(),
             external: Vec::new(),
             app_data: Extensions::new(),
+            default: None,
         }
     }
 
@@ -213,6 +215,28 @@ impl ServiceConfig {
         self
     }
 
+    /// Default service to be used if no matching resource could be found.
+    ///
+    /// Counterpart to [`App::default_service()`](crate::App::default_service).
+    pub fn default_service<F, U>(&mut self, f: F) -> &mut Self
+    where
+        F: IntoServiceFactory<U, ServiceRequest>,
+        U: ServiceFactory<
+                ServiceRequest,
+                Config = (),
+                Response = ServiceResponse,
+                Error = Error,
+            > + 'static,
+        U::InitError: std::fmt::Debug,
+    {
+        // create and configure default resource
+        self.default = Some(Rc::new(boxed::factory(f.into_factory().map_init_err(
+            |e| log::error!("Can not construct default service: {:?}", e),
+        ))));
+
+        self
+    }
+
     /// Configure route for a specific path.
     ///
     /// Counterpart to [`App::route()`](crate::App::route).
@@ -341,6 +365,21 @@ mod tests {
         assert_eq!(body, Bytes::from_static(b"https://youtube.com/watch/12345"));
     }
 
+    #[actix_rt::test]
+    async fn test_default_service() {
+        let srv = init_service(App::new().configure(|cfg| {
+            cfg.default_service(
+                web::get().to(|| HttpResponse::NotFound().body("four oh four")),
+            );
+        }))
+        .await;
+        let req = TestRequest::with_uri("/path/i/did/not-configure").to_request();
+        let resp = call_service(&srv, req).await;
+        assert_eq!(resp.status(), StatusCode::NOT_FOUND);
+        let body = read_body(resp).await;
+        assert_eq!(body, Bytes::from_static(b"four oh four"));
+    }
+
     #[actix_rt::test]
     async fn test_service() {
         let srv = init_service(App::new().configure(|cfg| {