An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
feat: harden auth flows and server mobile navigation
Andras Bacsaib0f0f7d8d03e
diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.phpindex cddf663897..44a03c17da 100644--- a/app/Actions/Fortify/CreateNewUser.php+++ b/app/Actions/Fortify/CreateNewUser.php@@ -4,7 +4,9 @@ namespace App\Actions\Fortify;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 @@ use Laravel\Fortify\Contracts\CreatesNewUsers;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 @@ class CreateNewUser implements CreatesNewUsersif (! $settings->is_registration_enabled) {abort(403);}++ $this->ensureRegistrationIsNotRateLimited($input);+Validator::make($input, ['name' => ['required', 'string', 'max:255'],'email' => [@@ -72,4 +87,42 @@ class CreateNewUser implements CreatesNewUsersreturn $user;}++ /**+ * @param array<string, string> $input+ */+ private function ensureRegistrationIsNotRateLimited(array $input): void+ {+ $keys = [+ [+ 'key' => 'registration:ip:'.sha1($this->realIp()),+ 'max' => self::REGISTRATION_IP_MAX_ATTEMPTS,+ 'decay' => self::REGISTRATION_IP_DECAY_SECONDS,+ ],+ ];++ $emailIdentity = normalize_email_identity($input['email'] ?? null);+ if ($emailIdentity !== null) {+ $keys[] = [+ 'key' => 'registration:email-identity:'.sha1($emailIdentity),+ 'max' => self::REGISTRATION_EMAIL_IDENTITY_MAX_ATTEMPTS,+ 'decay' => self::REGISTRATION_EMAIL_IDENTITY_DECAY_SECONDS,+ ];+ }++ foreach ($keys as $limit) {+ if (RateLimiter::tooManyAttempts($limit['key'], $limit['max'])) {+ abort(429, 'Too many registration attempts. Please try again later.');+ }+ }++ foreach ($keys as $limit) {+ RateLimiter::hit($limit['key'], $limit['decay']);+ }+ }++ private function realIp(): string+ {+ return $this->request->server('REMOTE_ADDR') ?? $this->request->ip();+ }}diff --git a/app/Livewire/Server/Navbar.php b/app/Livewire/Server/Navbar.phpindex cd9cfcba64..73c256cbed 100644--- a/app/Livewire/Server/Navbar.php+++ b/app/Livewire/Server/Navbar.php@@ -39,6 +39,7 @@ class Navbar extends Componentreturn ['refreshServerShow' => 'refreshServer',"echo-private:team.{$teamId},ProxyStatusChangedUI" => 'showNotification',+ "echo-private:team.{$teamId},SentinelRestarted" => 'refreshSentinelStatus',];}@@ -203,6 +204,15 @@ class Navbar extends Component$this->server->load('settings');}+ public function refreshSentinelStatus($event = null): void+ {+ if (isset($event['serverUuid']) && $event['serverUuid'] !== $this->server->uuid) {+ return;+ }++ $this->refreshServer();+ }+/*** Check if Traefik has any outdated version info (patch or minor upgrade).* This shows a warning indicator in the navbar.diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.phpindex 85f38b9670..1b201fb3f9 100644--- a/app/Providers/FortifyServiceProvider.php+++ b/app/Providers/FortifyServiceProvider.php@@ -7,6 +7,7 @@ use App\Actions\Fortify\ResetUserPassword;use App\Actions\Fortify\UpdateUserPassword;use App\Actions\Fortify\UpdateUserProfileInformation;use App\Models\OauthSetting;+use App\Models\TeamInvitation;use App\Models\User;use Illuminate\Cache\RateLimiting\Limit;use Illuminate\Http\Request;@@ -82,7 +83,7 @@ class FortifyServiceProvider extends ServiceProvider$user->save();// Check if user has a pending invitation they haven't accepted yet- $invitation = \App\Models\TeamInvitation::whereEmail($email)->first();+ $invitation = TeamInvitation::whereEmail($email)->first();if ($invitation && $invitation->isValid()) {// User is logging in for the first time after being invited// Attach them to the invited team if not already attached@@ -130,7 +131,16 @@ class FortifyServiceProvider extends ServiceProvider// Use real client IP (not spoofable forwarded headers)$realIp = $request->server('REMOTE_ADDR') ?? $request->ip();- return Limit::perMinute(5)->by($realIp);+ $limits = [+ Limit::perMinutes(10, 3)->by('forgot-password:ip:'.sha1($realIp)),+ ];++ $emailIdentity = normalize_email_identity($request->input('email'));+ if ($emailIdentity !== null) {+ $limits[] = Limit::perHour(3)->by('forgot-password:email-identity:'.sha1($emailIdentity));+ }++ return $limits;});RateLimiter::for('login', function (Request $request) {diff --git a/bootstrap/helpers/email.php b/bootstrap/helpers/email.phpnew file mode 100644index 0000000000..a0b8ba67ff--- /dev/null+++ b/bootstrap/helpers/email.php@@ -0,0 +1,20 @@+<?php++use Illuminate\Support\Str;++function normalize_email_identity(?string $email): ?string+{+ if (blank($email) || ! str_contains($email, '@')) {+ return null;+ }++ [$localPart, $domain] = explode('@', Str::lower($email), 2);+ $localPart = Str::before($localPart, '+');+ $localPart = str_replace('.', '', $localPart);++ if (blank($localPart) || blank($domain)) {+ return null;+ }++ return $localPart.'@'.$domain;+}diff --git a/resources/views/components/resources/breadcrumbs.blade.php b/resources/views/components/resources/breadcrumbs.blade.phpindex 975a1bf4b4..898f684c0e 100644--- a/resources/views/components/resources/breadcrumbs.blade.php+++ b/resources/views/components/resources/breadcrumbs.blade.php@@ -52,7 +52,7 @@<nav class="pt-2 pb-4 md:pb-10"><div class="flex min-w-0 flex-col gap-1 md:hidden"><div class="flex min-w-0 items-center text-xs text-neutral-400">- <a class="min-w-0 truncate text-neutral-300 hover:text-warning" {{ wireNavigate() }}+ <a class="min-w-0 truncate" {{ wireNavigate() }}href="{{ $isApplication? route('project.application.configuration', $routeParams): ($isServicediff --git a/resources/views/components/server/sidebar-proxy.blade.php b/resources/views/components/server/sidebar-proxy.blade.phpindex 00bb3ee2a9..329f50c11a 100644--- a/resources/views/components/server/sidebar-proxy.blade.php+++ b/resources/views/components/server/sidebar-proxy.blade.php@@ -1,16 +1,139 @@-<div class="sub-menu-wrapper">- <a class="{{ request()->routeIs('server.proxy') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" {{ wireNavigate() }}- href="{{ route('server.proxy', $parameters) }}">- <span class="menu-item-label">Configuration</span>- </a>- @if ($server->proxySet())- <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" {{ wireNavigate() }}- href="{{ route('server.proxy.dynamic-confs', $parameters) }}">- <span class="menu-item-label">Dynamic Configurations</span>- </a>- <a class="{{ request()->routeIs('server.proxy.logs') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}"- href="{{ route('server.proxy.logs', $parameters) }}">- <span class="menu-item-label">Logs</span>- </a>- @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++<div class="w-full md:w-auto">+ <div class="mb-4 w-full border-b-2 border-solid border-neutral-200 pb-6 md:hidden dark:border-coolgray-200">+ <label id="server-mobile-section-label" for="server-mobile-section" class="mb-1 block text-xs font-semibold uppercase tracking-wide text-neutral-500 dark:text-neutral-400">Section</label>+ <select id="server-mobile-section" class="select w-full" aria-label="Proxy menu"+ data-current-value="{{ $activeProxyMenuValue }}"+ x-data="{+ init() {+ this.syncFromLocation();+ window.Livewire?.hook?.('morphed', ({ el }) => {+ if (el.contains(this.$el)) {+ queueMicrotask(() => this.syncFromLocation());+ }+ });+ },+ selected: $el.dataset.currentValue,+ syncFromLocation() {+ const currentUrl = new URL(window.location.href);+ const matchingOptions = Array.from(this.$el.options).filter((option) => {+ const optionUrl = new URL(option.value.split('|').slice(2).join('|'), window.location.origin);++ return optionUrl.pathname === currentUrl.pathname;+ });+ const selectedOption = matchingOptions.find((option) => option.value.startsWith('navigate|proxy|') || option.value.startsWith('location|proxy|')) || matchingOptions[0];++ if (selectedOption) {+ this.selected = selectedOption.value;+ }+ },+ }"+ x-on:livewire:navigated.window="syncFromLocation()"+ x-model="selected"+ x-on:change="+ const value = $event.target.value;+ const url = value.split('|').slice(2).join('|');++ if (value.startsWith('navigate|')) {+ window.Livewire?.navigate ? window.Livewire.navigate(url) : window.location.href = url;+ return;+ }++ window.location.href = url;+ ">+ <optgroup label="Server">+ @foreach ($serverPageItems as $menuItem)+ <option value="{{ ($menuItem['navigate'] ?? true) ? 'navigate' : 'location' }}|server|{{ route($menuItem['route'], $parameters) }}">+ {{ $menuItem['label'] }}+ </option>+ @endforeach+ </optgroup>+ <optgroup label="Proxy">+ @foreach ($proxyMenuItems as $menuItem)+ <option value="{{ ($menuItem['navigate'] ?? true) ? 'navigate' : 'location' }}|proxy|{{ route($menuItem['route'], $parameters) }}">+ {{ $menuItem['label'] }}+ </option>+ @endforeach+ </optgroup>+ </select>+ </div>++ <div class="sub-menu-wrapper hidden md:flex">+ @foreach ($proxyMenuItems as $menuItem)+ <a class="{{ $menuItem['active'] ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" @if ($menuItem['navigate'] ?? true) {{ wireNavigate() }} @endif+ href="{{ route($menuItem['route'], $parameters) }}">+ <span class="menu-item-label">{{ $menuItem['label'] }}</span>+ </a>+ @endforeach+ </div></div>diff --git a/resources/views/components/server/sidebar-security.blade.php b/resources/views/components/server/sidebar-security.blade.phpindex e61d23c89f..9e10718541 100644--- a/resources/views/components/server/sidebar-security.blade.php+++ b/resources/views/components/server/sidebar-security.blade.php@@ -1,10 +1,127 @@-<div class="sub-menu-wrapper">- <a class="{{ request()->routeIs('server.security.patches') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" {{ wireNavigate() }}- href="{{ route('server.security.patches', $parameters) }}">- <span class="menu-item-label">Server Patching</span>- </a>- <a class="{{ request()->routeIs('server.security.terminal-access') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}"- href="{{ route('server.security.terminal-access', $parameters) }}">- <span class="menu-item-label">Terminal Access</span>- </a>+@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),+ ],+ ];+ $securityMenuItems = [+ [+ 'label' => 'Server Patching',+ 'route' => 'server.security.patches',+ 'active' => request()->routeIs('server.security.patches'),+ ],+ [+ 'label' => 'Terminal Access',+ 'route' => 'server.security.terminal-access',+ 'active' => request()->routeIs('server.security.terminal-access'),+ 'navigate' => false,+ ],+ ];+ $serverPageItems = array_values(array_filter(+ $serverPageItems,+ fn (array $item): bool => $item['visible'] ?? true,+ ));+ $activeSecurityMenuItem = collect($securityMenuItems)->firstWhere('active', true) ?? $securityMenuItems[0];+ $activeSecurityMenuValue = (($activeSecurityMenuItem['navigate'] ?? true) ? 'navigate' : 'location').'|security|'.route($activeSecurityMenuItem['route'], $parameters);+@endphp++<div class="w-full md:w-auto">+ <div class="mb-4 w-full border-b-2 border-solid border-neutral-200 pb-6 md:hidden dark:border-coolgray-200">+ <label id="server-mobile-section-label" for="server-mobile-section" class="mb-1 block text-xs font-semibold uppercase tracking-wide text-neutral-500 dark:text-neutral-400">Section</label>+ <select id="server-mobile-section" class="select w-full" aria-label="Security menu"+ data-current-value="{{ $activeSecurityMenuValue }}"+ x-data="{+ init() {+ this.syncFromLocation();+ window.Livewire?.hook?.('morphed', ({ el }) => {+ if (el.contains(this.$el)) {+ queueMicrotask(() => this.syncFromLocation());+ }+ });+ },+ selected: $el.dataset.currentValue,+ syncFromLocation() {+ const currentUrl = new URL(window.location.href);+ const matchingOptions = Array.from(this.$el.options).filter((option) => {+ const optionUrl = new URL(option.value.split('|').slice(2).join('|'), window.location.origin);++ return optionUrl.pathname === currentUrl.pathname;+ });+ const selectedOption = matchingOptions.find((option) => option.value.startsWith('navigate|security|') || option.value.startsWith('location|security|')) || matchingOptions[0];++ if (selectedOption) {+ this.selected = selectedOption.value;+ }+ },+ }"+ x-on:livewire:navigated.window="syncFromLocation()"+ x-model="selected"+ x-on:change="+ const value = $event.target.value;+ const url = value.split('|').slice(2).join('|');++ if (value.startsWith('navigate|')) {+ window.Livewire?.navigate ? window.Livewire.navigate(url) : window.location.href = url;+ return;+ }++ window.location.href = url;+ ">+ <optgroup label="Server">+ @foreach ($serverPageItems as $menuItem)+ <option value="{{ ($menuItem['navigate'] ?? true) ? 'navigate' : 'location' }}|server|{{ route($menuItem['route'], $parameters) }}">+ {{ $menuItem['label'] }}+ </option>+ @endforeach+ </optgroup>+ <optgroup label="Security">+ @foreach ($securityMenuItems as $menuItem)+ <option value="{{ ($menuItem['navigate'] ?? true) ? 'navigate' : 'location' }}|security|{{ route($menuItem['route'], $parameters) }}">+ {{ $menuItem['label'] }}+ </option>+ @endforeach+ </optgroup>+ </select>+ </div>++ <div class="sub-menu-wrapper hidden md:flex">+ @foreach ($securityMenuItems as $menuItem)+ <a class="{{ $menuItem['active'] ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" @if ($menuItem['navigate'] ?? true) {{ wireNavigate() }} @endif+ href="{{ route($menuItem['route'], $parameters) }}">+ <span class="menu-item-label">{{ $menuItem['label'] }}</span>+ </a>+ @endforeach+ </div></div>diff --git a/resources/views/components/server/sidebar-sentinel.blade.php b/resources/views/components/server/sidebar-sentinel.blade.phpindex 421a1ec9dd..76f836e90d 100644--- a/resources/views/components/server/sidebar-sentinel.blade.php+++ b/resources/views/components/server/sidebar-sentinel.blade.php@@ -1,12 +1,121 @@-<div class="sub-menu-wrapper">+@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),+ ],+ ];+ $sentinelMenuItems = [+ [+ 'label' => 'Configuration',+ 'route' => 'server.sentinel',+ 'active' => request()->routeIs('server.sentinel'),+ ],+ [+ 'label' => 'Logs',+ 'route' => 'server.sentinel.logs',+ 'active' => request()->routeIs('server.sentinel.logs'),+ ],+ ];+ $serverPageItems = array_values(array_filter(+ $serverPageItems,+ fn (array $item): bool => $item['visible'] ?? true,+ ));+ $activeSentinelMenuItem = collect($sentinelMenuItems)->firstWhere('active', true) ?? $sentinelMenuItems[0];+ $activeSentinelMenuValue = 'navigate|sentinel|'.route($activeSentinelMenuItem['route'], $parameters);+@endphp++<div class="w-full md:w-auto">@can('viewSentinel', $server)- <a class="{{ request()->routeIs('server.sentinel') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" {{ wireNavigate() }}- href="{{ route('server.sentinel', $parameters) }}">- <span class="menu-item-label">Configuration</span>- </a>- <a class="{{ request()->routeIs('server.sentinel.logs') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" {{ wireNavigate() }}- href="{{ route('server.sentinel.logs', $parameters) }}">- <span class="menu-item-label">Logs</span>- </a>+ <div class="mb-4 w-full border-b-2 border-solid border-neutral-200 pb-6 md:hidden dark:border-coolgray-200">+ <label id="server-mobile-section-label" for="server-mobile-section" class="mb-1 block text-xs font-semibold uppercase tracking-wide text-neutral-500 dark:text-neutral-400">Section</label>+ <select id="server-mobile-section" class="select w-full" aria-label="Sentinel menu"+ data-current-value="{{ $activeSentinelMenuValue }}"+ x-data="{+ init() {+ this.syncFromLocation();+ window.Livewire?.hook?.('morphed', ({ el }) => {+ if (el.contains(this.$el)) {+ queueMicrotask(() => this.syncFromLocation());+ }+ });+ },+ selected: $el.dataset.currentValue,+ syncFromLocation() {+ const currentUrl = new URL(window.location.href);+ const matchingOptions = Array.from(this.$el.options).filter((option) => {+ const optionUrl = new URL(option.value.split('|').slice(2).join('|'), window.location.origin);++ return optionUrl.pathname === currentUrl.pathname;+ });+ const selectedOption = matchingOptions.find((option) => option.value.startsWith('navigate|sentinel|')) || matchingOptions[0];++ if (selectedOption) {+ this.selected = selectedOption.value;+ }+ },+ }"+ x-on:livewire:navigated.window="syncFromLocation()"+ x-model="selected"+ x-on:change="+ const url = $event.target.value.split('|').slice(2).join('|');+ window.Livewire?.navigate ? window.Livewire.navigate(url) : window.location.href = url;+ ">+ <optgroup label="Server">+ @foreach ($serverPageItems as $menuItem)+ <option value="{{ ($menuItem['navigate'] ?? true) ? 'navigate' : 'location' }}|server|{{ route($menuItem['route'], $parameters) }}">+ {{ $menuItem['label'] }}+ </option>+ @endforeach+ </optgroup>+ <optgroup label="Sentinel">+ @foreach ($sentinelMenuItems as $menuItem)+ <option value="navigate|sentinel|{{ route($menuItem['route'], $parameters) }}">+ {{ $menuItem['label'] }}+ </option>+ @endforeach+ </optgroup>+ </select>+ </div>++ <div class="sub-menu-wrapper hidden md:flex">+ @foreach ($sentinelMenuItems as $menuItem)+ <a class="{{ $menuItem['active'] ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" {{ wireNavigate() }}+ href="{{ route($menuItem['route'], $parameters) }}">+ <span class="menu-item-label">{{ $menuItem['label'] }}</span>+ </a>+ @endforeach+ </div>@endcan</div>diff --git a/resources/views/components/server/sidebar.blade.php b/resources/views/components/server/sidebar.blade.phpindex 2beb677be5..b89ba66c5d 100644--- a/resources/views/components/server/sidebar.blade.php+++ b/resources/views/components/server/sidebar.blade.php@@ -1,46 +1,201 @@-<div class="sub-menu-wrapper">- <a class="sub-menu-item {{ $activeMenu === 'general' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.show', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">General</span></a>- @if ($server->isFunctional())- <a class="sub-menu-item {{ $activeMenu === 'advanced' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.advanced', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Advanced</span>- </a>- @endif- <a class="sub-menu-item {{ $activeMenu === 'private-key' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.private-key', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Private Key</span>- </a>- @if ($server->hetzner_server_id)- <a class="sub-menu-item {{ $activeMenu === 'cloud-provider-token' ? 'menu-item-active' : '' }}"- {{ wireNavigate() }}- href="{{ route('server.cloud-provider-token', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Hetzner Token</span>- </a>- @endif- <a class="sub-menu-item {{ $activeMenu === 'ca-certificate' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.ca-certificate', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">CA Certificate</span>- </a>- @if (!$server->isLocalhost())- <a class="sub-menu-item {{ $activeMenu === 'cloudflare-tunnel' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.cloudflare-tunnel', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Cloudflare Tunnel</span></a>- @endif- @if ($server->isFunctional())- <a class="sub-menu-item {{ $activeMenu === 'docker-cleanup' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.docker-cleanup', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Docker Cleanup</span>- </a>- <a class="sub-menu-item {{ $activeMenu === 'destinations' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.destinations', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Destinations</span>- </a>- <a class="sub-menu-item {{ $activeMenu === 'log-drains' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.log-drains', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Log Drains</span></a>- <a class="sub-menu-item {{ $activeMenu === 'metrics' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.metrics', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Metrics</span></a>- @endif- @if (!$server->isBuildServer() && !$server->settings->is_cloudflare_tunnel)- <a class="sub-menu-item {{ $activeMenu === 'swarm' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.swarm', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Swarm</span>- </a>- @endif- @if (!$server->isLocalhost())- <a class="sub-menu-item {{ $activeMenu === 'danger' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.delete', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Danger</span></a>- @endif+@php+ $serverRouteParameters = ['server_uuid' => $server->uuid];+ $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),+ ],+ ];+ $serverMenuItems = [+ [+ 'label' => 'General',+ 'route' => 'server.show',+ 'active' => $activeMenu === 'general',+ ],+ [+ 'label' => 'Advanced',+ 'route' => 'server.advanced',+ 'active' => $activeMenu === 'advanced',+ 'visible' => $server->isFunctional(),+ ],+ [+ 'label' => 'Private Key',+ 'route' => 'server.private-key',+ 'active' => $activeMenu === 'private-key',+ ],+ [+ 'label' => 'Hetzner Token',+ 'route' => 'server.cloud-provider-token',+ 'active' => $activeMenu === 'cloud-provider-token',+ 'visible' => (bool) $server->hetzner_server_id,+ ],+ [+ 'label' => 'CA Certificate',+ 'route' => 'server.ca-certificate',+ 'active' => $activeMenu === 'ca-certificate',+ ],+ [+ 'label' => 'Cloudflare Tunnel',+ 'route' => 'server.cloudflare-tunnel',+ 'active' => $activeMenu === 'cloudflare-tunnel',+ 'visible' => ! $server->isLocalhost(),+ ],+ [+ 'label' => 'Docker Cleanup',+ 'route' => 'server.docker-cleanup',+ 'active' => $activeMenu === 'docker-cleanup',+ 'visible' => $server->isFunctional(),+ ],+ [+ 'label' => 'Destinations',+ 'route' => 'server.destinations',+ 'active' => $activeMenu === 'destinations',+ 'visible' => $server->isFunctional(),+ ],+ [+ 'label' => 'Log Drains',+ 'route' => 'server.log-drains',+ 'active' => $activeMenu === 'log-drains',+ 'visible' => $server->isFunctional(),+ ],+ [+ 'label' => 'Metrics',+ 'route' => 'server.metrics',+ 'active' => $activeMenu === 'metrics',+ 'visible' => $server->isFunctional(),+ ],+ [+ 'label' => 'Swarm',+ 'route' => 'server.swarm',+ 'active' => $activeMenu === 'swarm',+ 'visible' => ! $server->isBuildServer() && ! $server->settings->is_cloudflare_tunnel,+ ],+ [+ 'label' => 'Danger',+ 'route' => 'server.delete',+ 'active' => $activeMenu === 'danger',+ 'visible' => ! $server->isLocalhost(),+ ],+ ];++ $serverPageItems = array_values(array_filter(+ $serverPageItems,+ fn (array $item): bool => $item['visible'] ?? true,+ ));+ $serverMenuItems = array_values(array_filter(+ $serverMenuItems,+ fn (array $item): bool => $item['visible'] ?? true,+ ));+ $activeServerMenuItem = collect($serverMenuItems)->firstWhere('active', true);+ $activeServerPageItem = collect($serverPageItems)->firstWhere('active', true);+ $activeServerMobileItem = $activeServerMenuItem ?? $activeServerPageItem ?? $serverMenuItems[0];+ $activeServerMobileGroup = $activeServerMenuItem ? 'configuration' : 'server';+ $activeServerMobileNavigation = ($activeServerMobileItem['navigate'] ?? true) ? 'navigate' : 'location';+ $activeServerMenuValue = $activeServerMobileNavigation.'|'.$activeServerMobileGroup.'|'.route($activeServerMobileItem['route'], $serverRouteParameters);+@endphp++<div class="w-full md:w-auto">+ <div class="mb-4 w-full border-b-2 border-solid border-neutral-200 pb-6 md:hidden dark:border-coolgray-200">+ <label id="server-mobile-section-label" for="server-mobile-section" class="mb-1 block text-xs font-semibold uppercase tracking-wide text-neutral-500 dark:text-neutral-400">Section</label>+ <select id="server-mobile-section" class="select w-full" aria-label="Server menu"+ data-current-value="{{ $activeServerMenuValue }}"+ x-data="{+ init() {+ this.syncFromLocation();+ window.Livewire?.hook?.('morphed', ({ el }) => {+ if (el.contains(this.$el)) {+ queueMicrotask(() => this.syncFromLocation());+ }+ });+ },+ selected: $el.dataset.currentValue,+ current: $el.dataset.currentValue,+ syncFromLocation() {+ const currentUrl = new URL(window.location.href);+ const selectedOption = Array.from(this.$el.options).find((option) => {+ if (!option.value.startsWith('navigate|') && !option.value.startsWith('location|')) {+ return false;+ }++ const optionUrl = new URL(option.value.split('|').slice(2).join('|'), window.location.origin);++ return optionUrl.pathname === currentUrl.pathname;+ });++ if (selectedOption) {+ this.current = selectedOption.value;+ this.selected = selectedOption.value;+ }+ },+ }"+ x-on:livewire:navigated.window="syncFromLocation()"+ x-model="selected"+ x-on:change="+ const value = $event.target.value;++ if (value.startsWith('navigate|')) {+ const url = value.split('|').slice(2).join('|');+ window.Livewire?.navigate ? window.Livewire.navigate(url) : window.location.href = url;+ return;+ }++ if (value.startsWith('location|')) {+ const url = value.split('|').slice(2).join('|');+ window.location.href = url;+ }+ ">+ <optgroup label="Server">+ @foreach ($serverPageItems as $menuItem)+ <option value="{{ ($menuItem['navigate'] ?? true) ? 'navigate' : 'location' }}|server|{{ route($menuItem['route'], $serverRouteParameters) }}">+ {{ $menuItem['label'] }}+ </option>+ @endforeach+ </optgroup>+ <optgroup label="Configuration">+ @foreach ($serverMenuItems as $menuItem)+ <option value="navigate|configuration|{{ route($menuItem['route'], $serverRouteParameters) }}">+ {{ $menuItem['label'] }}+ </option>+ @endforeach+ </optgroup>+ </select>+ </div>++ <div class="sub-menu-wrapper hidden md:flex">+ @foreach ($serverMenuItems as $menuItem)+ <a class="sub-menu-item {{ $menuItem['active'] ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route($menuItem['route'], $serverRouteParameters) }}"><span class="menu-item-label">{{ $menuItem['label'] }}</span></a>+ @endforeach+ </div></div>diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.phpindex 25f4b7c282..11adaf206d 100644--- a/resources/views/livewire/project/application/configuration.blade.php+++ b/resources/views/livewire/project/application/configuration.blade.php@@ -112,7 +112,7 @@));@endphp- <div class="flex flex-col h-full gap-4 md:gap-8 md:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><div class="sub-menu-wrapper hidden md:flex">@foreach ($configurationMenuItems as $menuItem)<a @class([diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.phpindex 0c9e7f813a..59e7c8583f 100644--- a/resources/views/livewire/project/database/configuration.blade.php+++ b/resources/views/livewire/project/database/configuration.blade.php@@ -5,7 +5,7 @@<h1>Configuration</h1><livewire:project.shared.configuration-checker :resource="$database" /><livewire:project.database.heading :database="$database" />- <div class="flex flex-col h-full gap-4 md:gap-8 md:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><div class="sub-menu-wrapper hidden md:flex"><a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"href="{{ route('project.database.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">General</span></a>diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.phpindex 64cccfdf08..3e18a6bce3 100644--- a/resources/views/livewire/project/service/configuration.blade.php+++ b/resources/views/livewire/project/service/configuration.blade.php@@ -4,7 +4,7 @@</x-slot><livewire:project.service.heading :service="$service" :parameters="$parameters" :query="$query" />- <div class="flex flex-col h-full gap-4 md:gap-8 md:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><div class="sub-menu-wrapper hidden md:flex"><a class="sub-menu-item" target="_blank" href="{{ $service->documentation() }}"><span class="menu-item-label">Documentation</span><x-external-link /></a>diff --git a/resources/views/livewire/project/service/database-backups.blade.php b/resources/views/livewire/project/service/database-backups.blade.phpindex 6b5c0862a5..296289178e 100644--- a/resources/views/livewire/project/service/database-backups.blade.php+++ b/resources/views/livewire/project/service/database-backups.blade.php@@ -1,6 +1,6 @@<div><livewire:project.service.heading :service="$service" :parameters="$parameters" :query="$query" />- <div class="flex flex-col h-full gap-4 md:gap-8 md:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-service-database.sidebar :parameters="$parameters" :serviceDatabase="$serviceDatabase" :isImportSupported="$isImportSupported" /><div class="w-full"><x-slot:title>diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.phpindex eca5ad3957..fbf6ca99a7 100644--- a/resources/views/livewire/project/service/index.blade.php+++ b/resources/views/livewire/project/service/index.blade.php@@ -1,6 +1,6 @@<div><livewire:project.service.heading :service="$service" :parameters="$parameters" :query="$query" />- <div class="flex flex-col h-full gap-4 md:gap-8 md:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row">@if ($resourceType === 'database')<x-service-database.sidebar :parameters="$parameters" :serviceDatabase="$serviceDatabase" :isImportSupported="$isImportSupported" />@elsediff --git a/resources/views/livewire/server/advanced.blade.php b/resources/views/livewire/server/advanced.blade.phpindex f6610c1d59..ac7618ccc6 100644--- a/resources/views/livewire/server/advanced.blade.php+++ b/resources/views/livewire/server/advanced.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Advanced | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">+ <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="advanced" /><form wire:submit='submit' class="w-full"><div>@@ -37,7 +37,7 @@helper="You can specify the number of simultaneous build processes/deployments that should run concurrently." /><x-forms.input canGate="update" :canResource="$server" id="dynamicTimeout"type="number" min="1"- label="Deployment timeout (seconds)" required+ label="Deployment timeout (sec)" requiredhelper="You can define the maximum duration for a deployment to run before timing it out." /><x-forms.input canGate="update" :canResource="$server" id="deploymentQueueLimit"type="number" min="1"diff --git a/resources/views/livewire/server/ca-certificate/show.blade.php b/resources/views/livewire/server/ca-certificate/show.blade.phpindex f49e7d0ae4..afa027d87e 100644--- a/resources/views/livewire/server/ca-certificate/show.blade.php+++ b/resources/views/livewire/server/ca-certificate/show.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > CA Certificate | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="ca-certificate" /><div class="flex flex-col gap-4"><div class="flex items-center gap-2">diff --git a/resources/views/livewire/server/charts.blade.php b/resources/views/livewire/server/charts.blade.phpindex 0acb79b938..1a9aebe509 100644--- a/resources/views/livewire/server/charts.blade.php+++ b/resources/views/livewire/server/charts.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Metrics | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="metrics" /><div class="w-full"><div class="flex items-center gap-2">diff --git a/resources/views/livewire/server/cloud-provider-token/show.blade.php b/resources/views/livewire/server/cloud-provider-token/show.blade.phpindex 6fb65c4111..23d7cfe4c0 100644--- a/resources/views/livewire/server/cloud-provider-token/show.blade.php+++ b/resources/views/livewire/server/cloud-provider-token/show.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Hetzner Token | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="cloud-provider-token" /><div class="w-full">@if ($server->hetzner_server_id)diff --git a/resources/views/livewire/server/cloudflare-tunnel.blade.php b/resources/views/livewire/server/cloudflare-tunnel.blade.phpindex 668fae8f12..bca08c4ec4 100644--- a/resources/views/livewire/server/cloudflare-tunnel.blade.php+++ b/resources/views/livewire/server/cloudflare-tunnel.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Cloudflare Tunnel | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="cloudflare-tunnel" /><div class="w-full"><div class="flex flex-col">diff --git a/resources/views/livewire/server/delete.blade.php b/resources/views/livewire/server/delete.blade.phpindex dec1d3f6df..1658e9864b 100644--- a/resources/views/livewire/server/delete.blade.php+++ b/resources/views/livewire/server/delete.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Delete Server | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="danger" /><div class="w-full">@if ($server->id !== 0)diff --git a/resources/views/livewire/server/destinations.blade.php b/resources/views/livewire/server/destinations.blade.phpindex 9d8a2b4370..e2f334283e 100644--- a/resources/views/livewire/server/destinations.blade.php+++ b/resources/views/livewire/server/destinations.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Destinations | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="destinations" /><div class="w-full">@if ($server->isFunctional())diff --git a/resources/views/livewire/server/docker-cleanup.blade.php b/resources/views/livewire/server/docker-cleanup.blade.phpindex ac48651ae8..918d6ca61c 100644--- a/resources/views/livewire/server/docker-cleanup.blade.php+++ b/resources/views/livewire/server/docker-cleanup.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Docker Cleanup | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">+ <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="docker-cleanup" /><div class="w-full"><form wire:submit='submit'>diff --git a/resources/views/livewire/server/log-drains.blade.php b/resources/views/livewire/server/log-drains.blade.phpindex afc963c287..9afd5cf4e9 100644--- a/resources/views/livewire/server/log-drains.blade.php+++ b/resources/views/livewire/server/log-drains.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Log Drains | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="log-drains" /><div class="w-full">@if ($server->isFunctional())diff --git a/resources/views/livewire/server/navbar.blade.php b/resources/views/livewire/server/navbar.blade.phpindex 10fdd0f249..2d08f9c3ee 100644--- a/resources/views/livewire/server/navbar.blade.php+++ b/resources/views/livewire/server/navbar.blade.php@@ -1,4 +1,4 @@-<div class="pb-6">+<div class="pb-0 md:pb-6"><x-slide-over @startproxy.window="slideOverOpen = true" fullScreen closeWithX><x-slot:title>Proxy Startup Logs</x-slot:title><x-slot:content>@@ -12,14 +12,17 @@<livewire:activity-monitor header="Logs" fullHeight /></x-slot:content></x-slide-over>- <div class="flex flex-col gap-1.5">- <div class="flex flex-wrap items-center gap-2">- <h1>Server</h1>+ <h1>Server</h1>+ <div class="pt-2 pb-4 md:pb-10">+ <div class="flex-col md:flex-row flex gap-2">+ <div data-testid="server-subtitle" class="text-xs lg:text-sm min-w-0 truncate">+ {{ data_get($server, 'name') }}+ </div>@php$showSentinelStatus = $server->isFunctional() && $server->isSentinelEnabled();@endphp@if ($server->proxySet() || $showSentinelStatus)- <div data-testid="server-status-summary" class="flex flex-wrap items-center gap-2">+ <div data-testid="server-status-summary" class="flex flex-wrap items-center gap-1">@if ($server->proxySet())<div class="flex items-center gap-1">@if ($proxyStatus === 'running')@@ -57,11 +60,10 @@</div>@endif</div>- <div class="subtitle">{{ data_get($server, 'name') }}</div></div><div class="navbar-main"><nav- class="flex items-center gap-6 overflow-x-scroll sm:overflow-x-hidden scrollbar min-h-10 whitespace-nowrap pt-2">+ class="scrollbar hidden min-h-10 w-full flex-nowrap items-center gap-6 overflow-x-scroll overflow-y-hidden pb-1 whitespace-nowrap md:flex md:w-auto md:overflow-visible"><a class="{{ request()->routeIs('server.show') ? 'dark:text-white' : '' }}" href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid'),]) }}" {{ wireNavigate() }}>@@ -114,12 +116,70 @@</a>@endcan</nav>- <div class="order-first sm:order-last">+ <div class="order-first w-full md:order-last md:w-auto"><div>@if ($server->proxySet())@can('manageProxy', $server)+ <div id="server-mobile-actions" class="mt-2 mb-3 md:hidden">+ <div class="mb-1 text-xs font-semibold uppercase tracking-wide text-neutral-500 dark:text-neutral-400">Actions</div>@if ($proxyStatus === 'running')- <div class="flex gap-2">+ <div class="flex flex-nowrap gap-2 overflow-x-auto">+ <button type="button" class="button shrink-0"+ @click="document.getElementById('server-mobile-restart-proxy-trigger')?.click()">+ <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"+ xmlns="http://www.w3.org/2000/svg">+ <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"+ stroke-width="2">+ <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />+ <path d="M20 4v5h-5" />+ </g>+ </svg>+ Restart Proxy+ </button>+ <button type="button" class="button shrink-0 text-error"+ @click="document.getElementById('server-mobile-stop-proxy-trigger')?.click()">+ <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"+ stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"+ stroke-linejoin="round">+ <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>+ <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">+ </path>+ <path+ d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">+ </path>+ </svg>+ Stop Proxy+ </button>+ @if ($traefikDashboardAvailable)+ <a class="button shrink-0" target="_blank" href="http://{{ $serverIp }}:8080">+ Traefik Dashboard+ <x-external-link />+ </a>+ @endif+ </div>+ </div>+ <x-modal-confirmation title="Confirm Proxy Restart?" buttonTitle="Restart Proxy"+ submitAction="restart" :actions="[+ 'This proxy will be stopped and started again.',+ 'All resources hosted on coolify will be unavailable during the restart.',+ ]" :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Restart Proxy"+ :dispatchEvent="true" dispatchEventType="restartEvent">+ <x-slot:trigger>+ <button id="server-mobile-restart-proxy-trigger" type="button" class="hidden">Restart Proxy</button>+ </x-slot:trigger>+ </x-modal-confirmation>+ <x-modal-confirmation title="Confirm Proxy Stopping?" buttonTitle="Stop Proxy"+ submitAction="stop(true)" :actions="[+ 'The coolify proxy will be stopped.',+ 'All resources hosted on coolify will be unavailable.',+ ]" :confirmWithText="false"+ :confirmWithPassword="false" step2ButtonText="Stop Proxy" :dispatchEvent="true"+ dispatchEventType="stopEvent">+ <x-slot:trigger>+ <button id="server-mobile-stop-proxy-trigger" type="button" class="hidden">Stop Proxy</button>+ </x-slot:trigger>+ </x-modal-confirmation>+ <div class="hidden gap-2 md:flex"><div class="mt-1" wire:loading wire:target="loadProxyConfiguration"><x-loading text="Checking Traefik dashboard" /></div>@@ -181,6 +241,7 @@</svg>Start Proxy</button>+ </div>@endif@endcan@endifdiff --git a/resources/views/livewire/server/private-key/show.blade.php b/resources/views/livewire/server/private-key/show.blade.phpindex 1703e3bc97..ee51620825 100644--- a/resources/views/livewire/server/private-key/show.blade.php+++ b/resources/views/livewire/server/private-key/show.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Private Key | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="private-key" /><div class="w-full"><div class="flex items-end gap-2">diff --git a/resources/views/livewire/server/proxy/dynamic-configurations.blade.php b/resources/views/livewire/server/proxy/dynamic-configurations.blade.phpindex 60e5ea7109..d8a9bb0f13 100644--- a/resources/views/livewire/server/proxy/dynamic-configurations.blade.php+++ b/resources/views/livewire/server/proxy/dynamic-configurations.blade.php@@ -3,7 +3,7 @@Proxy Dynamic Configuration | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar-proxy :server="$server" :parameters="$parameters" />@if ($server->isFunctional())<div class="w-full">diff --git a/resources/views/livewire/server/proxy/logs.blade.php b/resources/views/livewire/server/proxy/logs.blade.phpindex 8b72d78f12..98d3d1bdd2 100644--- a/resources/views/livewire/server/proxy/logs.blade.php+++ b/resources/views/livewire/server/proxy/logs.blade.php@@ -3,7 +3,7 @@Proxy Logs | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar-proxy :server="$server" :parameters="$parameters" /><div class="w-full"><h2 class="pb-4">Logs</h2>diff --git a/resources/views/livewire/server/proxy/show.blade.php b/resources/views/livewire/server/proxy/show.blade.phpindex 725320292b..386b696095 100644--- a/resources/views/livewire/server/proxy/show.blade.php+++ b/resources/views/livewire/server/proxy/show.blade.php@@ -4,7 +4,7 @@</x-slot><livewire:server.navbar :server="$server" />@if ($server->isFunctional())- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar-proxy :server="$server" :parameters="$parameters" /><div class="w-full"><livewire:server.proxy :server="$server" />diff --git a/resources/views/livewire/server/resources.blade.php b/resources/views/livewire/server/resources.blade.phpindex a13f88e838..6d5ce55ad0 100644--- a/resources/views/livewire/server/resources.blade.php+++ b/resources/views/livewire/server/resources.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Server Resources | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div x-data="{ activeTab: 'managed' }" class="flex flex-col h-full gap-8 md:flex-row">+ <div x-data="{ activeTab: 'managed' }" class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><div class="w-full"><div class="flex flex-col"><div class="flex gap-2">diff --git a/resources/views/livewire/server/security/patches.blade.php b/resources/views/livewire/server/security/patches.blade.phpindex a4fe5b309d..14d142fb8b 100644--- a/resources/views/livewire/server/security/patches.blade.php+++ b/resources/views/livewire/server/security/patches.blade.php@@ -10,7 +10,7 @@</x-slot:content></x-slide-over>- <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">+ <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar-security :server="$server" :parameters="$parameters" /><form wire:submit='submit' class="w-full"><div>diff --git a/resources/views/livewire/server/security/terminal-access.blade.php b/resources/views/livewire/server/security/terminal-access.blade.phpindex 3541c429d0..411ce72992 100644--- a/resources/views/livewire/server/security/terminal-access.blade.php+++ b/resources/views/livewire/server/security/terminal-access.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Terminal Access | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">+ <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar-security :server="$server" :parameters="$parameters" /><div class="w-full"><div>@@ -52,4 +52,4 @@</div></div></div>-</div>\ No newline at end of file+</div>diff --git a/resources/views/livewire/server/sentinel/logs.blade.php b/resources/views/livewire/server/sentinel/logs.blade.phpindex f92f0ab42c..9635a804e5 100644--- a/resources/views/livewire/server/sentinel/logs.blade.php+++ b/resources/views/livewire/server/sentinel/logs.blade.php@@ -3,7 +3,7 @@Sentinel Logs | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar-sentinel :server="$server" :parameters="$parameters" /><div class="w-full"><h2 class="pb-4">Logs</h2>diff --git a/resources/views/livewire/server/sentinel/show.blade.php b/resources/views/livewire/server/sentinel/show.blade.phpindex d859a5e140..e684c874ae 100644--- a/resources/views/livewire/server/sentinel/show.blade.php+++ b/resources/views/livewire/server/sentinel/show.blade.php@@ -4,7 +4,7 @@</x-slot><livewire:server.navbar :server="$server" />@if ($server->isFunctional())- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar-sentinel :server="$server" :parameters="$parameters" /><div class="w-full"><livewire:server.sentinel :server="$server" />diff --git a/resources/views/livewire/server/show.blade.php b/resources/views/livewire/server/show.blade.phpindex e5ee310a29..ff8b653928 100644--- a/resources/views/livewire/server/show.blade.php+++ b/resources/views/livewire/server/show.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > General | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="general" /><div class="w-full"><form wire:submit.prevent='submit' class="flex flex-col">diff --git a/resources/views/livewire/server/swarm.blade.php b/resources/views/livewire/server/swarm.blade.phpindex 9ce28bbd63..005e1814d5 100644--- a/resources/views/livewire/server/swarm.blade.php+++ b/resources/views/livewire/server/swarm.blade.php@@ -3,7 +3,7 @@{{ data_get_str($server, 'name')->limit(10) }} > Swarm | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="swarm" /><div class="w-full"><div>diff --git a/tests/Feature/ForgotPasswordRateLimitTest.php b/tests/Feature/ForgotPasswordRateLimitTest.phpnew file mode 100644index 0000000000..aaff953ba4--- /dev/null+++ b/tests/Feature/ForgotPasswordRateLimitTest.php@@ -0,0 +1,48 @@+<?php++use App\Models\InstanceSettings;+use Illuminate\Foundation\Testing\RefreshDatabase;++uses(RefreshDatabase::class);++beforeEach(function () {+ InstanceSettings::query()->forceCreate(['id' => 0]);+});++it('rate limits repeated forgot password attempts from the same ip', function () {+ foreach (range(1, 3) as $attempt) {+ $this->withServerVariables(['REMOTE_ADDR' => '203.0.113.20'])+ ->post('/forgot-password', [+ 'email' => "user{$attempt}@example.com",+ ])+ ->assertSessionHasNoErrors();+ }++ $this->withServerVariables(['REMOTE_ADDR' => '203.0.113.20'])+ ->post('/forgot-password', [+ 'email' => '[email protected]',+ ])+ ->assertTooManyRequests();+});++it('rate limits dotted plus-address forgot password variants of the same email identity across ips', function () {+ $emails = [+ '[email protected]',+ '[email protected]',+ '[email protected]',+ ];++ foreach ($emails as $index => $email) {+ $this->withServerVariables(['REMOTE_ADDR' => '203.0.113.'.($index + 30)])+ ->post('/forgot-password', [+ 'email' => $email,+ ])+ ->assertSessionHasNoErrors();+ }++ $this->withServerVariables(['REMOTE_ADDR' => '203.0.113.99'])+ ->post('/forgot-password', [+ 'email' => '[email protected]',+ ])+ ->assertTooManyRequests();+});diff --git a/tests/Feature/MobileResourceMenuTest.php b/tests/Feature/MobileResourceMenuTest.phpindex 647972ec06..7f4d6fe9d9 100644--- a/tests/Feature/MobileResourceMenuTest.php+++ b/tests/Feature/MobileResourceMenuTest.php@@ -143,4 +143,107 @@ it('keeps configuration sidebars hidden until desktop breakpoint', function () {expect(file_get_contents(resource_path('views/components/service-database/sidebar.blade.php')))->toContain('sub-menu-wrapper hidden md:flex');++ $serverSidebar = file_get_contents(resource_path('views/components/server/sidebar.blade.php'));++ expect($serverSidebar)+ ->toContain('server-mobile-section-label')+ ->toContain('server-mobile-section')+ ->toContain('Section')+ ->toContain('select w-full')+ ->toContain('aria-label="Server menu"')+ ->toContain('border-b-2 border-solid border-neutral-200 pb-4 md:hidden dark:border-coolgray-200')+ ->toContain('<optgroup label="Server">')+ ->toContain('<optgroup label="Configuration">')+ ->toContain("'route' => 'server.proxy'")+ ->toContain("'navigate' => false")+ ->toContain("value.startsWith('location|')")+ ->toContain('window.Livewire?.navigate ? window.Livewire.navigate(url) : window.location.href = url')+ ->toContain('x-on:livewire:navigated.window="syncFromLocation()"')+ ->toContain('sub-menu-wrapper hidden md:flex')+ ->not->toContain('sub-menu-wrapper">');++ $serverNavbar = file_get_contents(resource_path('views/livewire/server/navbar.blade.php'));++ expect($serverNavbar)+ ->toContain('server-mobile-actions')+ ->toContain('Actions')+ ->toContain('pb-0 md:pb-6')+ ->toContain('navbar-main')+ ->toContain('server-mobile-actions" class="mt-2 mb-3')+ ->toContain('hidden min-h-10')+ ->toContain('md:flex')+ ->toContain('md:hidden')+ ->toContain('flex flex-nowrap gap-2 overflow-x-auto')+ ->toContain('server-mobile-restart-proxy-trigger')+ ->toContain('server-mobile-stop-proxy-trigger')+ ->toContain('class="button shrink-0"')+ ->toContain('hidden gap-2 md:flex');++ $serverMobileActions = serverMobileActionsMarkup($serverNavbar);++ expect(strpos($serverMobileActions, 'Restart Proxy'))+ ->toBeLessThan(strpos($serverMobileActions, 'Stop Proxy'))+ ->toBeLessThan(strpos($serverMobileActions, 'Traefik Dashboard'));++ foreach ([+ 'views/components/server/sidebar-proxy.blade.php' => 'Proxy menu',+ 'views/components/server/sidebar-sentinel.blade.php' => 'Sentinel menu',+ 'views/components/server/sidebar-security.blade.php' => 'Security menu',+ ] as $view => $label) {+ $sidebar = file_get_contents(resource_path($view));++ expect($sidebar)+ ->toContain('server-mobile-section-label')+ ->toContain('server-mobile-section')+ ->toContain('Section')+ ->toContain('select w-full')+ ->toContain('aria-label="'.$label.'"')+ ->toContain('border-b-2 border-solid border-neutral-200 pb-4 md:hidden dark:border-coolgray-200')+ ->toContain('<optgroup label="Server">')+ ->toContain('window.Livewire?.navigate ? window.Livewire.navigate(url) : window.location.href = url')+ ->toContain('x-on:livewire:navigated.window="syncFromLocation()"')+ ->toContain('sub-menu-wrapper hidden md:flex')+ ->not->toContain('sub-menu-wrapper">');+ }++ foreach ([+ 'views/livewire/server/show.blade.php',+ 'views/livewire/server/advanced.blade.php',+ 'views/livewire/server/private-key/show.blade.php',+ 'views/livewire/server/ca-certificate/show.blade.php',+ 'views/livewire/server/cloud-provider-token/show.blade.php',+ 'views/livewire/server/cloudflare-tunnel.blade.php',+ 'views/livewire/server/docker-cleanup.blade.php',+ 'views/livewire/server/destinations.blade.php',+ 'views/livewire/server/log-drains.blade.php',+ 'views/livewire/server/charts.blade.php',+ 'views/livewire/server/swarm.blade.php',+ 'views/livewire/server/delete.blade.php',+ 'views/livewire/server/proxy/show.blade.php',+ 'views/livewire/server/proxy/logs.blade.php',+ 'views/livewire/server/proxy/dynamic-configurations.blade.php',+ 'views/livewire/server/sentinel/show.blade.php',+ 'views/livewire/server/sentinel/logs.blade.php',+ 'views/livewire/server/security/patches.blade.php',+ 'views/livewire/server/security/terminal-access.blade.php',+ ] as $view) {+ expect(file_get_contents(resource_path($view)))+ ->toContain('gap-4 md:gap-8 md:flex-row')+ ->toContain('md:flex-row')+ ->not->toContain('sm:flex-row')+ ->not->toContain('class="flex flex-col h-full gap-8 md:flex-row');+ }});++function serverMobileActionsMarkup(string $navbar): string+{+ $actionsPosition = strpos($navbar, 'id="server-mobile-actions"');+ $restartModalPosition = strpos($navbar, '<x-modal-confirmation', $actionsPosition);++ if ($actionsPosition === false || $restartModalPosition === false || $actionsPosition > $restartModalPosition) {+ return '';+ }++ return substr($navbar, $actionsPosition, $restartModalPosition - $actionsPosition);+}diff --git a/tests/Feature/RegistrationRateLimitTest.php b/tests/Feature/RegistrationRateLimitTest.phpnew file mode 100644index 0000000000..6288a85b8f--- /dev/null+++ b/tests/Feature/RegistrationRateLimitTest.php@@ -0,0 +1,72 @@+<?php++use App\Models\InstanceSettings;+use App\Models\User;+use Illuminate\Foundation\Testing\RefreshDatabase;++uses(RefreshDatabase::class);++beforeEach(function () {+ InstanceSettings::query()->forceCreate([+ 'id' => 0,+ 'is_registration_enabled' => true,+ ]);++ User::factory()->create(['id' => 0, 'email' => '[email protected]']);+});++it('rate limits repeated registration attempts from the same ip', function () {+ foreach (range(1, 3) as $attempt) {+ $this->withServerVariables(['REMOTE_ADDR' => '203.0.113.10'])+ ->post('/register', [+ 'name' => "Attack User {$attempt}",+ 'email' => "attacker{$attempt}@example.com",+ 'password' => 'Password1!@',+ 'password_confirmation' => 'Password1!@',+ ])+ ->assertRedirect();++ auth()->logout();+ $this->flushSession();+ }++ $this->withServerVariables(['REMOTE_ADDR' => '203.0.113.10'])+ ->post('/register', [+ 'name' => 'Blocked User',+ 'email' => '[email protected]',+ 'password' => 'Password1!@',+ 'password_confirmation' => 'Password1!@',+ ])+ ->assertTooManyRequests();+});++it('rate limits dotted plus-address variants of the same email identity across ips', function () {+ $emails = [+ '[email protected]',+ '[email protected]',+ '[email protected]',+ ];++ foreach ($emails as $index => $email) {+ $this->withServerVariables(['REMOTE_ADDR' => '203.0.113.'.($index + 10)])+ ->post('/register', [+ 'name' => "Attack User {$index}",+ 'email' => $email,+ 'password' => 'Password1!@',+ 'password_confirmation' => 'Password1!@',+ ])+ ->assertRedirect();++ auth()->logout();+ $this->flushSession();+ }++ $this->withServerVariables(['REMOTE_ADDR' => '203.0.113.99'])+ ->post('/register', [+ 'name' => 'Blocked User',+ 'email' => '[email protected]',+ 'password' => 'Password1!@',+ 'password_confirmation' => 'Password1!@',+ ])+ ->assertTooManyRequests();+});diff --git a/tests/Feature/SentinelPushDeduplicationTest.php b/tests/Feature/SentinelPushDeduplicationTest.phpindex fb7b2df2e7..d88cff6584 100644--- a/tests/Feature/SentinelPushDeduplicationTest.php+++ b/tests/Feature/SentinelPushDeduplicationTest.php@@ -82,18 +82,9 @@ it('skips the job when the second push is identical', function () use ($running)Queue::assertPushed(PushServerUpdateJob::class, 1);});-it('only audits sentinel pushes that dispatch a state update', function () use ($running) {- $auditChannel = Mockery::mock();- $auditChannel->shouldReceive('info')- ->once()- ->with('sentinel.metrics_pushed', Mockery::on(function (array $context) {- return $context['server_uuid'] === $this->server->uuid- && $context['team_id'] === $this->team->id;- }));-- Log::shouldReceive('channel')->with('audit')->andReturn($auditChannel);+it('does not audit successful sentinel pushes', function () use ($running) {+ Log::shouldReceive('channel')->with('audit')->never();- pushSentinel($this->token, sentinelPayload($running()))->assertOk();pushSentinel($this->token, sentinelPayload($running()))->assertOk();Queue::assertPushed(PushServerUpdateJob::class, 1);diff --git a/tests/Feature/ServerNavbarStatusVisibilityTest.php b/tests/Feature/ServerNavbarStatusVisibilityTest.phpindex e39983552c..8cdc7b534f 100644--- a/tests/Feature/ServerNavbarStatusVisibilityTest.php+++ b/tests/Feature/ServerNavbarStatusVisibilityTest.php@@ -1,5 +1,6 @@<?php+use App\Livewire\Server\Navbar;use App\Models\InstanceSettings;use App\Models\Server;use App\Models\Team;@@ -52,3 +53,31 @@ it('shows sentinel sync status after the server is validated', function () {->assertSee('Sentinel')->assertSee('In sync');});++it('listens for sentinel restarted broadcasts', function () {+ [$server, , $team] = makeNavbarServer(isFunctional: true);++ Livewire::test('server.navbar', ['server' => $server])+ ->assertSet('server.uuid', $server->uuid);++ expect(app(Navbar::class)->getListeners())+ ->toHaveKey("echo-private:team.{$team->id},SentinelRestarted", 'refreshSentinelStatus');+});++it('refreshes sentinel status when sentinel restarts for the server', function () {+ [$server] = makeNavbarServer(isFunctional: true);+ $server->forceFill(['sentinel_updated_at' => now()->subDay()])->save();++ expect($server->fresh()->isSentinelLive())->toBeFalse();++ $component = Livewire::test('server.navbar', ['server' => $server->fresh()])+ ->assertSee('Sentinel')+ ->assertSee('Out of sync');++ $server->sentinelHeartbeat();++ $component+ ->call('refreshSentinelStatus', ['serverUuid' => $server->uuid])+ ->assertSee('In sync')+ ->assertDontSee('Out of sync');+});diff --git a/tests/Unit/EmailIdentityHelperTest.php b/tests/Unit/EmailIdentityHelperTest.phpnew file mode 100644index 0000000000..475c510094--- /dev/null+++ b/tests/Unit/EmailIdentityHelperTest.php@@ -0,0 +1,16 @@+<?php++it('normalizes plus and dotted email identity variants', function () {+ expect(normalize_email_identity('[email protected]'))->toBe('[email protected]');+ expect(normalize_email_identity('[email protected]'))->toBe('[email protected]');+});++it('returns null for blank or malformed email identities', function (?string $email) {+ expect(normalize_email_identity($email))->toBeNull();+})->with([+ null,+ '',+ 'not-an-email',+ '@example.com',+ 'local@',+]);diff --git a/tests/Unit/ServerHeaderLayoutTest.php b/tests/Unit/ServerHeaderLayoutTest.phpnew file mode 100644index 0000000000..879d6bb887--- /dev/null+++ b/tests/Unit/ServerHeaderLayoutTest.php@@ -0,0 +1,19 @@+<?php++test('server header renders subtitle before status badges', function () {+ $navbar = file_get_contents(__DIR__.'/../../resources/views/livewire/server/navbar.blade.php');++ $titlePosition = strpos($navbar, '<h1>Server</h1>');+ $subtitlePosition = strpos($navbar, 'data-testid="server-subtitle"');+ $statusPosition = strpos($navbar, 'data-testid="server-status-summary"');++ expect($navbar)->not->toContain('class="subtitle"')+ ->not->toContain('text-neutral-300')+ ->toContain('text-neutral-600 dark:text-neutral-400');++ expect($titlePosition)->not->toBeFalse()+ ->and($subtitlePosition)->not->toBeFalse()+ ->and($statusPosition)->not->toBeFalse()+ ->and($titlePosition)->toBeLessThan($subtitlePosition)+ ->and($subtitlePosition)->toBeLessThan($statusPosition);+});