Skip to content

Tmp ldapauth2 #11715

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 2 commits into
base: develop
Choose a base branch
from
Open

Tmp ldapauth2 #11715

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
181f2cc
Fixed #9063: Ask LDAP for user DN, don't concatenate username+baseDN.
sunflowerbofh Jul 20, 2022
7a59a9b
Adding uberbradys proposals (https://github.com/snipe/snipe-it/pull/1…
sunflowerbofh Aug 23, 2022
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
20 changes: 20 additions & 0 deletions app/Models/Ldap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public static function findAndBindUserLdap($username, $password)
$connection = self::connectToLdap();
$ldap_username_field = $settings->ldap_username_field;
$baseDn = $settings->ldap_basedn;
// userDn should *not* depend on baseDN if LDAP auth -> redeclared further down
$userDn = $ldap_username_field.'='.$username.','.$settings->ldap_basedn;

if ($settings->is_ad == '1') {
Expand All @@ -119,6 +120,25 @@ public static function findAndBindUserLdap($username, $password)

\Log::debug('Filter query: '.$filterQuery);

// userDn should be independent from baseDn (maybe you want to search in >=2 subtrees)
// -> better ask LDAP for user dn, that's why it is for
if ($settings->is_ad != '1') {
$userresults = ldap_search($connection, $baseDn, $filterQuery);
$userentries = ldap_get_entries($connection, $userresults);
// Can be empty if user does not exist
if ( $userentries["count"] == 1 ) {
$dn = $userentries[0]['dn'];
if ( $dn ) {
\Log::debug('User dn is: ' .$dn);
$userDn = $dn;
} else {
\Log::debug('User dn is empty.');
}
} else {
\Log::debug('Status of LDAP entries for user ' .$username. ': ' .$userentries["count"]. ' result(s).');
}
}

if (! $ldapbind = @ldap_bind($connection, $userDn, $password)) {
\Log::debug("Status of binding user: $userDn to directory: (directly!) ".($ldapbind ? "success" : "FAILURE"));
if (! $ldapbind = self::bindAdminToLdap($connection)) {
Expand Down