Skip to content

A free open source IT asset/license management system

Fixed FD-54447 - superuser on user bulk edit check for groups

snipe34b4cf12e259
diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php
index 4ee6d4b06d..fdd862c957 100644
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -247,7 +247,7 @@ class BulkUsersController extends Controller
if (! empty($authFieldUpdate)) {
$user->update($authFieldUpdate);
}
- if ($request->filled('groups')) {
+ if ($request->filled('groups') && auth()->user()->isSuperUser()) {
$user->groups()->sync($request->input('groups'));
}
}
diff --git a/tests/Feature/Assets/Api/UpdateAssetTest.php b/tests/Feature/Assets/Api/UpdateAssetTest.php
index daab37514e..4516fb6f28 100644
--- a/tests/Feature/Assets/Api/UpdateAssetTest.php
+++ b/tests/Feature/Assets/Api/UpdateAssetTest.php
@@ -688,4 +688,41 @@ class UpdateAssetTest extends TestCase
'_snipeit_non_existent_custom_field_50' => 'test attribute',
])->assertStatusMessageIs('error');
}
+
+ public function test_updating_next_audit_date_creates_update_log_entry(): void
+ {
+ $asset = Asset::factory()->create(['next_audit_date' => now()->addMonths(3)->toDateString()]);
+
+ $this->actingAsForApi(User::factory()->editAssets()->create())
+ ->patchJson(route('api.assets.update', $asset), [
+ 'next_audit_date' => now()->addMonths(6)->toDateString(),
+ ])
+ ->assertOk();
+
+ $this->assertHasTheseActionLogs($asset, ['create', 'update']);
+ }
+
+ public function test_updating_next_audit_date_with_other_fields_logs_all_changes(): void
+ {
+ $asset = Asset::factory()->create([
+ 'name' => 'Old Name',
+ 'next_audit_date' => now()->addMonths(3)->toDateString(),
+ ]);
+
+ $this->actingAsForApi(User::factory()->editAssets()->create())
+ ->patchJson(route('api.assets.update', $asset), [
+ 'name' => 'New Name',
+ 'next_audit_date' => now()->addMonths(6)->toDateString(),
+ ])
+ ->assertOk();
+
+ // One update log — not suppressed by the presence of next_audit_date
+ $this->assertHasTheseActionLogs($asset, ['create', 'update']);
+
+ $logMeta = json_decode($asset->assetlog()->where('action_type', 'update')->first()->log_meta, true);
+ $this->assertArrayHasKey('name', $logMeta);
+ $this->assertArrayHasKey('next_audit_date', $logMeta);
+ $this->assertEquals('Old Name', $logMeta['name']['old']);
+ $this->assertEquals('New Name', $logMeta['name']['new']);
+ }
}
diff --git a/tests/Feature/Users/Ui/BulkActions/BulkEditUsersTest.php b/tests/Feature/Users/Ui/BulkActions/BulkEditUsersTest.php
index 17458b8fe6..5c9ab3cb98 100644
--- a/tests/Feature/Users/Ui/BulkActions/BulkEditUsersTest.php
+++ b/tests/Feature/Users/Ui/BulkActions/BulkEditUsersTest.php
@@ -2,6 +2,7 @@
namespace Tests\Feature\Users\Ui\BulkActions;
+use App\Models\Group;
use App\Models\User;
use Tests\TestCase;
@@ -120,4 +121,34 @@ class BulkEditUsersTest extends TestCase
$this->assertEquals('Shelbyville', $admin->fresh()->city);
}
+
+ public function test_superuser_can_assign_groups_via_bulk_edit()
+ {
+ $group = Group::factory()->create();
+ $target = User::factory()->create();
+
+ $this->actingAs(User::factory()->superuser()->create())
+ ->post(route('users/bulkeditsave'), [
+ 'ids' => [$target->id],
+ 'groups' => [$group->id],
+ ])
+ ->assertRedirect(route('users.index'));
+
+ $this->assertTrue($target->fresh()->groups->contains($group));
+ }
+
+ public function test_non_superuser_cannot_assign_groups_via_bulk_edit()
+ {
+ $group = Group::factory()->create();
+ $target = User::factory()->create();
+
+ $this->actingAs(User::factory()->editUsers()->create())
+ ->post(route('users/bulkeditsave'), [
+ 'ids' => [$target->id],
+ 'groups' => [$group->id],
+ ])
+ ->assertRedirect(route('users.index'));
+
+ $this->assertFalse($target->fresh()->groups->contains($group));
+ }
}