DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-07 03:47:32 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fixing #15064 - to not fail ldap sync on single data issue with ldap manager

Browse source
This commit is contained in:
Maciej Poleszczyk 2024-09-25 17:56:49 +02:00
parent ba12204842
commit d1e2f9db34
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -320,22 +320,29 @@ class LdapSync extends Command
] ]
]; ];
} }
$add_manager_to_cache = true;
if ($ldap_manager["count"] > 0) { if ($ldap_manager["count"] > 0) {
try {
// Get the Manager's username
// PHP LDAP returns every LDAP attribute as an array, and 90% of the time it's an array of just one item. But, hey, it's an array.
$ldapManagerUsername = $ldap_manager[0][$ldap_map["username"]][0];
// Get the Manager's username // Get User from Manager username.
// PHP LDAP returns every LDAP attribute as an array, and 90% of the time it's an array of just one item. But, hey, it's an array. $ldap_manager = User::where('username', $ldapManagerUsername)->first();
$ldapManagerUsername = $ldap_manager[0][$ldap_map["username"]][0];
// Get User from Manager username. if ($ldap_manager && isset($ldap_manager->id)) {
$ldap_manager = User::where('username', $ldapManagerUsername)->first(); // Link user to manager id.
$user->manager_id = $ldap_manager->id;
if ($ldap_manager && isset($ldap_manager->id)) { }
// Link user to manager id. } catch (\Exception $e) {
$user->manager_id = $ldap_manager->id; $add_manager_to_cache = false;
\Log::warning('Handling ldap manager ' . $item['manager'] . ' caused an exception: ' . $e->getMessage() . '. Continuing synchronization.');
} }
} }
$manager_cache[$item['manager']] = $ldap_manager && isset($ldap_manager->id) ? $ldap_manager->id : null; // Store results in cache, even if 'failed' if ($add_manager_to_cache) {
$manager_cache[$item['manager']] = $ldap_manager && isset($ldap_manager->id) ? $ldap_manager->id : null; // Store results in cache, even if 'failed'
}
} }
} }