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

Started moving MFA and email confirmation to new login flow

Browse Source 
Instead of being soley middleware based.
This commit is contained in:
Dan Brown
2021-07-17 18:24:50 +01:00
parent 9249addb5c
commit 1278fb4969
9 changed files with 84 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Auth/Access/Mfa/MfaSession.php
View File

@@ -2,43 +2,51 @@
namespace BookStack\Auth\Access\Mfa;
use BookStack\Auth\User;
class MfaSession
{
private const MFA_VERIFIED_SESSION_KEY = 'mfa-verification-passed';
/**
* Check if MFA is required for the current user.
* Check if MFA is required for the given user.
*/
public function requiredForCurrentUser(): bool
public function isRequiredForUser(User $user): bool
{
// TODO - Test both these cases
return user()->mfaValues()->exists() || $this->currentUserRoleEnforcesMfa();
return $user->mfaValues()->exists() || $this->userRoleEnforcesMfa($user);
}
/**
* Check if a role of the current user enforces MFA.
* Check if a role of the given user enforces MFA.
*/
protected function currentUserRoleEnforcesMfa(): bool
protected function userRoleEnforcesMfa(User $user): bool
{
return user()->roles()
return $user->roles()
->where('mfa_enforced', '=', true)
->exists();
}
/**
* Check if the current MFA session has already been verified.
* Check if the current MFA session has already been verified for the given user.
*/
public function isVerified(): bool
public function isVerifiedForUser(User $user): bool
{
return session()->get(self::MFA_VERIFIED_SESSION_KEY) === 'true';
return session()->get($this->getMfaVerifiedSessionKey($user)) === 'true';
}
/**
* Mark the current session as MFA-verified.
*/
public function markVerified(): void
public function markVerifiedForUser(User $user): void
{
session()->put(self::MFA_VERIFIED_SESSION_KEY, 'true');
session()->put($this->getMfaVerifiedSessionKey($user), 'true');
}
/**
* Get the session key in which the MFA verification status is stored.
*/
protected function getMfaVerifiedSessionKey(User $user): string
{
return 'mfa-verification-passed:' . $user->id;
}
}