diff --git a/extensions/pagetop-admin/src/handlers.rs b/extensions/pagetop-admin/src/handlers.rs index ec57cf97..10a2ae2b 100644 --- a/extensions/pagetop-admin/src/handlers.rs +++ b/extensions/pagetop-admin/src/handlers.rs @@ -13,7 +13,7 @@ use crate::settings::{self, SettingFieldType, SettingsSchema}; fn config_form_page( request: &HttpRequest, ) -> Result<(&'static AdminPage, &'static SettingsSchema), ErrorPage> { - let not_found = || ErrorPage::NotFound(Some(request.clone())); + let not_found = || ErrorPage::NotFound(request.clone()); let path = strip_admin_path(request.path()).ok_or_else(not_found)?; let page = AdminRegistry::global().page(path).ok_or_else(not_found)?; let schema = config_forms().get(path).ok_or_else(not_found)?; diff --git a/extensions/pagetop-cron/src/lib.rs b/extensions/pagetop-cron/src/lib.rs index bf33960a..66a76d89 100644 --- a/extensions/pagetop-cron/src/lib.rs +++ b/extensions/pagetop-cron/src/lib.rs @@ -411,7 +411,7 @@ async fn trigger_post(request: HttpRequest) -> Response { .filter(|(scheme, _)| scheme.eq_ignore_ascii_case("Bearer")) .map(|(_, token)| token.trim_start()); if !token.is_some_and(scheduler::token_matches) { - return ErrorPage::NotFound(Some(request)).into_response(); + return ErrorPage::NotFound(request).into_response(); } // Siempre `200 OK`, aunque falle algún trabajo: un reintento del programa externo podría // llegar a otra instancia y repetir también los que terminaron bien. Sólo se indica el tipo de @@ -433,5 +433,5 @@ async fn trigger_post(request: HttpRequest) -> Response { } async fn not_found(request: HttpRequest) -> ErrorPage { - ErrorPage::NotFound(Some(request)) + ErrorPage::NotFound(request) } diff --git a/extensions/pagetop-mail/src/preview.rs b/extensions/pagetop-mail/src/preview.rs index 71a9ae17..eba450bc 100644 --- a/extensions/pagetop-mail/src/preview.rs +++ b/extensions/pagetop-mail/src/preview.rs @@ -159,7 +159,7 @@ pub(crate) async fn preview_get( ) -> Result { let previews = MailPreviews::collect(); let Some(preview) = previews.previews.iter().find(|p| p.key == key) else { - return Err(ErrorPage::NotFound(Some(request))); + return Err(ErrorPage::NotFound(request)); }; let cx = Context::new(request.clone()); let email = transport::prepare_preview((preview.build)(&cx)); diff --git a/extensions/pagetop-user/src/handlers/account.rs b/extensions/pagetop-user/src/handlers/account.rs index c91cb11e..0057447c 100644 --- a/extensions/pagetop-user/src/handlers/account.rs +++ b/extensions/pagetop-user/src/handlers/account.rs @@ -96,11 +96,11 @@ pub(crate) async fn profile_get(request: HttpRequest) -> Response { let user = match user_admin::find_user(id).await { Ok(user) => user, - Err(_) => return ErrorPage::NotFound(Some(request)).into_response(), + Err(_) => return ErrorPage::NotFound(request).into_response(), }; let roles = match user_admin::user_roles(id).await { Ok(roles) => roles, - Err(_) => return ErrorPage::InternalError(Some(request)).into_response(), + Err(_) => return ErrorPage::InternalError(request).into_response(), }; let can_edit = has_permission(&request, &UserPermission::EditOwnProfile); let can_change_password = has_permission(&request, &UserPermission::ChangeOwnPassword); @@ -213,12 +213,12 @@ pub(crate) async fn public_profile_get( return Ok(deny_access(request)); } let Ok(user) = user_admin::find_user(id).await else { - return Err(ErrorPage::NotFound(Some(request))); + return Err(ErrorPage::NotFound(request)); }; if UserStatus::from_i16(user.status) != UserStatus::Active && !has_permission(&request, &UserPermission::AdminUsers) { - return Err(ErrorPage::NotFound(Some(request))); + return Err(ErrorPage::NotFound(request)); } let title = match util::non_blank(user.display_name.as_deref().unwrap_or_default()) { @@ -278,7 +278,7 @@ pub(crate) async fn profile_edit_get(request: HttpRequest) -> Result Result ErrorPage::NotFound(Some(request)).into_response(), + Err(_) => ErrorPage::NotFound(request).into_response(), } } diff --git a/extensions/pagetop-user/src/handlers/admin/roles.rs b/extensions/pagetop-user/src/handlers/admin/roles.rs index c32070cd..0fb8c3d6 100644 --- a/extensions/pagetop-user/src/handlers/admin/roles.rs +++ b/extensions/pagetop-user/src/handlers/admin/roles.rs @@ -43,7 +43,7 @@ pub(crate) async fn list_get( let result = match role_admin::list_roles_page(¶ms).await { Ok(result) => result, - Err(_) => return Err(ErrorPage::InternalError(Some(request))), + Err(_) => return Err(ErrorPage::InternalError(request)), }; let mut table = RoleTable::new() @@ -156,10 +156,10 @@ pub(crate) async fn edit_get( ) -> Result { let role = match role_admin::find_role(id).await { Ok(role) => role, - Err(_) => return Err(ErrorPage::NotFound(Some(request))), + Err(_) => return Err(ErrorPage::NotFound(request)), }; if role.locked { - return Err(ErrorPage::AccessDenied(Some(request))); + return Err(ErrorPage::AccessDenied(request)); } let page = Page::admin(request); @@ -257,11 +257,11 @@ pub(crate) async fn view_get( ) -> Result { let role = match role_admin::find_role(id).await { Ok(role) => role, - Err(_) => return Err(ErrorPage::NotFound(Some(request))), + Err(_) => return Err(ErrorPage::NotFound(request)), }; let selected = match role_admin::role_permission_keys(id).await { Ok(keys) => keys, - Err(_) => return Err(ErrorPage::InternalError(Some(request))), + Err(_) => return Err(ErrorPage::InternalError(request)), }; let mut page = Page::admin(request); @@ -388,9 +388,9 @@ pub(crate) async fn delete_post( let mut cx = Context::admin(request); Ok(HtmxResponse::new(table.render(&mut cx).await).into_response()) } else { - let cx = Context::new(request); match result { Ok(()) => { + let cx = Context::new(request); let target = cx .route(ADMIN_ROLES_PATH.as_str()) .alter_param( @@ -402,7 +402,7 @@ pub(crate) async fn delete_post( .to_string(); Ok(Redirect::see_other(target).into_response()) } - Err(_) => Err(ErrorPage::BadRequest(cx.request().cloned())), + Err(_) => Err(ErrorPage::BadRequest(request)), } } } @@ -472,11 +472,11 @@ pub(crate) async fn permissions_get( require_permission(&request, &UserPermission::AdminPermissions)?; if role_admin::find_role(id).await.is_err() { - return Err(ErrorPage::NotFound(Some(request))); + return Err(ErrorPage::NotFound(request)); } let selected = match role_admin::role_permission_keys(id).await { Ok(keys) => keys, - Err(_) => return Err(ErrorPage::InternalError(Some(request))), + Err(_) => return Err(ErrorPage::InternalError(request)), }; let page = Page::admin(request); @@ -517,7 +517,7 @@ pub(crate) async fn permissions_post( require_permission(&request, &UserPermission::AdminPermissions)?; let Ok(form) = serde_qs::from_bytes::(&raw.0) else { - return Err(ErrorPage::BadRequest(Some(request))); + return Err(ErrorPage::BadRequest(request)); }; match role_admin::set_role_permissions(id, &form.permission_keys).await { diff --git a/extensions/pagetop-user/src/handlers/admin/users.rs b/extensions/pagetop-user/src/handlers/admin/users.rs index b26b1386..bd0ae2c1 100644 --- a/extensions/pagetop-user/src/handlers/admin/users.rs +++ b/extensions/pagetop-user/src/handlers/admin/users.rs @@ -53,7 +53,7 @@ pub(crate) async fn list_get( let result = match user_admin::list_users(¶ms).await { Ok(result) => result, - Err(_) => return Err(ErrorPage::InternalError(Some(request))), + Err(_) => return Err(ErrorPage::InternalError(request)), }; let mut table = UserTable::new() @@ -135,10 +135,10 @@ fn parse_role_ids(role_ids: &[String]) -> Vec { // un administrador puede conceder. async fn require_manageable(request: &HttpRequest, id: i32) -> Result { let Ok(user) = user_admin::find_user(id).await else { - return Err(ErrorPage::NotFound(Some(request.clone()))); + return Err(ErrorPage::NotFound(request.clone())); }; if user.is_admin && !request.extension::().is_some_and(|a| a.is_admin()) { - return Err(ErrorPage::AccessDenied(Some(request.clone()))); + return Err(ErrorPage::AccessDenied(request.clone())); } Ok(user) } @@ -152,7 +152,7 @@ pub(crate) async fn new_get( ) -> Result { let roles = match available_roles(&[]).await { Ok(roles) => roles, - Err(_) => return Err(ErrorPage::InternalError(Some(request))), + Err(_) => return Err(ErrorPage::InternalError(request)), }; // El campo "administrador" sólo se ofrece si quien da de alta ya es administrador: no es un // permiso del catálogo (igual que conceder/revocar en la edición, ver `set_user_admin`). @@ -205,7 +205,7 @@ pub(crate) async fn new_post( raw: web::RawForm, ) -> Result { let Ok(form) = serde_qs::from_bytes::(&raw.0) else { - return Err(ErrorPage::BadRequest(Some(request))); + return Err(ErrorPage::BadRequest(request)); }; let allow_admin_field = request.extension::().is_some_and(|a| a.is_admin()); // Nunca fiarse sólo de que el campo esté presente en el formulario: sólo se concede si quien @@ -273,15 +273,15 @@ async fn render_user_edit( ) -> Response { let user = match user_admin::find_user(id).await { Ok(user) => user, - Err(_) => return ErrorPage::NotFound(Some(request)).into_response(), + Err(_) => return ErrorPage::NotFound(request).into_response(), }; let current = match user_admin::user_role_ids(id).await { Ok(ids) => ids, - Err(_) => return ErrorPage::InternalError(Some(request)).into_response(), + Err(_) => return ErrorPage::InternalError(request).into_response(), }; let roles = match available_roles(¤t).await { Ok(roles) => roles, - Err(_) => return ErrorPage::InternalError(Some(request)).into_response(), + Err(_) => return ErrorPage::InternalError(request).into_response(), }; let status = UserStatus::from_i16(user.status); let is_admin = user.is_admin; @@ -468,7 +468,7 @@ pub(crate) async fn edit_post( ) -> Result { let user = require_manageable(&request, id).await?; let Ok(form) = serde_qs::from_bytes::(&raw.0) else { - return Err(ErrorPage::BadRequest(Some(request))); + return Err(ErrorPage::BadRequest(request)); }; let role_ids = parse_role_ids(&form.role_ids); @@ -524,11 +524,11 @@ pub(crate) async fn view_get( ) -> Result { let user = match user_admin::find_user(id).await { Ok(user) => user, - Err(_) => return Err(ErrorPage::NotFound(Some(request))), + Err(_) => return Err(ErrorPage::NotFound(request)), }; let roles = match user_admin::user_roles(id).await { Ok(roles) => roles, - Err(_) => return Err(ErrorPage::InternalError(Some(request))), + Err(_) => return Err(ErrorPage::InternalError(request)), }; let mut page = Page::admin(request); @@ -625,7 +625,7 @@ pub(crate) async fn status_post( require_permission(&request, &UserPermission::BlockAccounts)?; require_manageable(&request, id).await?; let Some(account) = request.extension::().cloned() else { - return Err(ErrorPage::AccessDenied(Some(request))); + return Err(ErrorPage::AccessDenied(request)); }; let new_status = match form.status.as_str() { @@ -670,10 +670,10 @@ pub(crate) async fn admin_post( web::Form(form): web::Form, ) -> Result { let Some(account) = request.extension::().cloned() else { - return Err(ErrorPage::AccessDenied(Some(request))); + return Err(ErrorPage::AccessDenied(request)); }; if !account.is_admin() { - return Err(ErrorPage::AccessDenied(Some(request))); + return Err(ErrorPage::AccessDenied(request)); } let new_is_admin = form.is_admin == "true"; diff --git a/extensions/pagetop-user/src/handlers/auth.rs b/extensions/pagetop-user/src/handlers/auth.rs index d46cda0b..15be31ed 100644 --- a/extensions/pagetop-user/src/handlers/auth.rs +++ b/extensions/pagetop-user/src/handlers/auth.rs @@ -158,7 +158,7 @@ pub async fn logout_post(request: HttpRequest) -> Response { /// GET /user/register - Formulario de registro de cuenta. pub async fn register_get(request: HttpRequest) -> Result { if !SETTINGS.allow_registration { - return Err(ErrorPage::NotFound(Some(request))); + return Err(ErrorPage::NotFound(request)); } Page::new(request) .with_title(Lc::t("title-register", &LOCALES_USER)) @@ -175,7 +175,7 @@ pub async fn register_post( web::Form(form): web::Form, ) -> Response { if !SETTINGS.allow_registration { - return ErrorPage::NotFound(Some(request)).into_response(); + return ErrorPage::NotFound(request).into_response(); } let cx = Context::new(request.clone()); let result = if throttle::allow(&request) { @@ -289,7 +289,7 @@ pub async fn password_reset_confirm_get( .await .unwrap_or(false) { - return Err(ErrorPage::NotFound(Some(request))); + return Err(ErrorPage::NotFound(request)); } let page = Page::new(request) .with_title(Lc::t("title-new-password", &LOCALES_USER)) @@ -378,7 +378,7 @@ pub async fn verify_email_get( .await .unwrap_or(false) { - return Err(ErrorPage::NotFound(Some(request))); + return Err(ErrorPage::NotFound(request)); } Ok(no_referrer( confirm_page( @@ -430,7 +430,7 @@ pub async fn verify_email_post( MessageLevel::Info, Lc::t("msg-email-verified", &LOCALES_USER), ), - Err(_) => ErrorPage::NotFound(Some(request)).into_response(), + Err(_) => ErrorPage::NotFound(request).into_response(), } } diff --git a/src/admin/pages.rs b/src/admin/pages.rs index 2deee864..a7d198db 100644 --- a/src/admin/pages.rs +++ b/src/admin/pages.rs @@ -50,7 +50,7 @@ async fn dashboard(request: HttpRequest) -> Response { async fn section_page(request: HttpRequest) -> Response { let path = strip_admin_path(request.path()).unwrap_or_default(); let Some(section) = AdminRegistry::global().section_by_path(path) else { - return ErrorPage::NotFound(Some(request)).into_response(); + return ErrorPage::NotFound(request).into_response(); }; let page = Page::admin(request.clone()); diff --git a/src/auth.rs b/src/auth.rs index fbdcf842..06dc6866 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -319,7 +319,7 @@ pub fn require_permission(request: &HttpRequest, perm: PermissionRef) -> Result< Ok(()) } else { trace_denied(request); - Err(ErrorPage::AccessDenied(Some(request.clone()))) + Err(ErrorPage::AccessDenied(request.clone())) } } @@ -383,7 +383,7 @@ pub fn deny_access(request: HttpRequest) -> Response { { return response; } - ErrorPage::AccessDenied(Some(request)).into_response() + ErrorPage::AccessDenied(request).into_response() } // Los anónimos van en `debug` porque bots y sesiones caducadas los hacen frecuentes y poco diff --git a/src/response/page/error.rs b/src/response/page/error.rs index 7d2f5adf..9404c88b 100644 --- a/src/response/page/error.rs +++ b/src/response/page/error.rs @@ -23,9 +23,6 @@ use std::any::Any; /// plantilla y el contenido del mensaje con los métodos específicos del tema, como /// [`Theme::error_403()`], [`Theme::error_404()`] o [`Theme::error_fatal()`]. /// -/// Sin `request` (`None`), la página se renderiza igualmente, pero sin el idioma negociado ni el -/// usuario actual, que dependen de la petición original. -/// /// [`Theme::error_403()`]: crate::core::theme::Theme::error_403 /// [`Theme::error_404()`]: crate::core::theme::Theme::error_404 /// [`Theme::error_fatal()`]: crate::core::theme::Theme::error_fatal @@ -33,24 +30,24 @@ use std::any::Any; pub enum ErrorPage { /// Petición incorrecta (400). El servidor no puede procesar la petición tal y como está /// formulada (datos malformados, parámetros inválidos, etc.). - BadRequest(Option), + BadRequest(HttpRequest), /// Acceso denegado (403). El usuario actual no tiene permiso para acceder al recurso. /// /// Se renderiza con [`Theme::error_403()`](crate::core::theme::Theme::error_403). - AccessDenied(Option), + AccessDenied(HttpRequest), /// Recurso no encontrado (404). La ruta solicitada no existe o no coincide con ningún handler. /// /// Se renderiza con [`Theme::error_404()`](crate::core::theme::Theme::error_404). - NotFound(Option), + NotFound(HttpRequest), /// Error interno del servidor (500). Un fallo controlado (no un `panic!`) impide completar la /// petición. - InternalError(Option), + InternalError(HttpRequest), /// Servicio no disponible (503). El servidor no puede atender la petición temporalmente /// (mantenimiento, sobrecarga, etc.). - ServiceUnavailable(Option), + ServiceUnavailable(HttpRequest), /// Tiempo de espera agotado (504). Una dependencia externa (proxy, servicio remoto) no ha /// respondido a tiempo. - GatewayTimeout(Option), + GatewayTimeout(HttpRequest), } impl ErrorPage { @@ -72,12 +69,12 @@ impl ErrorPage { let status = self.status_code(); let mut page = match self { Self::AccessDenied(request) => { - let mut page = Page::default().with_request(request); + let mut page = Page::default().with_request(Some(request)); page.theme().error_403(&mut page); page } Self::NotFound(request) => { - let mut page = Page::default().with_request(request); + let mut page = Page::default().with_request(Some(request)); page.theme().error_404(&mut page); page } @@ -85,7 +82,7 @@ impl ErrorPage { | Self::InternalError(request) | Self::ServiceUnavailable(request) | Self::GatewayTimeout(request) => { - let mut page = Page::default().with_request(request); + let mut page = Page::default().with_request(Some(request)); page.theme().error_fatal( &mut page, status, @@ -126,7 +123,7 @@ impl IntoResponse for ErrorPage { // // Se registra como `.fallback()` del router principal desde [`Application`](crate::Application). pub(crate) async fn route_not_found(request: HttpRequest) -> Result { - Err(ErrorPage::NotFound(Some(request))) + Err(ErrorPage::NotFound(request)) } // Intercepta respuestas con un [`ErrorPage`] pendiente y las convierte en páginas HTML. diff --git a/src/web/csrf.rs b/src/web/csrf.rs index 833de1e8..af02fe4b 100644 --- a/src/web/csrf.rs +++ b/src/web/csrf.rs @@ -45,7 +45,7 @@ pub(crate) async fn reject_cross_origin(request: Request, next: Next) -> Respons ); let (mut parts, _) = request.into_parts(); let Ok(request) = HttpRequest::from_request_parts(&mut parts, &()).await; - ErrorPage::AccessDenied(Some(request)).into_response() + ErrorPage::AccessDenied(request).into_response() } // Con HTTP/2 el servidor llega en la URI (`:authority`) y no siempre en `Host`. diff --git a/src/web/download.rs b/src/web/download.rs index dc1e3ee2..5cc8e6ce 100644 --- a/src/web/download.rs +++ b/src/web/download.rs @@ -65,8 +65,8 @@ const FORWARDED_HEADERS: [http::HeaderName; 6] = [ /// .serve(&request) /// .await /// .map_err(|err| match err { -/// web::UploadError::NotFound(_) => ErrorPage::NotFound(Some(request)), -/// _ => ErrorPage::InternalError(Some(request)), +/// web::UploadError::NotFound(_) => ErrorPage::NotFound(request), +/// _ => ErrorPage::InternalError(request), /// }) /// } /// ``` diff --git a/src/web/upload.rs b/src/web/upload.rs index 68c92250..bdb08036 100644 --- a/src/web/upload.rs +++ b/src/web/upload.rs @@ -362,7 +362,7 @@ impl Drop for SavedFiles { /// // Volver a mostrar el formulario con `err.message()`... /// # todo!() /// } -/// Err(_) => return Err(ErrorPage::InternalError(Some(request))), +/// Err(_) => return Err(ErrorPage::InternalError(request)), /// }; /// let Some(photo) = sent.file("photo") else { /// // Campo obligatorio sin archivo: volver a mostrar el formulario...