Skip to content

A free open source IT asset/license management system

Disallow self-editing of privs on user model

snipe70e1dcf1b466
diff --git a/app/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsAction.php b/app/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsAction.php
index 60b4fe5db3..b097d27987 100644
--- a/app/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsAction.php
+++ b/app/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsAction.php
@@ -13,8 +13,12 @@ final class PreserveUnauthorizedPrivilegedPermissionsAction
* @param array<string, mixed> $originalPermissions
* @return array<string, mixed>
*/
- public static function run(array $requestedPermissions, User $authenticatedUser, array $originalPermissions = []): array
+ public static function run(array $requestedPermissions, User $authenticatedUser, array $originalPermissions = [], ?User $targetUser = null): array
{
+ if ($targetUser && ! $authenticatedUser->isAdmin() && $authenticatedUser->id === $targetUser->id) {
+ return $originalPermissions;
+ }
+
if (! $authenticatedUser->isSuperUser()) {
if (array_key_exists('superuser', $originalPermissions)) {
$requestedPermissions['superuser'] = $originalPermissions['superuser'];
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 24080d0643..fa76ab3a12 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -569,6 +569,7 @@ class UsersController extends Controller
requestedPermissions: NormalizePermissionsPayloadAction::run($request->input('permissions')),
authenticatedUser: $authenticatedUser,
originalPermissions: NormalizePermissionsPayloadAction::run($user->decodePermissions()),
+ targetUser: $user,
));
}
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 254b3da4bb..ff65d05918 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -315,6 +315,7 @@ class UsersController extends Controller
requestedPermissions: NormalizePermissionsPayloadAction::run($request->input('permission')),
authenticatedUser: $authenticatedUser,
originalPermissions: $orig_permissions_array,
+ targetUser: $user,
));
// Only save groups if the user is a superuser
diff --git a/tests/Unit/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsActionTest.php b/tests/Unit/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsActionTest.php
index 697a26eefb..aa649c1021 100644
--- a/tests/Unit/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsActionTest.php
+++ b/tests/Unit/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsActionTest.php
@@ -82,4 +82,61 @@ class PreserveUnauthorizedPrivilegedPermissionsActionTest extends TestCase
$this->assertArrayNotHasKey('superuser', $normalized);
$this->assertSame('1', (string) $normalized['users.view']);
}
+
+ public function test_non_admin_cannot_grant_themselves_additional_permissions(): void
+ {
+ $actor = User::factory()->editUsers()->create();
+
+ $normalized = PreserveUnauthorizedPrivilegedPermissionsAction::run(
+ requestedPermissions: ['users.edit' => '1', 'assets.view' => '1', 'reports.view' => '1'],
+ authenticatedUser: $actor,
+ originalPermissions: ['users.edit' => '1'],
+ targetUser: $actor,
+ );
+
+ $this->assertSame(['users.edit' => '1'], $normalized);
+ }
+
+ public function test_non_admin_cannot_remove_their_own_permissions(): void
+ {
+ $actor = User::factory()->editUsers()->create();
+
+ $normalized = PreserveUnauthorizedPrivilegedPermissionsAction::run(
+ requestedPermissions: [],
+ authenticatedUser: $actor,
+ originalPermissions: ['users.edit' => '1'],
+ targetUser: $actor,
+ );
+
+ $this->assertSame(['users.edit' => '1'], $normalized);
+ }
+
+ public function test_admin_can_modify_their_own_permissions(): void
+ {
+ $actor = User::factory()->admin()->create();
+
+ $normalized = PreserveUnauthorizedPrivilegedPermissionsAction::run(
+ requestedPermissions: ['admin' => '1', 'assets.view' => '1'],
+ authenticatedUser: $actor,
+ originalPermissions: ['admin' => '1'],
+ targetUser: $actor,
+ );
+
+ $this->assertSame('1', (string) $normalized['assets.view']);
+ }
+
+ public function test_non_admin_can_modify_permissions_of_a_different_user(): void
+ {
+ $actor = User::factory()->editUsers()->create();
+ $target = User::factory()->create();
+
+ $normalized = PreserveUnauthorizedPrivilegedPermissionsAction::run(
+ requestedPermissions: ['assets.view' => '1'],
+ authenticatedUser: $actor,
+ originalPermissions: [],
+ targetUser: $target,
+ );
+
+ $this->assertSame('1', (string) $normalized['assets.view']);
+ }
}