Skip to content

BUGFIX: Fix LDAP bind failed if login from different location #17

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

Open
manmath wants to merge 1 commit into
base: master
Choose a base branch
from
Open

BUGFIX: Fix LDAP bind failed if login from different location #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions Classes/Service/BindProvider/LdapBind.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,20 @@ class LdapBind extends AbstractBindProvider
public function bind($username, $password)
{
$bindDn = Arrays::getValueByPath($this->options, 'bind.dn');
$bindPassword = Arrays::getValueByPath($this->options, 'bind.password');
if (!empty($username) && !empty($password)) {
// if credentials are given, use them to authenticate
$this->bindWithDn(sprintf($bindDn, $username), $password);
if (empty($bindPassword)) {
// if credentials are given, use them to authenticate
$this->bindWithDn(sprintf($bindDn, $username), $password);
} else {
// if the settings specify a bind password, we are safe to assume no anonymous authentication is needed
$this->bindWithDn($bindDn, $bindPassword);
}
return;
}

$bindPassword = Arrays::getValueByPath($this->options, 'bind.password');
if (!empty($bindPassword)) {
// if the settings specify a bind password, we are safe to assume no anonymous authentication is needed
$this->bindWithDn($bindDn, $bindPassword);
}

$anonymousBind = Arrays::getValueByPath($this->options, 'bind.anonymous');
if ($anonymousBind === true) {
if ($anonymousBind) {
// if allowed, bind without username or password
$this->bindAnonymously();
}
Expand Down
2 changes: 2 additions & 0 deletions Classes/Service/DirectoryService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ public function authenticate($username, $password)
throw new Exception('Error while authenticating: authenticated user could not be fetched from the directory', 1488289104);
}

$this->bindProvider->verifyCredentials($entries[0]['dn'], $password);

return $entries[0];
}

Expand Down