mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 05:04:07 -08:00
Add --base_dn option to LdapSync command. (#4888)
This commit is contained in:
parent
dcc379c3fa
commit
5219fb63a1
|
@ -16,7 +16,7 @@ class LdapSync extends Command
|
||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--summary} {--json_summary}';
|
protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--base_dn=} {--summary} {--json_summary}';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The console command description.
|
* The console command description.
|
||||||
|
@ -67,37 +67,24 @@ class LdapSync extends Command
|
||||||
|
|
||||||
$summary = array();
|
$summary = array();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$results = Ldap::findLdapUsers();
|
if ($this->option('base_dn') != '') {
|
||||||
} catch (\Exception $e) {
|
$search_base = $this->option('base_dn');
|
||||||
if ($this->option('json_summary')) {
|
LOG::debug('Importing users from specified base DN: \"'.$search_base.'\".');
|
||||||
|
} else {
|
||||||
|
$search_base = null;
|
||||||
|
}
|
||||||
|
$results = Ldap::findLdapUsers($search_base);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
if ($this->option('json_summary')) {
|
||||||
$json_summary = [ "error" => true, "error_message" => $e->getMessage(), "summary" => [] ];
|
$json_summary = [ "error" => true, "error_message" => $e->getMessage(), "summary" => [] ];
|
||||||
$this->info(json_encode($json_summary));
|
$this->info(json_encode($json_summary));
|
||||||
}
|
}
|
||||||
LOG::error($e);
|
LOG::error($e);
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Retrieve locations with a mapped OU, and sort them from the shallowest to deepest OU (see #3993)
|
|
||||||
$ldap_ou_locations = Location::where('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) {
|
|
||||||
LOG::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Inject location information fields
|
|
||||||
for ($i = 0; $i < $results["count"]; $i++) {
|
|
||||||
$results[$i]["ldap_location_override"] = false;
|
|
||||||
$results[$i]["location_id"] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
/* Determine which location to assign users to by default. */
|
||||||
if ($this->option('location')!='') {
|
if ($this->option('location')!='') {
|
||||||
$location = Location::where('name', '=', $this->option('location'))->first();
|
$location = Location::where('name', '=', $this->option('location'))->first();
|
||||||
LOG::debug('Location name '.$this->option('location').' passed');
|
LOG::debug('Location name '.$this->option('location').' passed');
|
||||||
|
@ -107,39 +94,61 @@ class LdapSync extends Command
|
||||||
LOG::debug('Location ID '.$this->option('location_id').' passed');
|
LOG::debug('Location ID '.$this->option('location_id').' passed');
|
||||||
LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
|
LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
|
||||||
} else {
|
} else {
|
||||||
$location = NULL;
|
$location = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($location)) {
|
if (!isset($location)) {
|
||||||
LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
|
LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Grab subsets based on location-specific DNs, and overwrite location for these users.
|
/* Process locations with explicitly defined OUs, if doing a full import. */
|
||||||
foreach ($ldap_ou_locations as $ldap_loc) {
|
if ($this->option('base_dn')=='') {
|
||||||
$location_users = Ldap::findLdapUsers($ldap_loc["ldap_ou"]);
|
// Retrieve locations with a mapped OU, and sort them from the shallowest to deepest OU (see #3993)
|
||||||
$usernames = array();
|
$ldap_ou_locations = Location::where('ldap_ou', '!=', '')->get()->toArray();
|
||||||
for ($i = 0; $i < $location_users["count"]; $i++) {
|
$ldap_ou_lengths = array();
|
||||||
$location_users[$i]["ldap_location_override"] = true;
|
|
||||||
$location_users[$i]["location_id"] = $ldap_loc["id"];
|
foreach ($ldap_ou_locations as $location) {
|
||||||
$usernames[] = $location_users[$i][$ldap_result_username][0];
|
$ldap_ou_lengths[] = strlen($location["ldap_ou"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete located users from the general group.
|
array_multisort($ldap_ou_lengths, SORT_ASC, $ldap_ou_locations);
|
||||||
foreach ($results as $key => $generic_entry) {
|
|
||||||
if (in_array($generic_entry[$ldap_result_username][0], $usernames)) {
|
if (sizeof($ldap_ou_locations) > 0) {
|
||||||
unset($results[$key]);
|
LOG::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Inject location information fields
|
||||||
|
for ($i = 0; $i < $results["count"]; $i++) {
|
||||||
|
$results[$i]["ldap_location_override"] = false;
|
||||||
|
$results[$i]["location_id"] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Grab subsets based on location-specific DNs, and overwrite location for these users.
|
||||||
|
foreach ($ldap_ou_locations as $ldap_loc) {
|
||||||
|
$location_users = Ldap::findLdapUsers($ldap_loc["ldap_ou"]);
|
||||||
|
$usernames = array();
|
||||||
|
for ($i = 0; $i < $location_users["count"]; $i++) {
|
||||||
|
$location_users[$i]["ldap_location_override"] = true;
|
||||||
|
$location_users[$i]["location_id"] = $ldap_loc["id"];
|
||||||
|
$usernames[] = $location_users[$i][$ldap_result_username][0];
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$global_count = $results['count'];
|
// Delete located users from the general group.
|
||||||
$results = array_merge($location_users, $results);
|
foreach ($results as $key => $generic_entry) {
|
||||||
$results['count'] = $global_count;
|
if (in_array($generic_entry[$ldap_result_username][0], $usernames)) {
|
||||||
|
unset($results[$key]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$global_count = $results['count'];
|
||||||
|
$results = array_merge($location_users, $results);
|
||||||
|
$results['count'] = $global_count;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Create user account entries in Snipe-IT */
|
||||||
$tmp_pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20);
|
$tmp_pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20);
|
||||||
$pass = bcrypt($tmp_pass);
|
$pass = bcrypt($tmp_pass);
|
||||||
|
|
||||||
|
|
||||||
for ($i = 0; $i < $results["count"]; $i++) {
|
for ($i = 0; $i < $results["count"]; $i++) {
|
||||||
if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == "TRUE") {
|
if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == "TRUE") {
|
||||||
|
|
||||||
|
@ -207,9 +216,9 @@ class LdapSync extends Command
|
||||||
if ($this->option('summary')) {
|
if ($this->option('summary')) {
|
||||||
for ($x = 0; $x < count($summary); $x++) {
|
for ($x = 0; $x < count($summary); $x++) {
|
||||||
if ($summary[$x]['status']=='error') {
|
if ($summary[$x]['status']=='error') {
|
||||||
$this->error('ERROR: '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username: '.$summary[$x]['username'].' was not imported: '.$summary[$x]['note']);
|
$this->error('ERROR: '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username: '.$summary[$x]['username'].') was not imported: '.$summary[$x]['note']);
|
||||||
} 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')) {
|
||||||
|
|
Loading…
Reference in a new issue