DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Rework the LDAP sync command to better handle the active flag

Browse source
This commit is contained in:
Brady Wetherington 2022-02-03 15:01:45 -08:00
parent db82e06665
commit 392e61688d
2 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ class LdapSync extends Command
$ldap_result_last_name = Setting::getSettings()->ldap_lname_field; $ldap_result_last_name = Setting::getSettings()->ldap_lname_field;
$ldap_result_first_name = Setting::getSettings()->ldap_fname_field; $ldap_result_first_name = Setting::getSettings()->ldap_fname_field;
$ldap_result_active_flag = Setting::getSettings()->ldap_active_flag_field; $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag;
$ldap_result_emp_num = Setting::getSettings()->ldap_emp_num; $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num;
$ldap_result_email = Setting::getSettings()->ldap_email; $ldap_result_email = Setting::getSettings()->ldap_email;
$ldap_result_phone = Setting::getSettings()->ldap_phone_field; $ldap_result_phone = Setting::getSettings()->ldap_phone_field;
@ -192,10 +192,6 @@ class LdapSync extends Command
$user = User::where('username', $item["username"])->first(); $user = User::where('username', $item["username"])->first();
// Default to the user not being able to login. We address overriding a little further down
// with an an AD and then LDAP check that overrides
$user->activated = 0;
if ($user) { if ($user) {
// Updating an existing user. // Updating an existing user.
$item["createorupdate"] = 'updated'; $item["createorupdate"] = 'updated';
@ -203,7 +199,7 @@ class LdapSync extends Command
// Creating a new user. // Creating a new user.
$user = new User; $user = new User;
$user->password = $pass; $user->password = $pass;
$user->activated = 0; $user->activated = 1; // newly created users can log in by default, unless AD's UAC is in use, or an active flag is set (below)
$item["createorupdate"] = 'created'; $item["createorupdate"] = 'created';
} }
@ -217,8 +213,14 @@ class LdapSync extends Command
$user->country = $item["country"]; $user->country = $item["country"];
$user->department_id = $department->id; $user->department_id = $department->id;
// Sync activated state for Active Directory. \Log::error("ldap_result_active_flag: $ldap_result_active_flag, value: ".@$results[$i][$ldap_result_active_flag][0]);
if ( array_key_exists('useraccountcontrol', $results[$i]) ) {
if ( !empty($ldap_result_active_flag)) { // IF we have an 'active' flag set....
$user->activated = @$results[$i][$ldap_result_active_flag][0] ? 1 : 0; // ....then anything truthy will activate the user, period. Anything falsey will deactivate them.
} elseif (array_key_exists('useraccountcontrol', $results[$i]) ) {
// ....otherwise, (ie if no 'active' LDAP flag is defined), IF the UAC setting exists,
// ....then use the UAC setting on the account to determine can-log-in vs. cannot-log-in
/* The following is _probably_ the correct logic, but we can't use it because /* The following is _probably_ the correct logic, but we can't use it because
some users may have been dependent upon the previous behavior, and this some users may have been dependent upon the previous behavior, and this
could cause additional access to be available to users they don't want could cause additional access to be available to users they don't want
@ -250,10 +252,8 @@ class LdapSync extends Command
]; ];
$user->activated = ( in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts) ) ? 1 : 0; $user->activated = ( in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts) ) ? 1 : 0;
// If we're not using AD, and there isn't an activated flag set, activate all users } /* implied 'else' here - leave the $user->activated flag alone. Newly-created accounts will be active.
} elseif ((empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == "TRUE")) { already-existing accounts will be however the administrator has set them */
$user->activated = 1;
}
if ($item['ldap_location_override'] == true) { if ($item['ldap_location_override'] == true) {
$user->location_id = $item['location_id']; $user->location_id = $item['location_id'];

31
database/migrations/2022_02_03_214958_blank_out_ldap_active_flag.php Normal file
View file

@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use App\Models\Setting;
class BlankOutLdapActiveFlag extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
$s = Setting::getSettings();
$s->ldap_active_flag = '';
$s->save();
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}