malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: throws exception when controller name in routes contains /

Browse Source
This commit is contained in:
kenjis 2022-04-09 09:04:37 +09:00
parent 1f9af01384
commit 830750edd4
No known key found for this signature in database
GPG Key ID: BD254878922AF198
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
system/Language/en/Router.php
View File

@ -14,4 +14,5 @@ return [
'invalidParameter' => 'A parameter does not match the expected type.',
'missingDefaultRoute' => 'Unable to determine what should be displayed. A default route has not been specified in the routing file.',
'invalidDynamicController' => 'A dynamic controller is not allowed for security reasons. Route handler: {0}',
'invalidControllerName' => 'The namespace delimiter is a backslash (\), not a slash (/). Route handler: {0}',
];

10
system/Router/Exceptions/RouterException.php
View File

@ -68,4 +68,14 @@ class RouterException extends FrameworkException
{
return new static(lang('Router.invalidDynamicController', [$handler]));
}
/**
* Throw when controller name has `/`.
*
* @return RouterException
*/
public static function forInvalidControllerName(string $handler)
{
return new static(lang('Router.invalidControllerName', [$handler]));
}
}

5
system/Router/Router.php
View File

@ -426,6 +426,11 @@ class Router implements RouterInterface
throw RouterException::forDynamicController($handler);
}
// Checks `/` in controller name
if (strpos($controller, '/') !== false) {
throw RouterException::forInvalidControllerName($handler);
}
if (strpos($routeKey, '/') !== false) {
$replacekey = str_replace('/(.*)', '', $routeKey);
$handler = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);

12
tests/system/Router/RouterTest.php
View File

@ -61,6 +61,7 @@ final class RouterTest extends CIUnitTestCase
'closure/(:num)/(:alpha)' => static fn ($num, $str) => $num . '-' . $str,
'{locale}/pages' => 'App\Pages::list_all',
'admin/admins' => 'App\Admin\Admins::list_all',
'admin/admins/edit/(:any)' => 'App/Admin/Admins::edit_show/$1',
'/some/slash' => 'App\Slash::index',
'objects/(:segment)/sort/(:segment)/([A-Z]{3,7})' => 'AdminList::objectsSortCreate/$1/$2/$3',
'(:segment)/(:segment)/(:segment)' => '$2::$3/$1',
@ -402,6 +403,17 @@ final class RouterTest extends CIUnitTestCase
$this->assertSame('list_all', $router->methodName());
}
public function testRouteWithSlashInControllerName()
{
$this->expectExceptionMessage(
'The namespace delimiter is a backslash (\), not a slash (/). Route handler: \App/Admin/Admins::edit_show/$1'
);
$router = new Router($this->collection, $this->request);
$router->handle('admin/admins/edit/1');
}
public function testRouteWithLeadingSlash()
{
$router = new Router($this->collection, $this->request);