flashii/misuzu
flashii/misuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved some 2FA stuff into functions.

Browse source
This commit is contained in:
flash 2019-03-10 16:58:49 +01:00
parent 2f70c3e113
commit b0ac4a3da1
2 changed files with 38 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
public/settings.php
View file

@ -11,14 +11,7 @@ $errors = [];
$currentUserId = user_session_current('user_id');
$currentEmail = user_email_get($currentUserId);
$isRestricted = user_warning_check_restriction($currentUserId);
$getTwoFactorInfo = db_prepare('
SELECT `username`, `user_totp_key` IS NOT NULL AS `totp_enabled`
FROM `msz_users`
WHERE `user_id` = :user_id
');
$getTwoFactorInfo->bindValue('user_id', $currentUserId);
$twoFactorInfo = db_fetch($getTwoFactorInfo);
$twoFactorInfo = user_totp_info($currentUserId);
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (!csrf_verify('settings', $_POST['csrf'] ?? '')) {
@ -79,13 +72,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
if (isset($_POST['tfa']['enable']) && (bool)$twoFactorInfo['totp_enabled'] !== (bool)$_POST['tfa']['enable']) {
$updateTotpKey = db_prepare('
UPDATE `msz_users`
SET `user_totp_key` = :key
WHERE `user_id` = :user_id
');
$updateTotpKey->bindValue('user_id', $currentUserId);
if ((bool)$_POST['tfa']['enable']) {
$tfaKey = totp_generate_key();
@ -102,16 +88,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
)),
]);
$updateTotpKey->bindValue('key', $tfaKey);
user_totp_update($currentUserId, $tfaKey);
} else {
$updateTotpKey->bindValue('key', null);
user_totp_update($currentUserId, null);
}
if ($updateTotpKey->execute()) {
$twoFactorInfo['totp_enabled'] = !$twoFactorInfo['totp_enabled'];
} else {
$errors[] = 'Failed to save Two Factor Authentication state.';
}
$twoFactorInfo['totp_enabled'] = !$twoFactorInfo['totp_enabled'];
}
if (!empty($_POST['current_password'])) {

34
src/Users/user.php
View file

@ -119,6 +119,40 @@ function user_password_set(int $userId, string $password): bool
return $updatePassword->execute();
}
function user_totp_info(int $userId): array
{
if ($userId < 1) {
return [];
}
$getTwoFactorInfo = db_prepare('
SELECT `username`, `user_totp_key` IS NOT NULL AS `totp_enabled`
FROM `msz_users`
WHERE `user_id` = :user_id
');
$getTwoFactorInfo->bindValue('user_id', $userId);
return db_fetch($getTwoFactorInfo);
}
function user_totp_update(int $userId, ?string $key): void
{
if ($userId < 1) {
return;
}
$key = empty($key) ? null : $key;
$updateTotpKey = db_prepare('
UPDATE `msz_users`
SET `user_totp_key` = :key
WHERE `user_id` = :user_id
');
$updateTotpKey->bindValue('user_id', $userId);
$updateTotpKey->bindValue('key', $key);
$updateTotpKey->execute();
}
function user_email_get(int $userId): string
{
if ($userId < 1) {