rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes auto-committed by Conductor

Browse source
This commit is contained in:
Andras Bacsai 2025-10-20 12:59:57 +02:00
parent 84559a0e7d
commit e1fe586397
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/Http/Middleware/TrustHosts.php
View file

@ -30,6 +30,12 @@ public function handle(Request $request, $next)
return $next($request);
}
// Skip host validation if no FQDN is configured (initial setup)
$fqdnHost = Cache::get('instance_settings_fqdn_host');
if ($fqdnHost === '' || $fqdnHost === null) {
return $next($request);
}
// For all other routes, use parent's host validation
return parent::handle($request, $next);
}
@ -69,6 +75,19 @@ public function hosts(): array
$trustedHosts[] = $fqdnHost;
}
// Trust the APP_URL host itself (not just subdomains)
$appUrl = config('app.url');
if ($appUrl) {
try {
$appUrlHost = parse_url($appUrl, PHP_URL_HOST);
if ($appUrlHost && ! in_array($appUrlHost, $trustedHosts, true)) {
$trustedHosts[] = $appUrlHost;
}
} catch (\Exception $e) {
// Ignore parse errors
}
}
// Trust all subdomains of APP_URL as fallback
$trustedHosts[] = $this->allSubdomainsOfApplicationUrl();

4
resources/views/components/forms/datalist.blade.php
View file

@ -139,7 +139,7 @@ class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neu
</div>
</template>
<template x-for="option in (filteredOptions || [])" :key="option.value">
<template x-for="(option, index) in (filteredOptions || [])" :key="option?.value || index">
<div @click="toggleOption(option.value)"
class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200 flex items-center gap-3"
:class="{ 'bg-neutral-50 dark:bg-coolgray-300': isSelected(option.value) }">
@ -268,7 +268,7 @@ class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neu
</div>
</template>
<template x-for="option in (filteredOptions || [])" :key="option.value">
<template x-for="(option, index) in (filteredOptions || [])" :key="option?.value || index">
<div @click="selectOption(option.value)"
class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200"
:class="{ 'bg-neutral-50 dark:bg-coolgray-300': selected == option.value }">