add mfarequiredexception to stoIf to fix ldap

- Prevent LDAP Authentication when local UAA authentication fails for MFAAuthenticationRequiredException [#151568420] Signed-off-by: Henry <Henry.zhao1@ge.com>
cloudfoundry · Oct 31, 2017 · 67d0db9 · 67d0db9
1 parent 85ca4cf
commit 67d0db9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...oudfoundry/identity/uaa/authentication/manager/DynamicZoneAwareAuthenticationManager.java b/...oudfoundry/identity/uaa/authentication/manager/DynamicZoneAwareAuthenticationManager.java
@@ -14,6 +14,7 @@
 
 import org.cloudfoundry.identity.uaa.authentication.AccountNotVerifiedException;
 import org.cloudfoundry.identity.uaa.authentication.AuthenticationPolicyRejectionException;
+import org.cloudfoundry.identity.uaa.authentication.MfaAuthenticationRequiredException;
 import org.cloudfoundry.identity.uaa.authentication.PasswordChangeRequiredException;
 import org.cloudfoundry.identity.uaa.authentication.manager.ChainedAuthenticationManager.AuthenticationManagerConfiguration;
 import org.cloudfoundry.identity.uaa.constants.OriginKeys;
@@ -72,7 +73,7 @@ protected ChainedAuthenticationManager getChainedAuthenticationManager(IdentityZ
 
         if (uaaProvider.isActive()) {
             AuthenticationManagerConfiguration uaaConfig = new AuthenticationManagerConfiguration(internalUaaAuthenticationManager, null);
-            uaaConfig.setStopIf(AccountNotVerifiedException.class, AuthenticationPolicyRejectionException.class, PasswordChangeRequiredException.class);
+            uaaConfig.setStopIf(AccountNotVerifiedException.class, AuthenticationPolicyRejectionException.class, PasswordChangeRequiredException.class, MfaAuthenticationRequiredException.class);
             delegates.add(uaaConfig);
         }
 

diff --git a/...src/test/java/org/cloudfoundry/identity/uaa/integration/TotpEndpointIntegrationTests.java b/...src/test/java/org/cloudfoundry/identity/uaa/integration/TotpEndpointIntegrationTests.java
@@ -85,8 +85,6 @@ public void cleanup() {
 
     @Test
     public void testQRCodeScreen() {
-
-
         performLogin(username);
         assertEquals(zoneUrl + "/login/mfa/register", webDriver.getCurrentUrl());