DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix LDAP location sync issue in #3993 (#4181)

Browse source 
* Ensure locations with the most specific OUs take precedence during user assignment.

* Save 'ldap_ou' Location attribute during creation.
This commit is contained in:
Richard Hofman 2017-10-10 09:06:47 +13:00 committed by snipe
parent 059f8f5bc9
commit adca7cb0c5
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,15 @@ class LdapSync extends Command
$results = Ldap::findLdapUsers(); $results = Ldap::findLdapUsers();
$ldap_ou_locations = Location::whereNotNull('ldap_ou')->get(); // Retrieve locations with a mapped OU, and sort them from the shallowest to deepest OU (see #3993)
$ldap_ou_locations = Location::whereNotNull('ldap_ou')->get()->toArray();
$ldap_ou_lengths = array();
foreach ($ldap_ou_locations as $location) {
$ldap_ou_lengths[] = strlen($location["ldap_ou"]);
}
array_multisort($ldap_ou_lengths, SORT_ASC, $ldap_ou_locations);
if (sizeof($ldap_ou_locations) > 0) { if (sizeof($ldap_ou_locations) > 0) {
LOG::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.'); LOG::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.');
@ -99,11 +107,11 @@ class LdapSync extends Command
// Grab subsets based on location-specific DNs, and overwrite location for these users. // Grab subsets based on location-specific DNs, and overwrite location for these users.
foreach ($ldap_ou_locations as $ldap_loc) { foreach ($ldap_ou_locations as $ldap_loc) {
$location_users = Ldap::findLdapUsers($ldap_loc->ldap_ou); $location_users = Ldap::findLdapUsers($ldap_loc["ldap_ou"]);
$usernames = array(); $usernames = array();
for ($i = 0; $i < $location_users["count"]; $i++) { for ($i = 0; $i < $location_users["count"]; $i++) {
$location_users[$i]["ldap_location_override"] = true; $location_users[$i]["ldap_location_override"] = true;
$location_users[$i]["location_id"] = $ldap_loc->id; $location_users[$i]["location_id"] = $ldap_loc["id"];
$usernames[] = $location_users[$i][$ldap_result_username][0]; $usernames[] = $location_users[$i][$ldap_result_username][0];
} }
@ -194,7 +202,6 @@ class LdapSync extends Command
} else { } else {
$this->info('User '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username: '.$summary[$x]['username'].' was '.strtoupper($summary[$x]['createorupdate']).'.'); $this->info('User '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username: '.$summary[$x]['username'].' was '.strtoupper($summary[$x]['createorupdate']).'.');
} }
} }
} else if ($this->option('json_summary')) { } else if ($this->option('json_summary')) {
$json_summary = [ "error" => false, "error_message" => "", "summary" => $summary ]; $json_summary = [ "error" => false, "error_message" => "", "summary" => $summary ];

1
app/Http/Controllers/LocationsController.php
View file

@ -89,6 +89,7 @@ class LocationsController extends Controller
$location->state = Input::get('state'); $location->state = Input::get('state');
$location->country = Input::get('country'); $location->country = Input::get('country');
$location->zip = Input::get('zip'); $location->zip = Input::get('zip');
$location->ldap_ou = Input::get('ldap_ou');
$location->manager_id = Input::get('manager_id'); $location->manager_id = Input::get('manager_id');
$location->user_id = Auth::id(); $location->user_id = Auth::id();