banquise/pelican-panel-mirror
13
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-10-29 23:26:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix user permissions service (#1819)

Browse Source
This commit is contained in:
Boy132 2025-10-22 16:00:51 +02:00 committed by GitHub
parent 430f28a847
commit 8e006ac32d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Services/Servers/GetUserPermissionsService.php
View File

@ -2,6 +2,7 @@
namespace App\Services\Servers; namespace App\Services\Servers;
use App\Models\Permission;
use App\Models\Server; use App\Models\Server;
use App\Models\Subuser; use App\Models\Subuser;
use App\Models\User; use App\Models\User;
@ -17,23 +18,26 @@ class GetUserPermissionsService
*/ */
public function handle(Server $server, User $user): array public function handle(Server $server, User $user): array
{ {
if ($user->id === $server->owner_id) { $isOwner = $user->id === $server->owner_id;
$isAdmin = $user->isAdmin() && ($user->can('view', $server) || $user->can('update', $server));
if ($isOwner && !$isAdmin) {
return ['*']; return ['*'];
} }
if ($user->isAdmin() && ($user->can('view', $server) || $user->can('update', $server))) { $adminPermissions = [
$permissions = $user->can('update', $server) ? ['*'] : ['websocket.connect', 'backup.read']; 'admin.websocket.errors',
'admin.websocket.install',
'admin.websocket.transfer',
];
$permissions[] = 'admin.websocket.errors'; if ($isAdmin) {
$permissions[] = 'admin.websocket.install'; return $isOwner || $user->can('update', $server) ? array_merge(['*'], $adminPermissions) : array_merge([Permission::ACTION_WEBSOCKET_CONNECT], $adminPermissions);
$permissions[] = 'admin.websocket.transfer';
return $permissions;
} }
/** @var Subuser|null $subuserPermissions */ /** @var Subuser|null $subuser */
$subuserPermissions = $server->subusers()->where('user_id', $user->id)->first(); $subuser = $server->subusers()->where('user_id', $user->id)->first();
return $subuserPermissions ? $subuserPermissions->permissions : []; return $subuser->permissions ?? [];
} }
} }