mirror of
https://github.com/pelican-dev/panel.git
synced 2026-03-01 11:21:31 +03:00
[PR #919] [MERGED] Fix server access for admins without subuser #1056
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/pelican-dev/panel/pull/919
Author: @Boy132
Created: 1/16/2025
Status: ✅ Merged
Merged: 1/18/2025
Merged by: @Boy132
Base:
main← Head:boy132/fix-admin-server-access📝 Commits (10+)
57c87bafix server access for admins without subuser291e6f2add permission checks to power buttons5022118add permission check for console command sending03c2f03fix testsd83b049fix websocket token permissions9517533fix sftp accessf3a2afcfix server api + small cleanupd0fb6fbit's "update", not "edit"...44ba4fbfix tests63dd0bbMerge remote-tracking branch 'upstream/main' into boy132/fix-admin-server-access📊 Changes
13 files changed (+103 additions, -45 deletions)
View changed files
📝
app/Filament/App/Resources/ServerResource/Pages/ListServers.php(+1 -1)📝
app/Filament/Server/Pages/Console.php(+5 -0)📝
app/Filament/Server/Resources/UserResource/Pages/ListUsers.php(+21 -1)📝
app/Filament/Server/Widgets/ServerConsole.php(+6 -1)📝
app/Http/Controllers/Api/Client/ClientController.php(+2 -2)📝
app/Http/Controllers/Api/Remote/SftpAuthenticationController.php(+1 -1)📝
app/Http/Middleware/Api/Client/Server/AuthenticateServerAccess.php(+3 -3)📝
app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php(+2 -2)📝
app/Models/Permission.php(+1 -1)📝
app/Models/User.php(+28 -5)📝
app/Services/Servers/GetUserPermissionsService.php(+11 -9)📝
lang/en/server/users.php(+3 -2)📝
resources/views/filament/components/server-console.blade.php(+19 -17)📄 Description
viewpermissions they can only view the console & settings page. (read only)updatepermissions they have full control over a server (like root admins or the server owner)🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.