DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed #10565, #11086: correctly looks up Manager DN from AD Manager attribute and sets manager id

Browse source
This commit is contained in:
Warren White 2022-08-19 09:09:03 -07:00
parent 40bc13a946
commit 4b9a91f55b
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/Console/Commands/LdapSync.php
View file

@ -217,15 +217,22 @@ class LdapSync extends Command
$user->department_id = $department->id; $user->department_id = $department->id;
if($item['manager'] != null) { if($item['manager'] != null) {
//Captures only the Canonical Name // Get the LDAP Manager
$item['manager'] = ltrim($item['manager'], "CN="); $ldap_manager = Ldap::findLdapUsers($item['manager'], -1, $this->option('filter'));
$item['manager'] = substr($item['manager'],0, strpos($item['manager'], ','));
$ldap_manager = User::where('username', $item['manager'])->first(); if($ldap_manager["count"] > 0) {
// Get the Managers username
$ldapManagerUsername = $ldap_manager[0][$ldap_result_username][0];
// Get User from Manager username.
$ldap_manager = User::where('username', $ldapManagerUsername)->first();
if ( $ldap_manager && isset($ldap_manager->id) ) { if ( $ldap_manager && isset($ldap_manager->id) ) {
// Link user to manager id.
$user->manager_id = $ldap_manager->id; $user->manager_id = $ldap_manager->id;
} }
} }
}
// Sync activated state for Active Directory. // Sync activated state for Active Directory.
if ( !empty($ldap_result_active_flag)) { // IF we have an 'active' flag set.... if ( !empty($ldap_result_active_flag)) { // IF we have an 'active' flag set....