Skip to content

Only match exact main and subdomains #555

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

Merged
merged 2 commits into from
May 9, 2025
Merged

Only match exact main and subdomains #555

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
168bdb7
Only match exact main and subdomains
DieterHolvoet May 7, 2025
074bb42
Stop using regex
DieterHolvoet May 9, 2025
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
9 changes: 8 additions & 1 deletion src/ExtractorFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,14 @@ public function createExtractor(UriInterface $uri, RequestInterface $request, Re
$class = $this->default;

foreach ($this->adapters as $adapterHost => $adapter) {
if (substr($host, -strlen($adapterHost)) === $adapterHost) {
// Check if $host is the same domain as $adapterHost.
if ($host === $adapterHost) {
$class = $adapter;
break;
}

// Check if $host is a subdomain of $adapterHost.
if (preg_match('/^([a-z0-9-]+)\.' . preg_quote($adapterHost, '/') . '$/i', $host, $matches)) {
$class = $adapter;
break;
}
Expand Down
Loading