public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 06:45:54 +00:00
Code Issues Releases Wiki Activity

use separate database column for OTP secrets (migrate previous format if needed)

Browse Source
This commit is contained in:
Andrew Dolgov
2021-03-05 17:40:17 +03:00
parent 2aed79d729
commit 2cd159e2ce
3 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
classes/pref/prefs.php
View File

@@ -352,10 +352,6 @@ class Pref_Prefs extends Handler_Protected {
}
</script>
<?php if ($otp_enabled) {
print_notice(__("Changing your current password will disable OTP."));
} ?>
<fieldset>
<label><?= __("Old password:") ?></label>
<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='old_password'>
@@ -458,7 +454,6 @@ class Pref_Prefs extends Handler_Protected {
} else {
print_warning("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.");
print_notice("You will need to generate app passwords for the API clients if you enable OTP.");
if (function_exists("imagecreatefromstring")) {
@@ -479,7 +474,7 @@ class Pref_Prefs extends Handler_Protected {
<fieldset>
<label><?= __("OTP Key:") ?></label>
<input dojoType='dijit.form.ValidationTextBox' disabled='disabled' value="<?= $otp_secret ?>" size='32'>
<input dojoType='dijit.form.ValidationTextBox' disabled='disabled' value="<?= $otp_secret ?>" style='width : 215px'>
</fieldset>
<!-- TODO: return JSON from the backend call -->

5
classes/pref/users.php
View File

@@ -119,6 +119,11 @@ class Pref_Users extends Handler_Administrative {
$user->email = clean($_REQUEST["email"]);
$user->otp_enabled = checkbox_to_sql_bool($_REQUEST["otp_enabled"]);
// force new OTP secret when next enabled
if (Config::get_schema_version() >= 143 && !$user->otp_enabled) {
$user->otp_secret = null;
}
$user->save();
}