geforkt von mirrored/vaultwarden
fa7dbedd5d
currently, if the admin guard fails the user will get a 404 page. and when the session times out after 20 minutes post methods will give the reason "undefined" as a response while generating the support string will fail without any user feedback. this commit changes the error handling on admin pages * by removing the reliance on Rockets forwarding and making the login page an explicit route that can be redirected to from all admin pages * by removing the obsolete and mostly unused Referer struct we can redirect the user back to the requested admin page directley * by providing an error message for json requests the `get_diagnostics_config` and all post methods can return a more comprehensible message and the user can be alerted * the `admin_url()` function can be simplified because rfc2616 has been obsoleted by rfc7231 in 2014 (and also by the recently released rfc9110) which allows relative urls in the Location header. c.f. https://www.rfc-editor.org/rfc/rfc7231#section-7.1.2 and https://www.rfc-editor.org/rfc/rfc9110#section-10.2.2
71 Zeilen
1,9 KiB
Rust
71 Zeilen
1,9 KiB
Rust
mod admin;
|
|
pub mod core;
|
|
mod icons;
|
|
mod identity;
|
|
mod notifications;
|
|
mod web;
|
|
|
|
use rocket::serde::json::Json;
|
|
use serde_json::Value;
|
|
|
|
pub use crate::api::{
|
|
admin::catchers as admin_catchers,
|
|
admin::routes as admin_routes,
|
|
core::catchers as core_catchers,
|
|
core::purge_sends,
|
|
core::purge_trashed_ciphers,
|
|
core::routes as core_routes,
|
|
core::two_factor::send_incomplete_2fa_notifications,
|
|
core::{emergency_notification_reminder_job, emergency_request_timeout_job},
|
|
icons::routes as icons_routes,
|
|
identity::routes as identity_routes,
|
|
notifications::routes as notifications_routes,
|
|
notifications::{start_notification_server, Notify, UpdateType},
|
|
web::catchers as web_catchers,
|
|
web::routes as web_routes,
|
|
web::static_files,
|
|
};
|
|
use crate::util;
|
|
|
|
// Type aliases for API methods results
|
|
type ApiResult<T> = Result<T, crate::error::Error>;
|
|
pub type JsonResult = ApiResult<Json<Value>>;
|
|
pub type EmptyResult = ApiResult<()>;
|
|
|
|
type JsonUpcase<T> = Json<util::UpCase<T>>;
|
|
type JsonUpcaseVec<T> = Json<Vec<util::UpCase<T>>>;
|
|
type JsonVec<T> = Json<Vec<T>>;
|
|
|
|
// Common structs representing JSON data received
|
|
#[derive(Deserialize)]
|
|
#[allow(non_snake_case)]
|
|
struct PasswordData {
|
|
MasterPasswordHash: String,
|
|
}
|
|
|
|
#[derive(Deserialize, Debug, Clone)]
|
|
#[serde(untagged)]
|
|
enum NumberOrString {
|
|
Number(i32),
|
|
String(String),
|
|
}
|
|
|
|
impl NumberOrString {
|
|
fn into_string(self) -> String {
|
|
match self {
|
|
NumberOrString::Number(n) => n.to_string(),
|
|
NumberOrString::String(s) => s,
|
|
}
|
|
}
|
|
|
|
#[allow(clippy::wrong_self_convention)]
|
|
fn into_i32(&self) -> ApiResult<i32> {
|
|
use std::num::ParseIntError as PIE;
|
|
match self {
|
|
NumberOrString::Number(n) => Ok(*n),
|
|
NumberOrString::String(s) => {
|
|
s.parse().map_err(|e: PIE| crate::Error::new("Can't convert to number", e.to_string()))
|
|
}
|
|
}
|
|
}
|
|
}
|