beenull/XBackBone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor bug fixes. Also added ldap_close();

Browse source
This commit is contained in:
Ben Tyger 2021-05-20 15:06:42 -04:00
parent 1d5bb6ccc7
commit 7c915032c5
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Controllers/Auth/LoginController.php
View file

@ -130,13 +130,16 @@ class LoginController extends AuthController
}
//Get LDAP user's (R)DN
$userDN=$this->getLdapRdn($username, $password, $server);
$userDN=$this->getLdapRdn($username, $server);
if (!is_string($userDN)) {
return null;
}
//Bind as user to validate password
if (!@ldap_bind($server, $this->getLdapRdn($username), $password)) {
if (@ldap_bind($server, $userDN, $password)) {
$this->logger->debug("$userDN authenticated against LDAP sucessfully");
} else {
$this->logger->debug("$userDN authenticated against LDAP unsucessfully");
if ($dbUser && !$dbUser->ldap) {
return $dbUser;
}
@ -165,7 +168,9 @@ class LoginController extends AuthController
$userQuery->create($email, $username, $password, 0, 1, (int) $this->getSetting('default_user_quota', -1), null, 1);
return $userQuery->get($request, $this->database->getPdo()->lastInsertId());
}
if ($server) ldap_close($server);
if (!password_verify($password, $dbUser->password)) {
$userQuery = make(UserQuery::class);
$userQuery->update($dbUser->id, $dbUser->email, $username, $password, $dbUser->is_admin, $dbUser->active, $dbUser->max_disk_quota, $dbUser->ldap);