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

Исправлено поведение TOTP валидатора, если Closure для timestamp возвращает null

Browse Source
This commit is contained in:
ErickSkrauch 2017-02-23 02:18:25 +03:00
parent 689919fc17
commit 40239b4ee5
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/validators/TotpValidator.php
View File

@ -57,15 +57,16 @@ class TotpValidator extends Validator {
}
private function getTimestamp(): ?int {
if ($this->timestamp === null) {
$timestamp = $this->timestamp;
if (is_callable($timestamp)) {
$timestamp = call_user_func($this->timestamp);
}
if ($timestamp === null) {
return null;
}
if (is_callable($this->timestamp)) {
return (int)call_user_func($this->timestamp);
}
return (int)$this->timestamp;
return (int)$timestamp;
}
}

7
tests/codeception/api/unit/validators/TotpValidatorTest.php
View File

@ -39,6 +39,13 @@ class TotpValidatorTest extends TestCase {
$result = $this->callProtected($validator, 'validateValue', $controlTotp->at($at));
$this->assertNull($result);
$at = function() {
return null;
};
$validator->timestamp = $at;
$result = $this->callProtected($validator, 'validateValue', $controlTotp->now());
$this->assertNull($result);
$at = function() {
return time() - 700;
};