Skip to content

LDAP case-insensitivity #189

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

LDAP case-insensitivity #189

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
26 changes: 22 additions & 4 deletions src/Services/LDAPAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,30 @@ protected function ldapOpen($username, $password)
}

if ($success && $this->autoCreate) {
$user = $this->doctrine->getRepository(User::class)->findOneBy(['username' => $username]);
// First, we'll be asking the LDAP server to give us the user name back, in case the LDAP server is case-insensitive
// See https://github.com/tchapi/davis/issues/167
$realUsername = $username;

try {
$search_results = ldap_read($ldap, $dn, '(objectclass=*)', ['uid']);
} catch (\Exception $e) {
// Probably a "No such object" error, ignore and use available credentials (username)
}

if (false !== $search_results) {
$entry = ldap_get_entries($ldap, $search_results);

if (false !== $entry && !empty($entry[0]['uid'])) {
$realUsername = $entry[0]['uid'][0];
}
}

$user = $this->doctrine->getRepository(User::class)->findOneBy(['username' => $realUsername]);

if (!$user) {
// Default fallback values
$displayName = $username;
$email = $username;
$displayName = $realUsername;
$email = $realUsername;

// Try to extract display name and email for this user.
// NB: We suppose display name is `cn` (email is configurable, generally `mail`)
Expand All @@ -201,7 +219,7 @@ protected function ldapOpen($username, $password)
}
}

$this->utils->createPasswordlessUserWithDefaultObjects($username, $displayName, $email);
$this->utils->createPasswordlessUserWithDefaultObjects($realUsername, $displayName, $email);

$em = $this->doctrine->getManager();

Expand Down