webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Added TOTP verification upon access

Browse Source
This commit is contained in:
Dan Brown
2021-08-02 15:04:43 +01:00
parent 1af5bbf3f7
commit a3f19ebe96
8 changed files with 146 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Auth/Access/LoginService.php
View File

@ -70,7 +70,7 @@ class LoginService
*/
public function reattemptLoginFor(User $user, string $method)
{
if ($user->id !== $this->getLastLoginAttemptUser()) {
if ($user->id !== ($this->getLastLoginAttemptUser()->id ?? null)) {
throw new Exception('Login reattempt user does align with current session state');
}

18
app/Auth/Access/Mfa/MfaValue.php
View File

@ -44,10 +44,24 @@ class MfaValue extends Model
$mfaVal->save();
}
/**
* Easily get the decrypted MFA value for the given user and method.
*/
public static function getValueForUser(User $user, string $method): ?string
{
/** @var MfaValue $mfaVal */
$mfaVal = static::query()
->where('user_id', '=', $user->id)
->where('method', '=', $method)
->first();
return $mfaVal ? $mfaVal->getValue() : null;
}
/**
* Decrypt the value attribute upon access.
*/
public function getValue(): string
protected function getValue(): string
{
return decrypt($this->value);
}
@ -55,7 +69,7 @@ class MfaValue extends Model
/**
* Encrypt the value attribute upon access.
*/
public function setValue($value): void
protected function setValue($value): void
{
$this->value = encrypt($value);
}