tune files errors

Cargo.toml

@@ -8,4 +8,4 @@ members = [
 ]
 
 [patch.crates-io]
-ntex = { path = "../ntex/ntex/" }
+ntex = { git = "https://github.com/ntex-rs/ntex.git" }

ntex-files/src/error.rs

@@ -18,6 +18,10 @@ pub enum FilesError {
     #[display(fmt = "Request did not meet this resource's requirements.")]
     MethodNotAllowed,
 
+    /// Uri segments parsing error
+    #[display(fmt = "{}", _0)]
+    Uri(UriSegmentError),
+
     /// IO Error
     #[display(fmt = "Error reading: {}", _0)]
     Io(std::io::Error),
@@ -28,6 +32,7 @@ impl WebResponseError<DefaultError> for FilesError {
     fn status_code(&self) -> StatusCode {
         match self {
             FilesError::MethodNotAllowed => StatusCode::METHOD_NOT_ALLOWED,
+            FilesError::Uri(_) => StatusCode::BAD_REQUEST,
             _ => StatusCode::NOT_FOUND,
         }
     }

ntex-files/src/lib.rs

@@ -410,7 +410,6 @@ impl<Err> WebServiceFactory<Err> for Files<Err>
 where
     Err: ErrorRenderer,
     Err::Container: From<FilesError>,
-    Err::Container: From<UriSegmentError>,
 {
     fn register(mut self, config: &mut WebServiceConfig<Err>) {
         if self.default.is_none() {
@@ -429,7 +428,6 @@ impl<Err> ServiceFactory for Files<Err>
 where
     Err: ErrorRenderer,
     Err::Container: From<FilesError>,
-    Err::Container: From<UriSegmentError>,
 {
     type Request = WebRequest<Err>;
     type Response = WebResponse;
@@ -506,7 +504,6 @@ impl<Err> Service for FilesService<Err>
 where
     Err: ErrorRenderer,
     Err::Container: From<FilesError>,
-    Err::Container: From<UriSegmentError>,
 {
     type Request = WebRequest<Err>;
     type Response = WebResponse;
@@ -536,31 +533,17 @@ where
             return Either::Left(ok(req.error_response(FilesError::MethodNotAllowed)));
         }
 
-        println!("R: {:?}", req.match_info().path());
-
         let real_path = match PathBufWrp::get_pathbuf(req.match_info().path()) {
             Ok(item) => item,
-            Err(e) => return Either::Left(ok(req.error_response(e))),
+            Err(e) => return Either::Left(ok(req.error_response(FilesError::from(e)))),
         };
 
-        println!(
-            "R: {:?} {:?} {:?}",
-            real_path,
-            std::env::current_dir(),
-            self.directory.join(&real_path.0)
-        );
-
         // full filepath
         let path = match self.directory.join(&real_path.0).canonicalize() {
             Ok(path) => path,
-            Err(e) => {
+            Err(e) => return self.handle_io_error(e, req),
-                println!("TEST: {:?}", e);
-                return self.handle_io_error(e, req);
-            }
         };
 
-        println!("R2: {:?}", path);
-
         if path.is_dir() {
             if let Some(ref redir_index) = self.index {
                 if self.redirect_to_slash && !req.path().ends_with('/') {
@@ -1053,8 +1036,6 @@ mod tests {
 
     #[ntex::test]
     async fn test_named_file_content_length_headers() {
-        // use actix_web::body::{MessageBody, ResponseBody};
-
         let mut srv = test::init_service(
             App::new().service(Files::new("test", ".").index_file("tests/test.binary")),
         )
@@ -1067,7 +1048,7 @@ mod tests {
             .to_request();
         let _response = test::call_service(&mut srv, request).await;
 
-        // let contentlength = response
+        // let contentlength = _response
         //     .headers()
         //     .get(header::CONTENT_LENGTH)
         //     .unwrap()
@@ -1154,7 +1135,6 @@ mod tests {
             .uri("/tests/test%20space.binary")
             .to_request();
         let response = test::call_service(&srv, request).await;
-        println!("TEST- {:?}", response);
         assert_eq!(response.status(), StatusCode::OK);
 
         let bytes = test::read_body(response).await;

ntex-identity/src/lib.rs

@@ -362,7 +362,7 @@ impl<Err: ErrorRenderer> CookieIdentityInner<Err> {
         CookieIdentityInner {
             key: Key::from_master(key),
             key_v2: Key::from_master(&key_v2),
-            name: "actix-identity".to_owned(),
+            name: "ntex-identity".to_owned(),
             path: "/".to_owned(),
             domain: None,
             secure: true,
@@ -492,7 +492,7 @@ impl<Err: ErrorRenderer> CookieIdentityInner<Err> {
 ///         // <- create identity middleware
 ///         CookieIdentityPolicy::new(&[0; 32])  // <- construct cookie policy
 ///                .domain("www.rust-lang.org")
-///                .name("actix_auth")
+///                .name("ntex-auth")
 ///                .path("/")
 ///                .secure(true),
 ///     ));

ntex-session/src/cookie.rs

@@ -71,7 +71,7 @@ impl<Err> CookieSessionInner<Err> {
         CookieSessionInner {
             security,
             key: Key::from_master(key),
-            name: "actix-session".to_owned(),
+            name: "ntex-session".to_owned(),
             path: "/".to_owned(),
             domain: None,
             secure: true,
@@ -418,7 +418,7 @@ mod tests {
         assert!(response
             .response()
             .cookies()
-            .find(|c| c.name() == "actix-session")
+            .find(|c| c.name() == "ntex-session")
             .is_some());
     }
 
@@ -439,7 +439,7 @@ mod tests {
         assert!(response
             .response()
             .cookies()
-            .find(|c| c.name() == "actix-session")
+            .find(|c| c.name() == "ntex-session")
             .is_some());
     }
 
@@ -460,7 +460,7 @@ mod tests {
         assert!(response
             .response()
             .cookies()
-            .find(|c| c.name() == "actix-session")
+            .find(|c| c.name() == "ntex-session")
             .is_some());
     }
 
@@ -471,7 +471,7 @@ mod tests {
                 .wrap(
                     CookieSession::signed(&[0; 32])
                         .path("/test/")
-                        .name("actix-test")
+                        .name("ntex-test")
                         .domain("localhost")
                         .http_only(true)
                         .same_site(SameSite::Lax)
@@ -493,7 +493,7 @@ mod tests {
         let cookie = response
             .response()
             .cookies()
-            .find(|c| c.name() == "actix-test")
+            .find(|c| c.name() == "ntex-test")
             .unwrap()
             .clone();
         assert_eq!(cookie.path().unwrap(), "/test/");
@@ -526,7 +526,7 @@ mod tests {
         let expires_1 = response
             .response()
             .cookies()
-            .find(|c| c.name() == "actix-session")
+            .find(|c| c.name() == "ntex-session")
             .expect("Cookie is set")
             .expires()
             .expect("Expiration is set");
@@ -538,7 +538,7 @@ mod tests {
         let expires_2 = response
             .response()
             .cookies()
-            .find(|c| c.name() == "actix-session")
+            .find(|c| c.name() == "ntex-session")
             .expect("Cookie is set")
             .expires()
             .expect("Expiration is set");