♻️ Exige la petición en las variantes de ErrorPage

Sustituye `Option<HttpRequest>` por `HttpRequest` en todas las
variantes. Ningún uso construía un ErrorPage sin petición y, sin ella,
la página de error pierde el idioma negociado y el usuario actual.
This commit is contained in:
Manuel Cillero 2026-11-08 14:24:30 +01:00
parent 947aef2f91
commit a6d15ab211
13 changed files with 59 additions and 62 deletions

View file

@ -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)?;

View file

@ -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)
}

View file

@ -159,7 +159,7 @@ pub(crate) async fn preview_get(
) -> Result<Markup, ErrorPage> {
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));

View file

@ -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<Response, E
return Ok(login_redirect(request, PROFILE_EDIT_PATH));
};
let Ok(user) = user_admin::find_user(id).await else {
return Err(ErrorPage::NotFound(Some(request)));
return Err(ErrorPage::NotFound(request));
};
let form = UserForm::new()
@ -319,7 +319,7 @@ pub(crate) async fn profile_edit_post(
return Ok(login_redirect(request, PROFILE_EDIT_PATH));
};
let Ok(user) = user_admin::find_user(id).await else {
return Err(ErrorPage::NotFound(Some(request)));
return Err(ErrorPage::NotFound(request));
};
// Sin permiso se conserva el nombre actual, aunque la petición se haya manipulado a mano.
@ -432,7 +432,7 @@ pub(crate) async fn email_get(request: HttpRequest) -> Result<Response, ErrorPag
return Ok(login_redirect(request, EMAIL_PATH));
};
let Ok(user) = user_admin::find_user(id).await else {
return Err(ErrorPage::NotFound(Some(request)));
return Err(ErrorPage::NotFound(request));
};
let title = Lc::t("title-profile-email", &LOCALES_USER);
let form = ChangeEmailForm::new().with_pending_email(user.pending_email);
@ -508,7 +508,7 @@ pub(crate) async fn email_confirm_get(
.await
.unwrap_or(false)
{
return Err(ErrorPage::NotFound(Some(request)));
return Err(ErrorPage::NotFound(request));
}
Ok(no_referrer(
confirm_page(
@ -541,7 +541,7 @@ pub(crate) async fn email_confirm_post(
message_page(request, title, Lc::t("error-email-taken", &LOCALES_USER)).await,
)
}
Err(_) => ErrorPage::NotFound(Some(request)).into_response(),
Err(_) => ErrorPage::NotFound(request).into_response(),
}
}

View file

@ -43,7 +43,7 @@ pub(crate) async fn list_get(
let result = match role_admin::list_roles_page(&params).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<Response, ErrorPage> {
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<Response, ErrorPage> {
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::<RolePermissionsFormData>(&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 {

View file

@ -53,7 +53,7 @@ pub(crate) async fn list_get(
let result = match user_admin::list_users(&params).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<i32> {
// un administrador puede conceder.
async fn require_manageable(request: &HttpRequest, id: i32) -> Result<user::Model, ErrorPage> {
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::<Account>().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<Response, ErrorPage> {
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<Response, ErrorPage> {
let Ok(form) = serde_qs::from_bytes::<NewUserFormData>(&raw.0) else {
return Err(ErrorPage::BadRequest(Some(request)));
return Err(ErrorPage::BadRequest(request));
};
let allow_admin_field = request.extension::<Account>().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(&current).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<Response, ErrorPage> {
let user = require_manageable(&request, id).await?;
let Ok(form) = serde_qs::from_bytes::<EditUserFormData>(&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<Response, ErrorPage> {
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::<Account>().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<AdminFormData>,
) -> Result<Response, ErrorPage> {
let Some(account) = request.extension::<Account>().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";

View file

@ -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<Markup, ErrorPage> {
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<RegisterFormData>,
) -> 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(),
}
}