8.3.4

application/Espo/Core/Authentication/Hook/Hooks/FailedAttemptsLimit.php

@@ -68,8 +68,6 @@ class FailedAttemptsLimit implements BeforeLogin
             return;
         }
 
-        $isSecondStep = $request->getHeader('Espo-Authorization-Code') !== null;
-
         $failedAttemptsPeriod = $this->configDataProvider->getFailedAttemptsPeriod();
         $maxFailedAttempts = $this->configDataProvider->getMaxFailedAttemptNumber();
 
@@ -87,16 +85,9 @@ class FailedAttemptsLimit implements BeforeLogin
         $where = [
             'requestTime>' => $requestTimeFrom->format('U'),
             'isDenied' => true,
+            'ipAddress' => $ipAddress,
         ];
 
-        if ($isSecondStep) {
-            $where['username'] = $data->getUsername();
-        }
-
-        if (!$isSecondStep) {
-            $where['ipAddress'] = $ipAddress;
-        }
-
         $wasFailed = (bool) $this->entityManager
             ->getRDBRepository(AuthLogRecord::ENTITY_TYPE)
             ->select(['id'])
@@ -116,12 +107,6 @@ class FailedAttemptsLimit implements BeforeLogin
             return;
         }
 
-        if ($isSecondStep) {
-            $username = $data->getUsername() ?? '';
-
-            throw new Forbidden("Max failed 2FA login attempts exceeded for username '$username'.");
-        }
-
         throw new Forbidden("Max failed login attempts exceeded for IP address $ipAddress.");
     }
 }

application/Espo/Core/Authentication/Hook/Hooks/FailedCodeAttemptsLimit.php

@@ -0,0 +1,115 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Authentication\Hook\Hooks;
+
+use Espo\Core\Api\Request;
+use Espo\Core\Authentication\AuthenticationData;
+use Espo\Core\Authentication\ConfigDataProvider;
+use Espo\Core\Authentication\Hook\BeforeLogin;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Entities\AuthLogRecord;
+use Espo\ORM\EntityManager;
+
+use DateTime;
+use Exception;
+use RuntimeException;
+
+/**
+ * @noinspection PhpUnused
+ */
+class FailedCodeAttemptsLimit implements BeforeLogin
+{
+
+    public function __construct(
+        private ConfigDataProvider $configDataProvider,
+        private EntityManager $entityManager,
+    ) {}
+
+    /**
+     * @throws Forbidden
+     */
+    public function process(AuthenticationData $data, Request $request): void
+    {
+        if (
+            $request->getHeader('Espo-Authorization-Code') === null ||
+            $this->configDataProvider->isAuthLogDisabled()
+        ) {
+            return;
+        }
+
+        $isByTokenOnly = !$data->getMethod() && $request->getHeader('Espo-Authorization-By-Token') === 'true';
+
+        if ($isByTokenOnly) {
+            return;
+        }
+
+        $failedAttemptsPeriod = $this->configDataProvider->getFailedAttemptsPeriod();
+        $maxFailedAttempts = $this->configDataProvider->getMaxFailedAttemptNumber();
+
+        $requestTime = intval($request->getServerParam('REQUEST_TIME_FLOAT'));
+
+        try {
+            $requestTimeFrom = (new DateTime('@' . $requestTime))->modify('-' . $failedAttemptsPeriod);
+        }
+        catch (Exception $e) {
+            throw new RuntimeException($e->getMessage());
+        }
+
+        $where = [
+            'requestTime>' => $requestTimeFrom->format('U'),
+            'isDenied' => true,
+            'username' => $data->getUsername(),
+            'denialReason' => AuthLogRecord::DENIAL_REASON_WRONG_CODE,
+        ];
+
+        $wasFailed = (bool) $this->entityManager
+            ->getRDBRepository(AuthLogRecord::ENTITY_TYPE)
+            ->select(['id'])
+            ->where($where)
+            ->findOne();
+
+        if (!$wasFailed) {
+            return;
+        }
+
+        $failAttemptCount = $this->entityManager
+            ->getRDBRepository(AuthLogRecord::ENTITY_TYPE)
+            ->where($where)
+            ->count();
+
+        if ($failAttemptCount <= $maxFailedAttempts) {
+            return;
+        }
+
+        $username = $data->getUsername() ?? '';
+
+        throw new Forbidden("Max failed 2FA login attempts exceeded for username '$username'.");
+    }
+}

