From 139e819a994e2476e9a30695a5ab01e2b68a4565 Mon Sep 17 00:00:00 2001 From: Vilmos Nagy Date: Tue, 14 Mar 2023 11:19:40 +0100 Subject: [PATCH] Fix #17644, the registration either should finish properly or not create the user at all --- .../AuthenticationProcessor.java | 4 +- .../FormAuthenticationFlow.java | 15 ++++- .../forms/RegistrationUserCreation.java | 7 +++ .../federation/storage/UserStorageTest.java | 62 ++++++++++++++++++- 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java b/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java index d57102c1237e..ca00a0d43329 100755 --- a/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java +++ b/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java @@ -269,7 +269,7 @@ public String getFlowPath() { return flowPath; } - public void setAutheticatedUser(UserModel user) { + public void setAuthenticatedUser(UserModel user) { UserModel previousUser = getAuthenticationSession().getAuthenticatedUser(); if (previousUser != null && !user.getId().equals(previousUser.getId())) throw new AuthenticationFlowException(AuthenticationFlowError.USER_CONFLICT); @@ -431,7 +431,7 @@ public UserModel getUser() { @Override public void setUser(UserModel user) { - setAutheticatedUser(user); + setAuthenticatedUser(user); } @Override diff --git a/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java index 7095b98d0b8b..1d067912a9c5 100755 --- a/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java @@ -26,6 +26,7 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakTransactionManager; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.FormMessage; @@ -101,7 +102,7 @@ public UserModel getUser() { @Override public void setUser(UserModel user) { - processor.setAutheticatedUser(user); + processor.setAuthenticatedUser(user); } @Override @@ -248,8 +249,16 @@ public Response processAction(String actionExecution) { return renderForm(first.formData, messages); } - for (ValidationContextImpl context : successes) { - context.action.success(context); + KeycloakTransactionManager transaction = processor.getSession().getTransactionManager(); + transaction.begin(); + try { + for (ValidationContextImpl context : successes) { + context.action.success(context); + } + transaction.commit(); + } catch (Exception e) { + transaction.rollback(); + throw e; } // set status and required actions only if form is fully successful for (Map.Entry entry : executionStatus.entrySet()) { diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java index d5b13fcb1369..63d5f2e0f703 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java @@ -18,6 +18,8 @@ package org.keycloak.authentication.forms; import org.keycloak.Config; +import org.keycloak.authentication.AuthenticationFlowError; +import org.keycloak.authentication.AuthenticationFlowException; import org.keycloak.authentication.FormAction; import org.keycloak.authentication.FormActionFactory; import org.keycloak.authentication.FormContext; @@ -111,6 +113,11 @@ public void buildPage(FormContext context, LoginFormsProvider form) { @Override public void success(FormContext context) { +// fail early, fail fast + if (context.getUser() != null) { + throw new AuthenticationFlowException(AuthenticationFlowError.USER_CONFLICT); + } + MultivaluedMap formData = context.getHttpRequest().getDecodedFormParameters(); String email = formData.getFirst(UserModel.EMAIL); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java index 85d727187cdc..47d7515c08d4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java @@ -44,7 +44,9 @@ import org.keycloak.testsuite.federation.UserMapStorage; import org.keycloak.testsuite.federation.UserMapStorageFactory; import org.keycloak.testsuite.federation.UserPropertyFileStorageFactory; +import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; +import org.keycloak.testsuite.pages.LoginPasswordResetPage; import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.pages.VerifyEmailPage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; @@ -73,12 +75,12 @@ import static java.util.Calendar.DAY_OF_WEEK; import static java.util.Calendar.HOUR_OF_DAY; import static java.util.Calendar.MINUTE; -import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -113,6 +115,12 @@ public class UserStorageTest extends AbstractAuthTest { @Page protected LoginPage loginPage; + @Page + protected LoginPasswordResetPage resetPage; + + @Page + protected ErrorPage errorPage; + @Page protected RegisterPage registerPage; @@ -365,6 +373,58 @@ public void testUpdate() { } assertFalse(foundRole); } + + @Test + public void testRegisterShouldFailBeforeUserCreationWhenUserIsInContext() throws Exception { + try (AutoCloseable c = new RealmAttributeUpdater(testRealmResource()) + .updateWith(r -> { + Map config = new HashMap<>(); + config.put("from", "auto@keycloak.org"); + config.put("host", "localhost"); + config.put("port", "3025"); + r.setSmtpServer(config); + r.setRegistrationAllowed(true); + r.setVerifyEmail(true); + r.setResetPasswordAllowed(true); + r.setRegistrationEmailAsUsername(true); + }) + .update()) { + + UserRepresentation userWhoPreExistsInRealm = new UserRepresentation(); + userWhoPreExistsInRealm.setEmail("keycloak-dev@realcity.io"); + String uid = ApiUtil.createUserAndResetPasswordWithAdminClient(testRealmResource(), userWhoPreExistsInRealm, "password"); + + testRealmAccountPage.navigateTo(); + loginPage.clickRegister(); + registerPage.clickBackToLogin(); + loginPage.assertCurrent(testRealmResource().toRepresentation().getRealm()); + + loginPage.resetPassword(); + resetPage.assertCurrent(); + resetPage.changePassword("keycloak-dev@realcity.io"); + + driver.navigate().back(); + driver.navigate().back(); + driver.navigate().back(); + registerPage.assertCurrent(); + + registerPage.registerWithEmailAsUsername( + "Vilmos", + "Szabó-Nagy", + "vilmos.nagy@realcity.io", + "TestPassword123", + "TestPassword123" + ); + + errorPage.assertCurrent(); + assertNotNull("Some error happens", errorPage.getError()); + + // the user entity should not be created if the registration flow is not executed till the end + final UserRepresentation userByUsername = ApiUtil.findUserByUsername(testRealmResource(), "vilmos.nagy@realcity.io"); + assertNull(userByUsername); + } + + } @Test public void testRegisterWithRequiredEmail() throws Exception {