Merge pull request #4797 from stianst/KEYCLOAK-5734

KEYCLOAK-5734

services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java

@@ -138,6 +138,7 @@ public class FormAuthenticationFlow implements AuthenticationFlow {
     private class ValidationContextImpl extends FormContextImpl implements ValidationContext {
         FormAction action;
         String error;
+        boolean excludeOthers;
 
         private ValidationContextImpl(AuthenticationExecutionModel executionModel, FormAction action) {
             super(executionModel);
@@ -161,6 +162,11 @@ public class FormAuthenticationFlow implements AuthenticationFlow {
         public void success() {
            success = true;
         }
+
+        @Override
+        public void excludeOtherErrors() {
+            excludeOthers = true;
+        }
     }
 
     @Override
@@ -222,8 +228,17 @@ public class FormAuthenticationFlow implements AuthenticationFlow {
             for (ValidationContextImpl v : errors) {
                 for (FormMessage m : v.errors) {
                     if (!fields.contains(m.getField())) {
+                        if (v.excludeOthers) {
+                            fields.clear();
+                            messages.clear();
+                        }
+
                         fields.add(m.getField());
                         messages.add(m);
+
+                        if (v.excludeOthers) {
+                            break;
+                        }
                     }
                 }
             }

services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java

@@ -127,6 +127,7 @@ public class RegistrationRecaptcha implements FormAction, FormActionFactory, Con
             formData.remove(G_RECAPTCHA_RESPONSE);
             context.error(Errors.INVALID_REGISTRATION);
             context.validationError(formData, errors);
+            context.excludeOtherErrors();
             return;