mirror of
https://github.com/coollabsio/coolify.git
synced 2026-11-06 13:10:37 -04:00
Merge remote-tracking branch 'origin/next' into automation/sync-main-to-next
This commit is contained in:
@@ -2093,9 +2093,6 @@ class DatabasesController extends Controller
|
||||
return invalidTokenResponse();
|
||||
}
|
||||
|
||||
// Use a generic authorization for database creation - using PostgreSQL as representative model
|
||||
$this->authorize('create', StandalonePostgresql::class);
|
||||
|
||||
if ($request->boolean('instant_deploy')) {
|
||||
abort_unless($request->user()->tokenCan('deploy') || $request->user()->tokenCan('root'), 403, 'Missing required permissions: deploy');
|
||||
}
|
||||
@@ -2140,6 +2137,8 @@ class DatabasesController extends Controller
|
||||
if (! $environment) {
|
||||
return response()->json(['message' => 'You need to provide a valid environment_name or environment_uuid.'], 422);
|
||||
}
|
||||
// StandalonePostgresql stands for every database type: they share one policy.
|
||||
$this->authorize('create', [StandalonePostgresql::class, $environment]);
|
||||
$server = Server::whereTeamId($teamId)->whereUuid($serverUuid)->first();
|
||||
if (! $server) {
|
||||
return response()->json(['message' => 'Server not found.'], 404);
|
||||
@@ -5238,6 +5237,7 @@ class DatabasesController extends Controller
|
||||
}
|
||||
|
||||
$this->authorize('update', $database);
|
||||
$this->authorize('create', [StandalonePostgresql::class, $database->environment]);
|
||||
|
||||
if ($request->boolean('clone_volumes') && $response = $this->deployAbilityForbiddenResponse($request, 'Cloning volume data stops and starts the source resource, so it needs a token with the deploy permission.')) {
|
||||
return $response;
|
||||
|
||||
Reference in New Issue
Block a user