ilham652/webgis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SMTP connection in Docker with IPv4 force, and prevent attempts from incrementing on mail failure

Browse Source
This commit is contained in:
ilham_gmail
2026-06-11 21:27:58 +07:00
parent 3d281d570e
commit 1e0044c260
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
poverty-mapping/src/api/auth/mail_helper.php
+10 -1
View File
@@ -34,12 +34,21 @@ function send_mail_phpmailer($to, $subject, $body, $isHtml = false){
if($smtpHost){ if($smtpHost){
$mail->isSMTP(); $mail->isSMTP();
$mail->Host = $smtpHost; $mail->Host = gethostbyname($smtpHost); // Force IPv4
$mail->SMTPAuth = true; $mail->SMTPAuth = true;
$mail->Username = $smtpUser; $mail->Username = $smtpUser;
$mail->Password = $smtpPass; $mail->Password = $smtpPass;
$mail->Port = intval($smtpPort); $mail->Port = intval($smtpPort);
// Bypass SSL verification issues with IP hostname in Docker
$mail->SMTPOptions = array(
'ssl' => array(
'verify_peer' => false,
'verify_peer_name' => false,
'allow_self_signed' => true
)
);
if(strtolower($smtpEnc) === 'ssl'){ if(strtolower($smtpEnc) === 'ssl'){
$mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS; $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS;
} elseif(strtolower($smtpEnc) === 'tls'){ } elseif(strtolower($smtpEnc) === 'tls'){
poverty-mapping/src/api/auth/send_verification_code.php
+7 -4
View File
@@ -92,18 +92,21 @@ try{
// Update/Insert attempts on database // Update/Insert attempts on database
if($row){ if($row){
$newAttempts = ($row['locked_until'] && $nowTime >= strtotime($row['locked_until'])) ? 1 : ($row['attempts'] + 1); $newAttempts = $row['attempts'];
$newLockedUntil = ($newAttempts >= 3) ? date('Y-m-d H:i:s', $nowTime + 24 * 3600) : null; if($mailSuccess){
$newAttempts = ($row['locked_until'] && $nowTime >= strtotime($row['locked_until'])) ? 1 : ($row['attempts'] + 1);
}
$newLockedUntil = ($newAttempts >= 3) ? date('Y-m-d H:i:s', $nowTime + 24 * 3600) : $row['locked_until'];
$up = $conn->prepare("UPDATE verification_attempts SET attempts = ?, last_attempt_at = ?, locked_until = ?, code_hash = ?, expires_at = ? WHERE email = ?"); $up = $conn->prepare("UPDATE verification_attempts SET attempts = ?, last_attempt_at = ?, locked_until = ?, code_hash = ?, expires_at = ? WHERE email = ?");
$up->bind_param('isssss', $newAttempts, $nowStr, $newLockedUntil, $codeHash, $expiresAt, $email); $up->bind_param('isssss', $newAttempts, $nowStr, $newLockedUntil, $codeHash, $expiresAt, $email);
$up->execute(); $up->execute();
$up->close(); $up->close();
} else { } else {
$one = 1; $attemptsVal = $mailSuccess ? 1 : 0;
$nullVal = null; $nullVal = null;
$ins = $conn->prepare("INSERT INTO verification_attempts (email, attempts, last_attempt_at, locked_until, code_hash, expires_at) VALUES (?, ?, ?, ?, ?, ?)"); $ins = $conn->prepare("INSERT INTO verification_attempts (email, attempts, last_attempt_at, locked_until, code_hash, expires_at) VALUES (?, ?, ?, ?, ?, ?)");
$ins->bind_param('sissss', $email, $one, $nowStr, $nullVal, $codeHash, $expiresAt); $ins->bind_param('sissss', $email, $attemptsVal, $nowStr, $nullVal, $codeHash, $expiresAt);
$ins->execute(); $ins->execute();
$ins->close(); $ins->close();
} }