A free open source IT asset/license management system
Disallow ldap_import and activated in bulk editing users if user doesn’t have permission
sniped74197aacc2f
diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.phpindex 2cee056fd4..4ee6d4b06d 100644--- a/app/Http/Controllers/Users/BulkUsersController.php+++ b/app/Http/Controllers/Users/BulkUsersController.php@@ -8,7 +8,6 @@ use App\Http\Controllers\Controller;use App\Models\Accessory;use App\Models\Actionlog;use App\Models\Asset;-use App\Models\Company;use App\Models\ConsumableAssignment;use App\Models\Group;use App\Models\License;@@ -169,10 +168,9 @@ class BulkUsersController extends Controller$this->conditionallyAddItem('location_id')->conditionallyAddItem('department_id')+ ->conditionallyAddItem('company_id')->conditionallyAddItem('locale')->conditionallyAddItem('remote')- ->conditionallyAddItem('ldap_import')- ->conditionallyAddItem('activated')->conditionallyAddItem('display_name')->conditionallyAddItem('start_date')->conditionallyAddItem('end_date')@@ -202,7 +200,7 @@ class BulkUsersController extends Controller$this->update_array['manager_id'] = null;}- if ($request->input('null_company_ids') == '1') {+ if ($request->input('null_company_id') == '1') {$this->update_array['company_id'] = null;}@@ -235,27 +233,21 @@ class BulkUsersController extends Controller->update(['location_id' => $this->update_array['location_id']]);}- // Handle company pivot sync separately from the mass update.- // company_ids[] comes from the multi-select; null_company_ids clears all memberships.- $bulkCompanyIds = array_filter(array_map('intval', (array) $request->input('company_ids', [])));- $clearCompanies = $request->input('null_company_ids') == '1';-- if ($bulkCompanyIds || $clearCompanies) {- $allowedIds = Company::getIdsForCurrentUser($bulkCompanyIds);- // Also update the scalar company_id column for display/backward compat.- $scalarCompanyId = $allowedIds[0] ?? null;- User::whereIn('id', $user_raw_array)->where('id', '!=', auth()->id())- ->update(['company_id' => $scalarCompanyId]);- foreach ($users as $user) {- $user->companies()->sync($allowedIds);- }- }-- // Only sync groups if groups were selected- if ($request->filled('groups')) {-- foreach ($users as $user) {- if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {+ // Fields that require canEditAuthFields (non-admins cannot touch admins/superusers,+ // admins cannot touch superusers) must be applied per-user, not via mass update.+ foreach ($users as $user) {+ if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {+ $authFieldUpdate = [];+ if ($request->filled('activated')) {+ $authFieldUpdate['activated'] = $request->input('activated');+ }+ if ($request->filled('ldap_import')) {+ $authFieldUpdate['ldap_import'] = $request->input('ldap_import');+ }+ if (! empty($authFieldUpdate)) {+ $user->update($authFieldUpdate);+ }+ if ($request->filled('groups')) {$user->groups()->sync($request->input('groups'));}}@@ -414,7 +406,7 @@ class BulkUsersController extends Controller*/public function merge(Request $request){- $this->authorize('update', User::class);+ $this->authorize('delete', User::class);if (config('app.lock_passwords')) {return redirect()->route('users.index')->with('error', trans('general.feature_disabled'));@@ -435,6 +427,10 @@ class BulkUsersController extends Controller// Walk usersforeach ($users_to_merge as $user_to_merge) {+ if (! auth()->user()->can('canEditAuthFields', $user_to_merge) || ! auth()->user()->can('editableOnDemo')) {+ return redirect()->route('users.index')->with('error', trans('general.insufficient_permissions'));+ }+foreach ($user_to_merge->assets as $asset) {Log::debug('Updating asset: '.$asset->asset_tag.' to '.$merge_into_user->id);$asset->assigned_to = $request->input('merge_into_id');@@ -477,12 +473,6 @@ class BulkUsersController extends Controller$managedLocation->save();}- // Carry over company pivot memberships from the merged user into the target.- $mergedCompanyIds = $user_to_merge->companies()->pluck('companies.id')->toArray();- if (! empty($mergedCompanyIds)) {- $merge_into_user->companies()->syncWithoutDetaching($mergedCompanyIds);- }-$user_to_merge->delete();event(new UserMerged($user_to_merge, $merge_into_user, $admin));diff --git a/tests/Feature/Users/Ui/BulkActions/BulkEditUsersTest.php b/tests/Feature/Users/Ui/BulkActions/BulkEditUsersTest.phpindex 5c9ab3cb98..4e90825d3c 100644--- a/tests/Feature/Users/Ui/BulkActions/BulkEditUsersTest.php+++ b/tests/Feature/Users/Ui/BulkActions/BulkEditUsersTest.php@@ -2,7 +2,11 @@namespace Tests\Feature\Users\Ui\BulkActions;+<<<<<<< HEADuse App\Models\Group;+=======+use App\Models\Asset;+>>>>>>> 403f9c848b (Disallow ldap_import and activated in bulk editing users if user doesn’t have permission)use App\Models\User;use Tests\TestCase;@@ -121,6 +125,7 @@ class BulkEditUsersTest extends TestCase$this->assertEquals('Shelbyville', $admin->fresh()->city);}+<<<<<<< HEADpublic function test_superuser_can_assign_groups_via_bulk_edit(){@@ -151,4 +156,6 @@ class BulkEditUsersTest extends TestCase$this->assertFalse($target->fresh()->groups->contains($group));}+=======+>>>>>>> 403f9c848b (Disallow ldap_import and activated in bulk editing users if user doesn’t have permission)}