vw_small

Hardened fork of Vaultwarden (https://github.com/dani-garcia/vaultwarden) with fewer features.
git clone https://git.philomathiclife.com/repos/vw_small
Log | Files | Refs | README

commit 8ea01a67f6ef863df29c40a8a9b983bd957e83a1
parent a121cb6f00e79ff8bbac2adb28bd94e71e84ae28
Author: Daniel GarcĂ­a <dani-garcia@users.noreply.github.com>
Date:   Thu, 25 Mar 2021 19:56:24 +0100

Merge pull request #1529 from mprasil/more-generic-send-error-messages

Return generic message when Send not available
Diffstat:
Msrc/api/core/sends.rs | 22++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/api/core/sends.rs b/src/api/core/sends.rs @@ -13,6 +13,8 @@ use crate::{ CONFIG, }; +const SEND_INACCESSIBLE_MSG: &str = "Send does not exist or is no longer available"; + pub fn routes() -> Vec<rocket::Route> { routes![ post_send, @@ -228,27 +230,27 @@ pub struct SendAccessData { fn post_access(access_id: String, data: JsonUpcase<SendAccessData>, conn: DbConn) -> JsonResult { let mut send = match Send::find_by_access_id(&access_id, &conn) { Some(s) => s, - None => err_code!("Send not found", 404), + None => err_code!(SEND_INACCESSIBLE_MSG, 404), }; if let Some(max_access_count) = send.max_access_count { if send.access_count >= max_access_count { - err_code!("Max access count reached", 404); + err_code!(SEND_INACCESSIBLE_MSG, 404); } } if let Some(expiration) = send.expiration_date { if Utc::now().naive_utc() >= expiration { - err_code!("Send has expired", 404) + err_code!(SEND_INACCESSIBLE_MSG, 404) } } if Utc::now().naive_utc() >= send.deletion_date { - err_code!("Send has been deleted", 404) + err_code!(SEND_INACCESSIBLE_MSG, 404) } if send.disabled { - err_code!("Send has been disabled", 404) + err_code!(SEND_INACCESSIBLE_MSG, 404) } if send.password_hash.is_some() { @@ -279,27 +281,27 @@ fn post_access_file( ) -> JsonResult { let mut send = match Send::find_by_uuid(&send_id, &conn) { Some(s) => s, - None => err_code!("Send not found", 404), + None => err_code!(SEND_INACCESSIBLE_MSG, 404), }; if let Some(max_access_count) = send.max_access_count { if send.access_count >= max_access_count { - err_code!("Max access count reached", 404); + err_code!(SEND_INACCESSIBLE_MSG, 404) } } if let Some(expiration) = send.expiration_date { if Utc::now().naive_utc() >= expiration { - err_code!("Send has expired", 404) + err_code!(SEND_INACCESSIBLE_MSG, 404) } } if Utc::now().naive_utc() >= send.deletion_date { - err_code!("Send has been deleted", 404) + err_code!(SEND_INACCESSIBLE_MSG, 404) } if send.disabled { - err_code!("Send has been disabled", 404) + err_code!(SEND_INACCESSIBLE_MSG, 404) } if send.password_hash.is_some() {