refactor: move logic to prevent access to initController

codeigniter4 · Feb 3, 2022 · fa60803 · fa60803
1 parent 51fee60
commit fa60803
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/system/Config/Routes.php b/system/Config/Routes.php
@@ -9,8 +9,6 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\Exceptions\PageNotFoundException;
-
 /*
  * System URI Routing
  *
@@ -21,11 +19,6 @@
  * already loaded up and ready for us to use.
  */
 
-// Prevent access to initController method
-$routes->add('(:any)/initController', static function () {
-    throw PageNotFoundException::forPageNotFound();
-});
-
 // Migrations
 $routes->cli('migrations/(:segment)/(:segment)', '\CodeIgniter\Commands\MigrationsCommand::$1/$2');
 $routes->cli('migrations/(:segment)', '\CodeIgniter\Commands\MigrationsCommand::$1');

diff --git a/system/Router/Router.php b/system/Router/Router.php
@@ -485,6 +485,11 @@ public function autoRoute(string $uri)
             $this->method = array_shift($segments) ?: $this->method;
         }
 
+        // Prevent access to initController method
+        if (strtolower($this->method) === 'initcontroller') {
+            throw PageNotFoundException::forPageNotFound();
+        }
+
         if (! empty($segments)) {
             $this->params = $segments;
         }

diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
@@ -362,6 +362,16 @@ public function testAutoRouteRejectsMidDot()
         $router->autoRoute('Foo.bar');
     }
 
+    public function testAutoRouteRejectsInitController()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
+
+        $this->expectException(PageNotFoundException::class);
+
+        $router->autoRoute('home/initController');
+    }
+
     public function testDetectsLocales()
     {
         $router = new Router($this->collection, $this->request);