application/Espo/Core/Upgrades/Actions/Base.php

@@ -77,8 +77,8 @@ abstract class Base
     ];
 
     private ZipArchive $zipUtil;
-    private ?DatabaseHelper $databaseHelper;
-    private ?Helper $helper;
+    private ?DatabaseHelper $databaseHelper = null;
+    private ?Helper $helper = null;
 
     public function __construct(
         private Container $container,

application/Espo/Core/Upgrades/Migration/AfterUpgradeRunner.php

@@ -51,6 +51,13 @@ class AfterUpgradeRunner
             throw new RuntimeException("No after-upgrade script $step.");
         }
 
+        try {
+            $this->dataManager->rebuild();
+        }
+        catch (Error $e) {
+            throw new RuntimeException("Error while rebuild: " . $e->getMessage());
+        }
+
         /** @var Script $script */
         $script = $this->injectableFactory->createWith($className, ['isUpgrade' => false]);
         $script->run();

application/Espo/Resources/metadata/app/authentication.json

@@ -1,6 +1,7 @@
 {
     "beforeLoginHookClassNameList": [
-        "Espo\\Core\\Authentication\\Hook\\Hooks\\FailedAttemptsLimit"
+        "Espo\\Core\\Authentication\\Hook\\Hooks\\FailedAttemptsLimit",
+        "Espo\\Core\\Authentication\\Hook\\Hooks\\FailedCodeAttemptsLimit"
     ],
     "onLoginHookClassNameList": [
         "Espo\\Core\\Authentication\\Hook\\Hooks\\IpAddressWhitelist"

client/src/ui.js

@@ -505,7 +505,7 @@ class Dialog {
             $main.append($button);
         });
 
-        const allDdItemsHidden = this.dropdownItemList.filter(o => !o.hidden).length === 0;
+        const allDdItemsHidden = this.dropdownItemList.filter(o => o && !o.hidden).length === 0;
 
         const $dropdown = $('<div>')
             .addClass('btn-group')

client/src/views/fields/attachment-multiple.js

@@ -762,11 +762,12 @@ class AttachmentMultipleFieldView extends BaseFieldView {
         if (this.isDetailMode() || this.isListMode()) {
             const nameHash = this.nameHash;
             const typeHash = this.model.get(this.typeHashName) || {};
+            const ids = /** @type {string[]} */this.model.get(this.idsName) || [];
 
             const previews = [];
             const names = [];
 
-            for (const id in nameHash) {
+            for (const id of ids) {
                 const type = typeHash[id] || false;
                 const name = nameHash[id];
 

client/src/views/record/row-actions/relationship-unlink-only.js

@@ -43,6 +43,8 @@ class RelationshipUnlinkOnlyActionsView extends RelationshipActionsView {
                 },
             ];
         }
+
+        return [];
     }
 }
 

client/src/views/record/row-actions/remove-only.js

@@ -43,6 +43,8 @@ class RemoveOnlyRowActionsView extends DefaultRowActionsView {
                 }
             ];
         }
+
+        return [];
     }
 }
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "espocrm",
-  "version": "8.3.2",
+  "version": "8.3.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "espocrm",
-      "version": "8.3.2",
+      "version": "8.3.4",
       "hasInstallScript": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "8.3.2",
+  "version": "8.3.4",
   "description": "Open-source CRM.",
   "repository": {
     "type": "git",