Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docs/changelogs/v4.7.7.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Release Date: Unreleased
- **HTTP:** Fixed a bug where query-string based routing truncated additional query parameters in `SiteURIFactory::parseRequestURI()` due to incorrect array index access.
- **HTTP:** Fixed a bug where `UploadedFile::move()` and `UploadedFile::store()` on Windows could store a file under a different name than `getName()` reported, or write its contents to an NTFS alternate data stream. Filenames ending in a period or space or containing a colon are now rejected, including explicitly supplied names.
- **Images:** Fixed a bug in `ImageMagickHandler::save()` where saving without an extension or with an unsupported extension threw an `ImagickException` instead of falling back to the image's format.
- **Routing:** Fixed a bug where redirect routes containing the `{locale}` placeholder were not recognized as redirects and did not replace `{locale}` in the redirect target.
- **Security:** Fixed a bug where `Security::__construct()` threw a `TypeError` when the CSRF cookie was an array, causing an HTTP 500 response for affected requests.
- **Session:** Fixed a bug where `BaseHandler::destroyCookie()` did not send the `SameSite` attribute in the `Set-Cookie` header, which could prevent browsers from properly clearing the session cookie.
- **Worker Mode:** Fixed a bug where every request that ended with an uncaught exception, including a `404 Page Not Found` without a 404 override, called `exit()` in the exception handler. This ended the worker script, so FrankenPHP booted a new one, and the worker loop skipped its cleanup after the request. The exception handler now returns to the worker loop.
Expand Down
32 changes: 18 additions & 14 deletions system/Router/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -457,20 +457,6 @@ protected function checkRoutes(string $uri): bool

// Does the RegEx match?
if (preg_match('#^' . $routeKey . '$#u', $uri, $matches)) {
// Is this route supposed to redirect to another?
if ($this->collection->isRedirect($routeKey)) {
// replacing matched route groups with references: post/([0-9]+) -> post/$1
$redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
static $i = 1;

return '$' . $i++;
}, is_array($handler) ? key($handler) : $handler);

throw new RedirectException(
preg_replace('#\A' . $routeKey . '\z#u', $redirectTo, $uri),
$this->collection->getRedirectCode($routeKey),
);
}
// Store our locale so CodeIgniter object can
// assign it to the Request.
if (str_contains($matchedKey, '{locale}')) {
Expand All @@ -491,6 +477,24 @@ protected function checkRoutes(string $uri): bool
unset($matched);
}

if ($this->collection->isRedirect($matchedKey)) {
// replacing matched route groups with references: post/([0-9]+) -> post/$1
$redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
static $i = 1;

return '$' . $i++;
}, is_array($handler) ? key($handler) : $handler);

if (str_contains($matchedKey, '{locale}')) {
$redirectTo = str_replace('{locale}', $this->detectedLocale, $redirectTo);
}

throw new RedirectException(
preg_replace('#\A' . $routeKey . '\z#u', $redirectTo, $uri),
$this->collection->getRedirectCode($matchedKey),
);
}

// Are we using Closures? If so, then we need
// to collect the params into an array
// so it can be passed to the controller method later.
Expand Down
32 changes: 29 additions & 3 deletions tests/system/Router/RouterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -949,36 +949,62 @@ public function testRedirectRoute(
string $url,
string $expectedPath,
string $alias,
int $status = 302,
): void {
$collection = clone $this->collection;
$collection->resetRoutes();

$collection->get($route, 'Controller::method', ['as' => $alias]);
$collection->addRedirect($redirectFrom, $redirectTo);
$collection->addRedirect($redirectFrom, $redirectTo, $status);

$this->expectException(RedirectException::class);
$this->expectExceptionMessage($expectedPath);
$this->expectExceptionCode($status);

$router = new Router($collection, $this->request);
$router->handle($url);
}

/**
* @return iterable<int, array{string, string, string, string, string, string}>
* @return iterable<int, array{string, string, string, string, string, string, 6?: int}>
*/
public static function provideRedirectRoute(): iterable
{
// [$route, $redirectFrom, $redirectTo, $url, $expectedPath, $alias]
// [$route, $redirectFrom, $redirectTo, $url, $expectedPath, $alias, $status]
return [
['posts', 'articles', 'posts', '/articles', 'posts', 'alias'],
['posts', 'articles', 'alias', '/articles', 'posts', 'alias'],
['post/(:num)', 'article/(:num)', 'post/$1', '/article/1', 'post/1', 'alias'],
['post/(:num)', 'article/(:num)', 'alias', '/article/1', 'post/1', 'alias'],
['post/(:num)/comment/(:any)', 'article/(:num)/(:any)', 'post/$1/comment/$2', '/article/1/2', 'post/1/comment/2', 'alias'],
['post/(:segment)/comment/(:any)', 'article/(:num)/(:any)', 'alias', '/article/1/2', 'post/1/comment/2', 'alias'],
['posts', '{locale}/articles', 'posts', '/en/articles', 'posts', 'alias'],
['{locale}/posts', '{locale}/articles', '{locale}/posts', '/en/articles', 'en/posts', 'alias'],
['{locale}/posts', '{locale}/articles', '{locale}/posts', '/en/articles', 'en/posts', 'alias', 301],
['{locale}/posts', '{locale}/articles', 'alias', '/en/articles', 'en/posts', 'alias'],
['{locale}/post/(:num)', '{locale}/article/(:num)', '{locale}/post/$1', '/en/article/1', 'en/post/1', 'alias'],
['{locale}/post/(:num)', '{locale}/article/(:num)', 'alias', '/en/article/1', 'en/post/1', 'alias'],
];
}

public function testRedirectRouteWithUnsupportedLocale(): void
{
$config = config(App::class);
$config->supportedLocales = ['en'];

$collection = clone $this->collection;
$collection->resetRoutes();
$collection->useSupportedLocalesOnly(true);

$collection->get('{locale}/posts', 'Controller::method');
$collection->addRedirect('{locale}/articles', '{locale}/posts');

$this->expectException(PageNotFoundException::class);

$router = new Router($collection, $this->request);
$router->handle('/fr/articles');
}

public function testRoutePlaceholderAnyWithMultipleSegmentsParamFalse(): void
{
$this->createRouteCollection();
Expand Down
Loading