Skip to content
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

Fix #2704: ensure route registered via $routes->cli() not accessible via web browser even autoroute is true #2707

Merged
merged 12 commits into from
Mar 22, 2020
Merged

Fix #2704: ensure route registered via $routes->cli() not accessible via web browser even autoroute is true #2707

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5717767
fix #2704: ensure route registered via $routes->cli() not accessible …
samsonasik Mar 15, 2020
73077d8
using strpos to handle segment parameter, eg: /hello/(:any) with cli
samsonasik Mar 15, 2020
e90620f
using strpos to handle segment parameter, eg: /hello/(:any) with cli
samsonasik Mar 15, 2020
fe5e0ca
using PageNotfoundException for call cli route from web
samsonasik Mar 15, 2020
200f981
add unit test for open cli routes from http
samsonasik Mar 19, 2020
e0807e3
tweak test open cli routes from http implemented
samsonasik Mar 19, 2020
04e0ad4
using withRoutes() syntax in feature test case
samsonasik Mar 19, 2020
19fc140
add test case for parameterized cli routes open from http got 404
samsonasik Mar 19, 2020
e36edd7
using dataProvider in test open cli routes from http got 404 for para…
samsonasik Mar 19, 2020
92058e5
add condition for default method index when routing defined in cli as…
samsonasik Mar 19, 2020
36a9a10
add condition for multi case, eg: capitalized controller in URI
samsonasik Mar 19, 2020
d5af6b3
add condition for multi case, eg: capitalized controller and/or metho…
samsonasik Mar 19, 2020
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
19 changes: 19 additions & 0 deletions system/Router/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,25 @@ public function autoRoute(string $uri)
$this->params = $segments;
}

if ($this->collection->getHTTPVerb() !== 'cli')
{
$controller = '\\' . $this->collection->getDefaultNamespace();
$controller .= $this->directory ? str_replace('/', '\\', $this->directory) : '';
$controller .= $this->controllerName();
$methodName = $this->methodName();

foreach ($this->collection->getRoutes('cli') as $route)
{
if (is_string($route))
{
if (strpos($route, $controller . '::' . $methodName) === 0)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using strpos is on purpose to handle parameter, eg: controller::method/$1:

$routes->cli('hello/(:any)', 'Commands\Hello::index/$1');

{
throw new PageNotFoundException();
}
}
}
}

// Load the file so that it's available for CodeIgniter.
$file = APPPATH . 'Controllers/' . $this->directory . $this->controllerName() . '.php';
if (is_file($file))
Expand Down
11 changes: 11 additions & 0 deletions tests/_support/Controllers/Hello.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php namespace App\Controllers;

use CodeIgniter\Controller;

class Hello extends Controller
{
public function index()
{
return 'Hello';
}
}
21 changes: 21 additions & 0 deletions tests/system/Test/FeatureTestCaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,25 @@ public function testCallZeroAsPathGot404()
}
$this->get('0');
}

public function testOpenCliRoutesFromHttpGot404()
{
$this->expectException(PageNotFoundException::class);
Copy link
Member

@kenjis kenjis Apr 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I add the following test case,
the test passes because there is no App\Controllers\Hello class.

            'parameterized method cli' => [
                'hello/(:segment)',
                'Hello::$1',
                'Hello/index',
            ],

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These tests pass because there is no App\Controllers\Hello class.


require_once SUPPORTPATH . 'Controllers/Hello.php';

$this->withRoutes([
[
'cli',
'hello',
'Hello::index',
],
]);

while (\ob_get_level() > 0)
{
\ob_end_flush();
}
$this->get('Hello');
}
}