From dd595b9a78e635bc66ed701da28392180d10eae2 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 16 Dec 2024 16:51:33 +0100 Subject: [PATCH] MVC: call initialize() after authentication, which is the same as it was in Phalcon earlier. This fixes a small regression not being able to access user data during init and prevents executing code before the user is authenticated, although in practice this is only boilerplate in our codebase. --- src/opnsense/mvc/app/library/OPNsense/Mvc/Dispatcher.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/opnsense/mvc/app/library/OPNsense/Mvc/Dispatcher.php b/src/opnsense/mvc/app/library/OPNsense/Mvc/Dispatcher.php index 02479e986..26c0a38d6 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Mvc/Dispatcher.php +++ b/src/opnsense/mvc/app/library/OPNsense/Mvc/Dispatcher.php @@ -157,11 +157,12 @@ class Dispatcher $controller->response = $response; $controller->security = new Security($session, $request); - $controller->initialize(); - if ($controller->beforeExecuteRoute($this) === false) { return false; } + /* call initialize() after authentication */ + $controller->initialize(); + $this->returnedValue = $controller->{$this->action}(...$this->parameters); $session->close(); $controller->afterExecuteRoute($this);