Skip to content

Add redirect querystring check and utf8 requirement #3508

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
wants to merge 1 commit into
base: 7.2
Choose a base branch
from
Open

Add redirect querystring check and utf8 requirement #3508

Show file tree
Hide file tree
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
12 changes: 7 additions & 5 deletions src/Kunstmaan/RedirectBundle/Router/RedirectRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,21 +137,23 @@ private function initRouteCollection(string $pathInfo): void
}
}

$queryString = $this->context->getQueryString();
if ($queryString) {
$targetPath .= '?' . $queryString;
$isExternalHost = !\str_starts_with($targetPath, '/');
$targetPathHasQueryString = \str_contains($targetPath, '?');
if (($isExternalHost || $targetPathHasQueryString) && ($queryString = $this->context->getQueryString())) {
$targetPath .= ($targetPathHasQueryString ? '&' : '?') . $queryString;
}

$needsUtf8 = false;
foreach ([$routePath, $targetPath] as $item) {
$decodedPath = urldecode($routePath);
foreach ([$routePath, $decodedPath, $targetPath] as $item) {
if (preg_match('/[\x80-\xFF]/', $item)) {
$needsUtf8 = true;

break;
}
}

$route = new Route($routePath, [
$route = new Route($decodedPath, [
'_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction',
'path' => $targetPath,
'permanent' => $redirect->isPermanent(),
Expand Down
7 changes: 7 additions & 0 deletions src/Kunstmaan/RedirectBundle/Tests/Router/RedirectRouterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@ public function urlProviderForImprovedRouter(): iterable
yield 'Wildcard root origin to wildcard root target redirect with query params' => ['/test/abc/def?query=test', 'https://www.google.com/test/abc/def?query=test', $this->getRedirect(12, '/*', 'https://www.google.com/*')];
yield 'Wildcard root origin to wildcard root target with root path should not redirect' => ['/', null, $this->getRedirect(13, '/*', 'https://www.google.com/*')];
yield 'Redirect with query params' => ['/test?query=test', 'https://www.google.com/test?query=test', $this->getRedirect(14, '/test', 'https://www.google.com/test')];
yield 'Wildcard root origin to wildcard root target redirect with spaces' => ['/test/abc/%20def?query=test', 'https://www.google.com/test/abc/%20def?query=test', $this->getRedirect(15, '/*', 'https://www.google.com/*')];
yield 'Wildcard root origin to wildcard root target redirect with spaces unencoded' => ['/test/abc/ def?query=test', 'https://www.google.com/test/abc/ def?query=test', $this->getRedirect(16, '/*', 'https://www.google.com/*')];
yield 'Wildcard root origin to wildcard root target redirect with spaces unencoded, required UTF8, query parameter' => ['/documenten/2025bestand 2011 - 2022 (versie vóór kunstmaan).pdf?include=true', 'https://www.google.com/documenten/2025bestand 2011 - 2022 (versie vóór kunstmaan).pdf?include=true', $this->getRedirect(17, '/*', 'https://www.google.com/*')];
yield 'Redirect to external target redirect and query parameters' => ['/redirect?lorem=ipsum&var=ible', 'https://google.com?lorem=ipsum&var=ible', $this->getRedirect(18, '/redirect', 'https://google.com')];
yield 'Redirect to target redirect and query parameters' => ['/redirect?lorem=ipsum&var=ible', '/target-path', $this->getRedirect(19, '/redirect', '/target-path')];
yield 'Redirect with query parameter' => ['/redirect?lorem=ipsum&var=ible', '/target-path?foo=baz&lorem=ipsum&var=ible', $this->getRedirect(20, '/redirect', '/target-path?foo=baz')];
yield 'Redirect with query parameter to external target' => ['/redirect?lorem=ipsum&var=ible', 'https://google.com/target-path?foo=baz&lorem=ipsum&var=ible', $this->getRedirect(21, '/redirect', 'https://google.com/target-path?foo=baz')];
}

private function getRedirect(int $id, string $origin, string $target, bool $permanent = false, ?string $domain = null): Redirect
Expand Down