AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-08-06 15:47:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Possible duplicate emails in a race condition in mail queue

Browse Source
This commit is contained in:
johnnyq
2026-07-27 16:59:10 -04:00
parent 775e8f58f6
commit 686fca99e1
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cron/mail_queue.php
View File

@@ -326,7 +326,12 @@ if (mysqli_num_rows($sql_queue) > 0) {
continue; continue;
} }
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 1 WHERE email_id = $email_id"); // Claim the row - the conditional UPDATE is the lock. If another run already took
// this email, skip it rather than sending the client a second copy.
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 1 WHERE email_id = $email_id AND email_status = 0");
if (mysqli_affected_rows($mysqli) !== 1) {
continue;
}
// Basic recipient syntax check // Basic recipient syntax check
if (!filter_var($email_recipient, FILTER_VALIDATE_EMAIL)) { if (!filter_var($email_recipient, FILTER_VALIDATE_EMAIL)) {
@@ -412,7 +417,11 @@ if (mysqli_num_rows($sql_failed_queue) > 0) {
$email_ics_str = $rowf['email_cal_str']; $email_ics_str = $rowf['email_cal_str'];
$email_attempts = (int)$rowf['email_attempts'] + 1; $email_attempts = (int)$rowf['email_attempts'] + 1;
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 1 WHERE email_id = $email_id"); // Claim the row - same lock as the send path, from the failed state this time.
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 1 WHERE email_id = $email_id AND email_status = 2");
if (mysqli_affected_rows($mysqli) !== 1) {
continue;
}
if (!filter_var($email_recipient, FILTER_VALIDATE_EMAIL)) { if (!filter_var($email_recipient, FILTER_VALIDATE_EMAIL)) {
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_attempts = $email_attempts WHERE email_id = $email_id"); mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_attempts = $email_attempts WHERE email_id = $email_id");