Fix 2FA becoming enabled when the user inputs the wrong code during setup (apache#7972)

winterhazel · yadvr · commit 4f86c452de05 · 2023-10-09T19:15:25.000+05:30
(cherry picked from commit ef74221) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
@@ -3251,7 +3251,7 @@ public void verifyUsingTwoFactorAuthenticationCode(final String code, final Long
                 _userDetailsDao.update(userDetailVO.getId(), userDetailVO);
             }
         } catch (CloudTwoFactorAuthenticationException e) {
-            UserDetailVO userDetailVO = _userDetailsDao.findDetail(userAccountId, "2FAsetupComplete");
+            UserDetailVO userDetailVO = _userDetailsDao.findDetail(userAccountId, UserDetailVO.Setup2FADetail);
             if (userDetailVO != null && userDetailVO.getValue().equals(UserAccountVO.Setup2FAstatus.ENABLED.name())) {
                 disableTwoFactorAuthentication(userAccountId, caller, owner);
             }

Original file line number	Diff line number	Diff line change
`@@ -3251,7 +3251,7 @@ public void verifyUsingTwoFactorAuthenticationCode(final String code, final Long`
`3251`	`3251`	`_userDetailsDao.update(userDetailVO.getId(), userDetailVO);`
`3252`	`3252`	`}`
`3253`	`3253`	`} catch (CloudTwoFactorAuthenticationException e) {`
`3254`		`- UserDetailVO userDetailVO = _userDetailsDao.findDetail(userAccountId, "2FAsetupComplete");`
	`3254`	`+ UserDetailVO userDetailVO = _userDetailsDao.findDetail(userAccountId, UserDetailVO.Setup2FADetail);`
`3255`	`3255`	`if (userDetailVO != null && userDetailVO.getValue().equals(UserAccountVO.Setup2FAstatus.ENABLED.name())) {`
`3256`	`3256`	`disableTwoFactorAuthentication(userAccountId, caller, owner);`
`3257`	`3257`	`}`