openinfra/openstackid
Code Issues Proposed changes

Merge "Fixed null pointer exception"

Browse Source
This commit is contained in:
Zuul 2020-03-24 01:51:42 +00:00 committed by Gerrit Code Review
commit aebb6224ce
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/libs/Auth/Models/User.php
View File

@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Event;
use App\Events\UserEmailVerified; use App\Events\UserEmailVerified;
use Doctrine\Common\Collections\Criteria; use Doctrine\Common\Collections\Criteria;
use Illuminate\Auth\Authenticatable; use Illuminate\Auth\Authenticatable;
use Illuminate\Support\Facades\Log;
use models\exceptions\ValidationException; use models\exceptions\ValidationException;
use Models\OAuth2\ApiScope; use Models\OAuth2\ApiScope;
use Models\OAuth2\Client; use Models\OAuth2\Client;
@ -804,6 +805,18 @@ class User extends BaseEntity
*/ */
public function checkPassword(string $password): bool public function checkPassword(string $password): bool
{ {
if(empty($this->password))
{
Log::warning(sprintf("User %s (%s) has not password set.", $this->id, $this->email));
return false;
}
if(empty($this->password_enc))
{
Log::warning(sprintf("User %s (%s) has not password encoding set.", $this->id, $this->email));
return false;
}
return AuthHelper::check($password, $this->password, $this->password_enc, $this->password_salt); return AuthHelper::check($password, $this->password, $this->password_enc, $this->password_salt);
} }