octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-22 19:09:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1487 from jjlin/send

Browse Source 
Send access check fixes
This commit is contained in:
Daniel García 2021-03-15 16:47:14 +01:00 committed by GitHub
commit b9c3213b90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/core/sends.rs
View File

@ -197,18 +197,18 @@ fn post_access(access_id: String, data: JsonUpcase<SendAccessData>, conn: DbConn
};
if let Some(max_access_count) = send.max_access_count {
if send.access_count > max_access_count {
if send.access_count >= max_access_count {
err_code!("Max access count reached", 404);
}
}
if let Some(expiration) = send.expiration_date {
if Utc::now().naive_utc() > expiration {
if Utc::now().naive_utc() >= expiration {
err_code!("Send has expired", 404)
}
}
if Utc::now().naive_utc() > send.deletion_date {
if Utc::now().naive_utc() >= send.deletion_date {
err_code!("Send has been deleted", 404)
}
@ -248,18 +248,18 @@ fn post_access_file(
};
if let Some(max_access_count) = send.max_access_count {
if send.access_count > max_access_count {
if send.access_count >= max_access_count {
err_code!("Max access count reached", 404);
}
}
if let Some(expiration) = send.expiration_date {
if Utc::now().naive_utc() > expiration {
if Utc::now().naive_utc() >= expiration {
err_code!("Send has expired", 404)
}
}
if Utc::now().naive_utc() > send.deletion_date {
if Utc::now().naive_utc() >= send.deletion_date {
err_code!("Send has been deleted", 404)
}