Fix logic to lock records

ORCID · Dec 23, 2024 · 583d549 · 583d549
1 parent 57693ad
commit 583d549
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/orcid-persistence/src/test/java/org/orcid/persistence/dao/NotificationDaoTest.java b/orcid-persistence/src/test/java/org/orcid/persistence/dao/NotificationDaoTest.java
@@ -304,7 +304,7 @@ public void testFindLatestByOrcid() throws IllegalAccessException {
             if (lastId == null) {
                 lastId = freshFromDB.getId();
             } else {
-                assertTrue(lastId < freshFromDB.getId());
+                assertTrue(lastId + " is not less than " + freshFromDB.getId(), lastId < freshFromDB.getId());
                 lastId = freshFromDB.getId();
             }
         }

diff --git a/orcid-web/src/main/java/org/orcid/frontend/spring/OrcidAuthenticationProvider.java b/orcid-web/src/main/java/org/orcid/frontend/spring/OrcidAuthenticationProvider.java
@@ -7,11 +7,13 @@
 import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.orcid.core.manager.BackupCodeManager;
 import org.orcid.core.manager.ProfileEntityCacheManager;
 import org.orcid.core.manager.TwoFactorAuthenticationManager;
 import org.orcid.core.manager.v3.ProfileEntityManager;
 import org.orcid.core.manager.v3.read_only.EmailManagerReadOnly;
+import org.orcid.core.oauth.OrcidProfileUserDetails;
 import org.orcid.core.security.OrcidUserDetailsService;
 import org.orcid.core.togglz.Features;
 import org.orcid.frontend.web.exception.Bad2FARecoveryCodeException;
@@ -67,51 +69,51 @@ public Authentication authenticate(Authentication auth) throws AuthenticationExc
         ProfileEntity profile = null;
         Integer signinLockCount = null;
         Date signinLockStart = null;
+        String userOrcid = null;
         boolean succesfulLoginAccountLocked = false;
         try {
-
             result = super.authenticate(auth);
-            // 1.retrieve the existing signin lock info
             profile = getProfileEntity(auth.getName());
-            if (profile == null) {
-                throw new BadCredentialsException("Invalid username or password");
-            }
-
+            userOrcid = profile.getId();
             if (!Features.ACCOUNT_LOCKOUT_SIMULATION.isActive()) {
                 // 2.lock window active
                 if (isLockThreshHoldExceeded(profile.getSigninLockCount(), profile.getSigninLockStart())) {
-                    LOGGER.info("Correct sign in but threshhold exceeded for: " + profile.getId());
+                    LOGGER.info("Correct sign in but threshhold exceeded for: " + userOrcid);
                     succesfulLoginAccountLocked = true;
-                    throw new BadCredentialsException("Lock Threashold Exceeded for " + profile.getId());
+                    throw new BadCredentialsException("Lock Threashold Exceeded for " + userOrcid);
                 } else if ((profile.getSigninLockCount() == null) || (profile.getSigninLockCount() > 0 && Features.ENABLE_ACCOUNT_LOCKOUT.isActive())) {
-                    LOGGER.info("Reset the signin lock after correct login outside of locked window for: " + profile.getId());
-                    profileEntityManager.resetSigninLock(profile.getId());
+                    LOGGER.info("Reset the signin lock after correct login outside of locked window for: " + userOrcid);
+                    profileEntityManager.resetSigninLock(userOrcid);
                 }
             }
 
         } catch (BadCredentialsException bce) {
             // update the DB for lock threshhold fields
-            try {
-                if (Features.ENABLE_ACCOUNT_LOCKOUT.isActive() && !succesfulLoginAccountLocked) {
+            if (Features.ENABLE_ACCOUNT_LOCKOUT.isActive() && !succesfulLoginAccountLocked) {
+                try {
+                    profile = getProfileEntity(auth.getName());
+                    userOrcid = profile.getId();
+
                     LOGGER.info("Invalid password attempt updating signin lock");
-                    if (profile == null) {
-                        profile = getProfileEntity(auth.getName());
-                    }
                     // get the locking info
-                    List<Object[]> lockInfoList = profileEntityManager.getSigninLock(profile.getId());
-                    signinLockCount = (Integer) lockInfoList.get(0)[2];
-                    signinLockStart = (Date) lockInfoList.get(0)[0];
+                    signinLockCount = profile.getSigninLockCount();
+                    signinLockStart = profile.getSigninLockStart();
                     if (signinLockStart == null) {
-                        profileEntityManager.startSigninLock(profile.getId());
+                        profileEntityManager.startSigninLock(userOrcid);
                     }
 
-                    profileEntityManager.updateSigninLock(profile.getId(), signinLockCount + 1);
-                    profileEntityCacheManager.remove(profile.getId());
-                }
-
-            } catch (Exception ex) {
-                if (!(ex instanceof javax.persistence.NoResultException)) {
-                    LOGGER.error("Exception while saving sign in lock.", ex);
+                    profileEntityManager.updateSigninLock(userOrcid, (signinLockCount == null ? 1 : (signinLockCount + 1)));
+                    profileEntityCacheManager.remove(userOrcid);
+                } catch (Exception ex) {
+                    //TODO: This try/catch should be removed as soon as we confirm there are no more exceptions while updating the sign in lock.
+                    if (!(ex instanceof javax.persistence.NoResultException)) {
+                        Throwable rootCause = ExceptionUtils.getRootCause(ex);
+                        if(rootCause != null) {
+                            LOGGER.error("An exception has occurred processing request from user " + auth.getName() + ". " + rootCause.getClass().getSimpleName() + ": " + rootCause.getMessage());
+                        } else {
+                            LOGGER.error("An exception has occurred processing request from user " + auth.getName() + ". " + ex.getClass().getSimpleName() + ": " + ex.getMessage());
+                        }
+                    }
                 }
             }
             throw bce;