mirrored/vaultwarden
1
0
Fork 1
Spiegel von https://github.com/dani-garcia/vaultwarden.git synchronisiert 2024-11-22 05:10:29 +01:00
Code Issues Releases Aktivität

Send access check fixes

Quellcode durchsuchen 
Adjust checks for max access count, expiration date, and deletion date.
The date checks aren't that important, but the access count check
currently allows one more access than it should.
Dieser Commit ist enthalten in:
Jeremy Lin 2021-03-14 23:20:49 -07:00
Ursprung 7436b454db
Commit 00d56d7295
1 geänderte Dateien mit 6 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

12
src/api/core/sends.rs
Datei anzeigen

@ -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 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); err_code!("Max access count reached", 404);
} }
} }
if let Some(expiration) = send.expiration_date { 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) 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) 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 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); err_code!("Max access count reached", 404);
} }
} }
if let Some(expiration) = send.expiration_date { 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) 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) err_code!("Send has been deleted", 404)
} }