Skip to content

fix: Ensure banned users are not allowed to log in. #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2024
Merged

fix: Ensure banned users are not allowed to log in. #167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c3b702
check for blocked users and prevent them from logging in
warcooft Sep 8, 2024
8b331e5
apply coding standar suggest
warcooft Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/Controllers/OAuthController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ class OAuthController extends BaseController implements ControllersInterface
{
private const ACCESS_DENIED = 'access_denied';

private ?User $userExist = null;

public function redirectOAuth(string $oauthName): RedirectResponse
{
// if user login
Expand Down Expand Up @@ -89,10 +91,7 @@ public function callBack(): RedirectResponse
$updateFields = $oauthClass->getColumnsName('syncingUserInfo', $userInfo);

$userid = $this->syncingUserInfo($find, $updateFields);
}

// Create new user if credentials not exist or let users register themselves
if ($this->checkExistenceUser($find) === false) {
} else {
// Check config setting first to see if it can register automatically or not
if (config('ShieldOAuthConfig')->oauthConfigs[$oauthName]['allow_register'] === false) {
return redirect()->to(config('Auth')->logoutRedirect())->with('error', lang('ShieldOAuthLang.Callback.account_not_found', [$userInfo->email]));
Expand All @@ -112,6 +111,10 @@ public function callBack(): RedirectResponse
$users->addToDefaultGroup($user);
}

if ($this->userExist->isBanned()) {
return redirect()->to(config('Auth')->logoutRedirect())->with('error', $this->userExist->getBanMessage() ?? lang('Auth.bannedUser'));
}

auth()->loginById($userid);
$this->recordLoginAttempt($oauthName, $userInfo->email);

Expand Down Expand Up @@ -143,6 +146,8 @@ private function checkExistenceUser(array $find = []): bool
// $find = ['email' => $this->userInfo()->email];
$findUser = $users->findByCredentials($find);

$this->userExist = $findUser;

return $findUser !== null;
}

Expand Down