nickslowinski/vaultwarden-test
1
0
Fork 0
geforkt von mirrored/vaultwarden
Code Pull-Requests Aktivität

Merge pull request #1487 from jjlin/send

Quellcode durchsuchen 
Send access check fixes
Dieser Commit ist enthalten in:
Daniel García 2021-03-15 16:47:14 +01:00 committet von GitHub
Commit b9c3213b90
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
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)
} }