mirror of
https://github.com/dani-garcia/vaultwarden
synced 2024-05-19 13:23:48 +02:00
3427217686
* Remove custom WebSocket code Remove our custom WebSocket code and only use the Rocket code. Removed all options in regards to WebSockets Added a new option `WEBSOCKET_DISABLED` which defaults too `false`. This can be used to disable WebSockets if you really do not want to use it. * Addressed remarks given and some updates - Addressed comments given during review - Updated crates, including Rocket to the latest merged v0.5 changes - Removed an extra header which should not be sent for websocket connections * Updated suggestions and crates - Addressed the suggestions - Updated Rocket to latest rc4 Also made the needed code changes - Updated all other crates Pinned `openssl` and `openssl-sys` --------- Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
76 lines
2.5 KiB
Rust
76 lines
2.5 KiB
Rust
mod admin;
|
|
pub mod core;
|
|
mod icons;
|
|
mod identity;
|
|
mod notifications;
|
|
mod push;
|
|
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_auth_requests,
|
|
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},
|
|
core::{event_cleanup_job, events_routes as core_events_routes},
|
|
icons::routes as icons_routes,
|
|
identity::routes as identity_routes,
|
|
notifications::routes as notifications_routes,
|
|
notifications::{AnonymousNotify, Notify, UpdateType, WS_ANONYMOUS_SUBSCRIPTIONS, WS_USERS},
|
|
push::{
|
|
push_cipher_update, push_folder_update, push_logout, push_send_update, push_user_update, register_push_device,
|
|
unregister_push_device,
|
|
},
|
|
web::catchers as web_catchers,
|
|
web::routes as web_routes,
|
|
web::static_files,
|
|
};
|
|
use crate::db::{models::User, DbConn};
|
|
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 PasswordOrOtpData {
|
|
MasterPasswordHash: Option<String>,
|
|
Otp: Option<String>,
|
|
}
|
|
|
|
impl PasswordOrOtpData {
|
|
/// Tokens used via this struct can be used multiple times during the process
|
|
/// First for the validation to continue, after that to enable or validate the following actions
|
|
/// This is different per caller, so it can be adjusted to delete the token or not
|
|
pub async fn validate(&self, user: &User, delete_if_valid: bool, conn: &mut DbConn) -> EmptyResult {
|
|
use crate::api::core::two_factor::protected_actions::validate_protected_action_otp;
|
|
|
|
match (self.MasterPasswordHash.as_deref(), self.Otp.as_deref()) {
|
|
(Some(pw_hash), None) => {
|
|
if !user.check_valid_password(pw_hash) {
|
|
err!("Invalid password");
|
|
}
|
|
}
|
|
(None, Some(otp)) => {
|
|
validate_protected_action_otp(otp, &user.uuid, delete_if_valid, conn).await?;
|
|
}
|
|
_ => err!("No validation provided"),
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|