ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2024-12-26 07:09:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch '366-mfa-fixes' into develop

Browse Source
This commit is contained in:
ErickSkrauch 2017-11-21 15:40:33 +03:00
commit 55e3c65d6d
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/modules/accounts/models/EnableTwoFactorAuthForm.php
View File

@ -18,7 +18,7 @@ class EnableTwoFactorAuthForm extends AccountActionForm {
return [
['account', 'validateOtpDisabled'],
['totp', 'required', 'message' => E::TOTP_REQUIRED],
['totp', TotpValidator::class, 'account' => $this->getAccount()],
['totp', TotpValidator::class, 'account' => $this->getAccount(), 'window' => 2],
['password', PasswordRequiredValidator::class, 'account' => $this->getAccount()],
];
}

2
api/validators/TotpValidator.php
View File

@ -20,7 +20,7 @@ class TotpValidator extends Validator {
* @var int|null Задаёт окно, в промежуток которого будет проверяться код.
* Позволяет избежать ситуации, когда пользователь ввёл код в последнюю секунду
* его существования и пока шёл запрос, тот протух.
* Значение задаётся в +- кодах, а не секундах.
* Значение задаётся в +- периодах, а не секундах.
*/
public $window;

11
tests/codeception/api/functional/accounts/EnableTwoFactorAuthCest.php
View File

@ -58,4 +58,15 @@ class EnableTwoFactorAuthCest {
]);
}
public function testSuccessEnableWithNotSoExpiredCode(FunctionalTester $I) {
$accountId = $I->amAuthenticated('AccountWithOtpSecret');
$totp = TOTP::create('AAAA');
$this->route->enableTwoFactorAuth($accountId, $totp->at(time() - 35), 'password_0');
$I->canSeeResponseCodeIs(200);
$I->canSeeResponseIsJson();
$I->canSeeResponseContainsJson([
'success' => true,
]);
}
}