Server Policy: Only do owner check if checking for subuser permissions (#1521)

app/Http/Controllers/Api/Client/Servers/SubuserController.php

@@ -138,15 +138,7 @@ class SubuserController extends ClientApiController
      */
     protected function getDefaultPermissions(Request $request): array
     {
-        $allowed = Permission::permissions()
+        $allowed = Permission::permissionKeys()->all();
-            ->map(function ($value, $prefix) {
-                return array_map(function ($value) use ($prefix) {
-                    return "$prefix.$value";
-                }, array_keys($value['keys']));
-            })
-            ->flatten()
-            ->all();
-
         $cleaned = array_intersect($request->input('permissions') ?? [], $allowed);
 
         return array_unique(array_merge($cleaned, [Permission::ACTION_WEBSOCKET_CONNECT]));

app/Http/Requests/Api/Client/Servers/SendPowerRequest.php

@@ -22,7 +22,8 @@ class SendPowerRequest extends ClientApiRequest
                 return Permission::ACTION_CONTROL_RESTART;
         }
 
-        return '__invalid';
+        // Fallback for invalid signals
+        return Permission::ACTION_WEBSOCKET_CONNECT;
     }
 
     /**

app/Models/Permission.php

@@ -211,4 +211,11 @@ class Permission extends Model implements Validatable
 
         return collect($permissions);
     }
+
+    public static function permissionKeys(): Collection
+    {
+        return static::permissions()
+            ->map(fn ($value, $prefix) => array_map(fn ($value) => "$prefix.$value", array_keys($value['keys'])))
+            ->flatten();
+    }
 }

app/Policies/ServerPolicy.php

@@ -2,6 +2,7 @@
 
 namespace App\Policies;
 
+use App\Models\Permission;
 use App\Models\Server;
 use App\Models\User;
 
@@ -21,6 +22,7 @@ class ServerPolicy
             return null;
         }
 
+        if (Permission::permissionKeys()->contains($ability)) {
             // Owner has full server permissions
             if ($server->owner_id === $user->id) {
                 return true;
@@ -31,6 +33,7 @@ class ServerPolicy
             if ($subuser && in_array($ability, $subuser->permissions)) {
                 return true;
             }
+        }
 
         // Make sure user can target node of the server
         if (!$user->canTarget($server->node)) {