-
-
- @if ($server->proxySet())
-
-
- @endif
+@php
+ $serverPageItems = [
+ [
+ 'label' => 'Configuration',
+ 'route' => 'server.show',
+ 'active' => request()->routeIs('server.show', 'server.advanced', 'server.private-key', 'server.cloud-provider-token', 'server.ca-certificate', 'server.cloudflare-tunnel', 'server.docker-cleanup', 'server.destinations', 'server.log-drains', 'server.metrics', 'server.swarm', 'server.delete'),
+ ],
+ [
+ 'label' => 'Proxy',
+ 'route' => 'server.proxy',
+ 'active' => request()->routeIs('server.proxy', 'server.proxy.*'),
+ 'visible' => ! $server->isSwarmWorker() && ! $server->settings->is_build_server,
+ ],
+ [
+ 'label' => 'Sentinel',
+ 'route' => 'server.sentinel',
+ 'active' => request()->routeIs('server.sentinel', 'server.sentinel.*'),
+ 'visible' => $server->isFunctional() && ! $server->isSwarm() && ! $server->settings->is_build_server && auth()->user()?->can('viewSentinel', $server),
+ ],
+ [
+ 'label' => 'Resources',
+ 'route' => 'server.resources',
+ 'active' => request()->routeIs('server.resources'),
+ ],
+ [
+ 'label' => 'Terminal',
+ 'route' => 'server.command',
+ 'active' => request()->routeIs('server.command'),
+ 'navigate' => false,
+ 'visible' => auth()->user()?->can('canAccessTerminal'),
+ ],
+ [
+ 'label' => 'Security',
+ 'route' => 'server.security.patches',
+ 'active' => request()->routeIs('server.security.patches'),
+ 'visible' => auth()->user()?->can('update', $server),
+ ],
+ ];
+ $proxyMenuItems = [
+ [
+ 'label' => 'Configuration',
+ 'route' => 'server.proxy',
+ 'active' => request()->routeIs('server.proxy'),
+ ],
+ [
+ 'label' => 'Dynamic Configurations',
+ 'route' => 'server.proxy.dynamic-confs',
+ 'active' => request()->routeIs('server.proxy.dynamic-confs'),
+ 'visible' => $server->proxySet(),
+ ],
+ [
+ 'label' => 'Logs',
+ 'route' => 'server.proxy.logs',
+ 'active' => request()->routeIs('server.proxy.logs'),
+ 'visible' => $server->proxySet(),
+ 'navigate' => false,
+ ],
+ ];
+
+ $serverPageItems = array_values(array_filter(
+ $serverPageItems,
+ fn (array $item): bool => $item['visible'] ?? true,
+ ));
+ $proxyMenuItems = array_values(array_filter(
+ $proxyMenuItems,
+ fn (array $item): bool => $item['visible'] ?? true,
+ ));
+ $activeProxyMenuItem = collect($proxyMenuItems)->firstWhere('active', true) ?? $proxyMenuItems[0];
+ $activeProxyMenuValue = (($activeProxyMenuItem['navigate'] ?? true) ? 'navigate' : 'location').'|proxy|'.route($activeProxyMenuItem['route'], $parameters);
+@endphp
+
+
+
+
+
+
+
+
diff --git a/resources/views/components/server/sidebar-security.blade.php b/resources/views/components/server/sidebar-security.blade.php
index e61d23c89..1c30b0ad3 100644
--- a/resources/views/components/server/sidebar-security.blade.php
+++ b/resources/views/components/server/sidebar-security.blade.php
@@ -1,10 +1,127 @@
-
@@ -154,9 +149,9 @@ class="flex items-center justify-center size-4 text-black dark:text-white rounde
No servers found.
@can('create', App\Models\Server::class)
@else
+ class="flex-shrink-0 w-10 h-10 rounded-full bg-warning/20 flex items-center justify-center">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
...and many more at [GitHub Sponsors](https://github.com/sponsors/coollabsio)
diff --git a/app/Actions/Database/StartDatabaseProxy.php b/app/Actions/Database/StartDatabaseProxy.php
index 1057d1e4d..1061394e6 100644
--- a/app/Actions/Database/StartDatabaseProxy.php
+++ b/app/Actions/Database/StartDatabaseProxy.php
@@ -143,8 +143,6 @@ public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|St
)
);
- ray("Database proxy for {$database->name} disabled due to non-transient error: {$e->getMessage()}");
-
return;
}
diff --git a/app/Actions/Destination/RemoveStandaloneDockerNetwork.php b/app/Actions/Destination/RemoveStandaloneDockerNetwork.php
new file mode 100644
index 000000000..21c40a50a
--- /dev/null
+++ b/app/Actions/Destination/RemoveStandaloneDockerNetwork.php
@@ -0,0 +1,16 @@
+network);
+
+ instant_remote_process(["docker network disconnect {$safeNetwork} coolify-proxy"], $destination->server, throwError: false);
+ instant_remote_process(["docker network rm -f {$safeNetwork}"], $destination->server);
+ }
+}
diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php
index c186c8042..d437a3a17 100644
--- a/app/Actions/Fortify/CreateNewUser.php
+++ b/app/Actions/Fortify/CreateNewUser.php
@@ -4,7 +4,9 @@
use App\Models\Team;
use App\Models\User;
+use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use Illuminate\Validation\Rules\Password;
@@ -12,6 +14,16 @@
class CreateNewUser implements CreatesNewUsers
{
+ private const REGISTRATION_IP_MAX_ATTEMPTS = 3;
+
+ private const REGISTRATION_IP_DECAY_SECONDS = 600;
+
+ private const REGISTRATION_EMAIL_IDENTITY_MAX_ATTEMPTS = 3;
+
+ private const REGISTRATION_EMAIL_IDENTITY_DECAY_SECONDS = 3600;
+
+ public function __construct(private readonly Request $request) {}
+
/**
* Validate and create a newly registered user.
*
@@ -23,6 +35,9 @@ public function create(array $input): User
if (! $settings->isPasswordRegistrationAllowed()) {
abort(403);
}
+
+ $this->ensureRegistrationIsNotRateLimited($input);
+
Validator::make($input, [
'name' => ['required', 'string', 'max:255'],
'email' => [
@@ -72,4 +87,42 @@ public function create(array $input): User
return $user;
}
+
+ /**
+ * @param array