Skip to content

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.

fix(domains): apply noindex to domains that include a port

Andras Bacsai2a202d9fe990
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index 3e047b2079..45ff5d43ed 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -7,6 +7,7 @@ use App\Models\Server;
use App\Models\Service;
use App\Models\ServiceApplication;
use App\Models\ServiceDatabase;
+use App\Support\DomainPortOverrides;
use App\Support\ValidationPatterns;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
@@ -765,9 +766,12 @@ function isNoindexDomain(string $domain, ?Collection $noindex_domains): bool
return false;
}
+ // Flags are stored without a port, so compare portless: https://app.example.com:3000 matches https://app.example.com.
+ $normalize = fn (string $url) => DomainPortOverrides::withoutPort(ValidationPatterns::normalizeApplicationDomainUrl($url));
+
return $noindex_domains
- ->map(fn (string $noindex_domain) => ValidationPatterns::normalizeApplicationDomainUrl($noindex_domain))
- ->contains(ValidationPatterns::normalizeApplicationDomainUrl($domain));
+ ->map($normalize)
+ ->contains($normalize($domain));
}
function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?bool $is_stripprefix_enabled = true, ?string $service_name = null, ?string $image = null, string $redirect_direction = 'both', ?string $predefinedPort = null, bool $is_http_basic_auth_enabled = false, ?string $http_basic_auth_username = null, ?string $http_basic_auth_password = null, ?Collection $noindex_domains = null, bool $is_traffic_analytics_enabled = false, array $domainPortOverrides = [], bool $supports_log_append = false, bool $supports_basic_auth_directive = false)
diff --git a/tests/Unit/FqdnLabelsNoindexTest.php b/tests/Unit/FqdnLabelsNoindexTest.php
index 49e9a6e8f1..3f77533d32 100644
--- a/tests/Unit/FqdnLabelsNoindexTest.php
+++ b/tests/Unit/FqdnLabelsNoindexTest.php
@@ -155,6 +155,15 @@ describe('Traefik noindex middleware', function () {
expect(middlewaresOf($labels, 'https-0-testuuid'))->toContain('0-testuuid-noindex');
});
+ test('a port in the configured domain does not silently drop the header', function () {
+ $labels = traefikLabels(
+ domains: ['https://app.example.com:3000'],
+ noindex: ['https://app.example.com'],
+ );
+
+ expect(middlewaresOf($labels, 'https-0-testuuid'))->toContain('0-testuuid-noindex');
+ });
+
test('a domain that is not configured is ignored', function () {
$labels = traefikLabels(
domains: ['https://example.com'],
@@ -221,6 +230,15 @@ describe('Caddy noindex header', function () {
expect(collect($labels)->filter(fn ($l) => str_contains($l, 'caddy_0.header.'))->all())->toBeEmpty();
});
+ test('a port in the configured domain does not silently drop the header', function () {
+ $labels = caddyLabels(
+ domains: ['https://app.example.com:3000'],
+ noindex: ['https://app.example.com'],
+ );
+
+ expect($labels)->toContain('caddy_0.header.1_X-Robots-Tag="noindex, nofollow"');
+ });
+
test('no flags means byte-identical output to before the feature', function () {
$domains = ['https://example.com', 'https://other.example.com'];