Hamza/Siro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix timezone bug in request.php using MySQL DATE_ADD and clean up EncryptionHelper

Browse Source
This commit is contained in:
Hamza-Ayed
2026-06-24 23:03:45 +03:00
parent 12dfb25629
commit 7b0283473e
2 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
backend/auth/otp/request.php
View File

@@ -123,8 +123,6 @@ if ($sentSuccessfully) {
$encryptedOtp = $encryptionHelper->encryptData($otp); $encryptedOtp = $encryptionHelper->encryptData($otp);
$encryptedEmail = !empty($email) ? $encryptionHelper->encryptData($email) : ''; $encryptedEmail = !empty($email) ? $encryptionHelper->encryptData($email) : '';
$expirationTime = date('Y-m-d H:i:s', strtotime('+5 minutes'));
try { try {
if ($user_type === 'admin') { if ($user_type === 'admin') {
$stmt = $con->prepare("INSERT INTO token_verification_admin (phone_number, token, expiration_time) $stmt = $con->prepare("INSERT INTO token_verification_admin (phone_number, token, expiration_time)
@@ -138,12 +136,11 @@ if ($sentSuccessfully) {
$stmtIns = $con->prepare(" $stmtIns = $con->prepare("
INSERT INTO `phone_verification_service` INSERT INTO `phone_verification_service`
(`phone_number`, `token_code`, `expiration_time`, `is_verified`, `created_at`) (`phone_number`, `token_code`, `expiration_time`, `is_verified`, `created_at`)
VALUES (?, ?, ?, 0, NOW()) VALUES (?, ?, DATE_ADD(NOW(), INTERVAL 5 MINUTE), 0, NOW())
"); ");
$stmtIns->execute([ $stmtIns->execute([
$encryptedPhone, $encryptedPhone,
$encryptedOtp, $encryptedOtp
$expirationTime
]); ]);
} elseif ($user_type === 'driver') { } elseif ($user_type === 'driver') {
if ($context === 'token_change') { if ($context === 'token_change') {
@@ -155,12 +152,11 @@ if ($sentSuccessfully) {
$stmtIns = $con->prepare(" $stmtIns = $con->prepare("
INSERT INTO `token_verification_driver` INSERT INTO `token_verification_driver`
(`phone_number`, `token`, `expiration_time`, `verified`, `created_at`) (`phone_number`, `token`, `expiration_time`, `verified`, `created_at`)
VALUES (?, ?, ?, 0, NOW()) VALUES (?, ?, DATE_ADD(NOW(), INTERVAL 5 MINUTE), 0, NOW())
"); ");
$stmtIns->execute([ $stmtIns->execute([
$encryptedPhone, $encryptedPhone,
$encryptedOtp, $encryptedOtp
$expirationTime
]); ]);
} else { } else {
// Delete old verification attempts // Delete old verification attempts
@@ -171,14 +167,13 @@ if ($sentSuccessfully) {
$stmtIns = $con->prepare(" $stmtIns = $con->prepare("
INSERT INTO `phone_verification` INSERT INTO `phone_verification`
(`phone_number`, `driverId`, `email`, `token_code`, `expiration_time`, `is_verified`, `created_at`) (`phone_number`, `driverId`, `email`, `token_code`, `expiration_time`, `is_verified`, `created_at`)
VALUES (?, ?, ?, ?, ?, 0, NOW()) VALUES (?, ?, ?, ?, DATE_ADD(NOW(), INTERVAL 5 MINUTE), 0, NOW())
"); ");
$stmtIns->execute([ $stmtIns->execute([
$encryptedPhone, $encryptedPhone,
$driverId ?: '', $driverId ?: '',
$encryptedEmail, $encryptedEmail,
$encryptedOtp, $encryptedOtp
$expirationTime
]); ]);
} }
} else { } else {
@@ -191,12 +186,11 @@ if ($sentSuccessfully) {
$stmtIns = $con->prepare(" $stmtIns = $con->prepare("
INSERT INTO `token_verification` INSERT INTO `token_verification`
(`phone_number`, `token`, `expiration_time`, `verified`, `created_at`) (`phone_number`, `token`, `expiration_time`, `verified`, `created_at`)
VALUES (?, ?, ?, 0, NOW()) VALUES (?, ?, DATE_ADD(NOW(), INTERVAL 5 MINUTE), 0, NOW())
"); ");
$stmtIns->execute([ $stmtIns->execute([
$encryptedPhone, $encryptedPhone,
$encryptedOtp, $encryptedOtp
$expirationTime
]); ]);
} else { } else {
// Delete old verification attempts // Delete old verification attempts
@@ -207,12 +201,11 @@ if ($sentSuccessfully) {
$stmtIns = $con->prepare(" $stmtIns = $con->prepare("
INSERT INTO `phone_verification_passenger` INSERT INTO `phone_verification_passenger`
(`phone_number`, `token`, `expiration_time`, `verified`, `created_at`) (`phone_number`, `token`, `expiration_time`, `verified`, `created_at`)
VALUES (?, ?, ?, 0, NOW()) VALUES (?, ?, DATE_ADD(NOW(), INTERVAL 5 MINUTE), 0, NOW())
"); ");
$stmtIns->execute([ $stmtIns->execute([
$encryptedPhone, $encryptedPhone,
$encryptedOtp, $encryptedOtp
$expirationTime
]); ]);
} }
} }

9
backend/core/Security/EncryptionHelper.php
View File

@@ -34,15 +34,6 @@ class EncryptionHelper
return self::PREFIX_GCM . base64_encode($iv . $tag . $encrypted); return self::PREFIX_GCM . base64_encode($iv . $tag . $encrypted);
} }
// ─── تشفير نص باستخدام AES-256-CBC الحتمي ──
public function encryptDataDeterministic(string $plainText): string
{
$plainText = mb_convert_encoding($plainText, 'UTF-8');
$padded = $this->addPadding($plainText);
$encrypted = openssl_encrypt($padded, self::ALGO_CBC, $this->key, OPENSSL_RAW_DATA, $this->cbcIv);
return base64_encode($encrypted);
}
// ─── فك تشفير نص (يدعم CBC والـ GCM المستقبلي) ─────────── // ─── فك تشفير نص (يدعم CBC والـ GCM المستقبلي) ───────────
public function decryptData(string $cipherText): string|false public function decryptData(string $cipherText): string|false
{ {