Skip to content

Fix redirect encoding #444

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
jonasdekeukelaere merged 2 commits into from
Jun 4, 2026
Merged

Fix redirect encoding #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dad522
Fix redirect encoding
Jun 4, 2026
287fc1b
Fix rebuilding url after encoding path
Jun 4, 2026
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
55 changes: 44 additions & 11 deletions src/Backend/Modules/Pages/Engine/Model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,20 +1546,53 @@ public static function updatePagesTemplates(int $oldTemplateId, int $newTemplate

public static function getEncodedRedirectUrl(string $redirectUrl): string
{
preg_match('!(http[s]?)://(.*)!i', $redirectUrl, $matches);
$urlChunks = explode('/', $matches[2]);
/** @phpstan-ignore-next-line */
if (!empty($urlChunks)) {
// skip domain name
$domain = array_shift($urlChunks);
foreach ($urlChunks as &$urlChunk) {
$urlChunk = rawurlencode($urlChunk);
$parsedUrl = parse_url($redirectUrl);

if ($parsedUrl === false) {
return $redirectUrl;
}

// Encode quotes in url path
if (isset($parsedUrl['path'])) {
$parsedUrl['path'] = str_replace(['"', '\''], ['%22', '%27'], $parsedUrl['path']);
}

// Rebuild URL
$url = '';

if (isset($parsedUrl['scheme'])) {
$url .= $parsedUrl['scheme'];
$url .= isset($parsedUrl['host']) ? '://' : ':';
}

if (isset($parsedUrl['host'])) {
if (isset($parsedUrl['user'])) {
$url .= $parsedUrl['user'];

if (isset($parsedUrl['pass'])) {
$url .= ':' . $parsedUrl['pass'];
}

$url .= '@';
}

$url .= $parsedUrl['host'];

if (isset($parsedUrl['port'])) {
$url .= ':' . $parsedUrl['port'];
}
unset($urlChunk);
$redirectUrl = $matches[1] . '://' . $domain . '/' . implode('/', $urlChunks);
}

return $redirectUrl;
$url .= $parsedUrl['path'] ?? '';

if (isset($parsedUrl['query'])) {
$url .= '?' . $parsedUrl['query'];
}
if (isset($parsedUrl['fragment'])) {
$url .= '#' . $parsedUrl['fragment'];
}

return $url;
}

private static function getNewParent(int $droppedOnPageId, string $typeOfDrop, array $droppedOnPage): int
Expand Down
12 changes: 12 additions & 0 deletions src/Backend/Modules/Pages/Tests/Model/ModelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,17 @@ public function testUrlIsEncoded(): void
'http://cédé.be/Quote%22HelloWorld%22',
Model::getEncodedRedirectUrl('http://cédé.be/Quote"HelloWorld"')
);
self::assertEquals(
'http://example.com/test#événements',
Model::getEncodedRedirectUrl('http://example.com/test#événements')
);
self::assertEquals(
'https://user:pass@example.com:8443/foo%22bar?x=1#frag',
Model::getEncodedRedirectUrl('https://user:pass@example.com:8443/foo"bar?x=1#frag')
);
self::assertEquals(
'https://example.com?foo=bar#frag',
Model::getEncodedRedirectUrl('https://example.com?foo=bar#frag')
);
}
}
Loading