Skip to content

fix: prevent subdomain-only route from overwriting hostname route #10211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jalexiscv wants to merge 1 commit into
base: develop
Choose a base branch
from
+20 −3
Open

fix: prevent subdomain-only route from overwriting hostname route #10211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions system/Router/RouteCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,23 +1475,29 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
}

// Hostname limiting?
$matchedByHostname = false;

if (! empty($options['hostname'])) {
// @todo determine if there's a way to whitelist hosts?
if (! $this->checkHostname($options['hostname'])) {
return;
}

$overwrite = true;
$overwrite = true;
$matchedByHostname = true;
}
// Limiting to subdomains?
elseif (! empty($options['subdomain'])) {
$matchedBySubdomain = false;

if (! empty($options['subdomain'])) {
// If we don't match the current subdomain, then
// we don't need to add the route.
if (! $this->checkSubdomains($options['subdomain'])) {
return;
}

$overwrite = true;
$overwrite = true;
$matchedBySubdomain = true;
}

// Are we offsetting the binds?
Expand Down Expand Up @@ -1541,6 +1547,17 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
// this works only because discovered routes are added just prior
// to attempting to route the request.
$routeKeyExists = isset($this->routes[$verb][$routeKey]);

// Prevent a subdomain-only route from overwriting a hostname-matched route,
// since hostname is more specific than subdomain.
if ($routeKeyExists && $matchedBySubdomain && ! $matchedByHostname) {
$existingOptions = $this->routesOptions[$verb][$routeKey] ?? [];

if (! empty($existingOptions['hostname'])) {
return;
}
}

if ((isset($this->routesNames[$verb][$name]) || $routeKeyExists) && ! $overwrite) {
return;
}
Expand Down