fixed logging when allow list applies to login

matomo-org · Jul 2, 2024 · 7186004 · 7186004
1 parent 1fe6141
commit 7186004
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
@@ -152,25 +152,26 @@ public function login($messageNoAccess = null, $infoMessage = false)
             $ip = IP::getIpFromHeader();
             try {
                 $list->checkIsAllowed($ip);
-            } catch (\Exception $e) {
+            }
+            catch (\Exception $e) {
                 $messageNoAccess = Config::getInstance()->General['login_disabled_message'] ?? ' ';
             }
-        } else {
-            if ($form->validate()) {
-                $nonce = $form->getSubmitValue('form_nonce');
-                $messageNoAccess = Nonce::verifyNonceWithErrorMessage('Login.login', $nonce, null);
-
-                // validate if there is error message
-                if ($messageNoAccess === "") {
-                    $loginOrEmail = $form->getSubmitValue('form_login');
-                    $login = $this->getLoginFromLoginOrEmail($loginOrEmail);
-
-                    $password = $form->getSubmitValue('form_password');
-                    try {
-                        $this->authenticateAndRedirect($login, $password);
-                    } catch (Exception $e) {
-                        $messageNoAccess = $e->getMessage();
-                    }
+        }
+
+        if (empty($messageNoAccess) && $form->validate()) {
+            $nonce = $form->getSubmitValue('form_nonce');
+            $messageNoAccess = Nonce::verifyNonceWithErrorMessage('Login.login', $nonce, null);
+
+            // validate if there is error message
+            if ($messageNoAccess === "") {
+                $loginOrEmail = $form->getSubmitValue('form_login');
+                $login = $this->getLoginFromLoginOrEmail($loginOrEmail);
+
+                $password = $form->getSubmitValue('form_password');
+                try {
+                    $this->authenticateAndRedirect($login, $password);
+                } catch (Exception $e) {
+                    $messageNoAccess = $e->getMessage();
                 }
             }
         }