saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-12 04:32:42 +00:00
Code Activity

Review comments

Browse source
This commit is contained in:
Daniel García 2024-01-26 20:30:10 +01:00
commit cc9e1ab79e
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/api/core/ciphers.rs
View file

@ -1123,8 +1123,12 @@ async fn save_attachment(
// the client. Upstream allows +/- 1 MiB deviation from this
// size, but it's not clear when or why this is needed.
const LEEWAY: i64 = 1024 * 1024; // 1 MiB
let min_size = attachment.file_size - LEEWAY;
let max_size = attachment.file_size + LEEWAY;
let Some(min_size) = attachment.file_size.checked_add(LEEWAY) else {
err!("Invalid attachment size min")
};
let Some(max_size) = attachment.file_size.checked_sub(LEEWAY) else {
err!("Invalid attachment size max")
};
if min_size <= size && size <= max_size {
if size != attachment.file_size {

14
src/api/core/sends.rs
View file

@ -229,9 +229,10 @@ async fn post_send_file(data: Form<UploadData<'_>>, headers: Headers, mut conn:
let size_limit = match CONFIG.user_send_limit() {
Some(0) => err!("File uploads are disabled"),
Some(limit_kb) => {
let already_used = Send::size_by_user(&headers.user.uuid, &mut conn).await;
let left = limit_kb.checked_mul(1024).and_then(|l| l.checked_sub(already_used));
let Some(left) = left else {
let Some(already_used) = Send::size_by_user(&headers.user.uuid, &mut conn).await else {
err!("Existing sends overflow")
};
let Some(left) = limit_kb.checked_mul(1024).and_then(|l| l.checked_sub(already_used)) else {
err!("Send size overflow");
};
if left <= 0 {
@ -306,9 +307,10 @@ async fn post_send_file_v2(data: JsonUpcase<SendData>, headers: Headers, mut con
let size_limit = match CONFIG.user_send_limit() {
Some(0) => err!("File uploads are disabled"),
Some(limit_kb) => {
let already_used = Send::size_by_user(&headers.user.uuid, &mut conn).await;
let left = limit_kb.checked_mul(1024).and_then(|l| l.checked_sub(already_used));
let Some(left) = left else {
let Some(already_used) = Send::size_by_user(&headers.user.uuid, &mut conn).await else {
err!("Existing sends overflow")
};
let Some(left) = limit_kb.checked_mul(1024).and_then(|l| l.checked_sub(already_used)) else {
err!("Send size overflow");
};
if left <= 0 {

6
src/db/models/send.rs
View file

@ -287,7 +287,7 @@ impl Send {
}}
}
pub async fn size_by_user(user_uuid: &str, conn: &mut DbConn) -> i64 {
pub async fn size_by_user(user_uuid: &str, conn: &mut DbConn) -> Option<i64> {
let sends = Self::find_by_user(user_uuid, conn).await;
#[allow(non_snake_case)]
@ -309,12 +309,12 @@ impl Send {
};
if let Ok(size) = size {
total = total.saturating_add(size);
total = total.checked_add(size)?;
};
}
}
total
Some(total)
}
pub async fn find_by_org(org_uuid: &str, conn: &mut DbConn) -> Vec<Self> {