SONAR-16592 - Make email matching case insensitive

2 files changed, 19 insertions, 1 deletions

diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserRegistrarImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserRegistrarImpl.java
index 0a7c66a1f9b..1baa5cf5fa8 100644
--- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserRegistrarImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserRegistrarImpl.java
@@ -113,7 +113,7 @@ public class UserRegistrarImpl implements UserRegistrar {
 
     String externalEmail = userIdentity.getEmail();
 
-    if (!dbEmail.equals(externalEmail)) {
+    if (!dbEmail.equalsIgnoreCase(externalEmail)) {
       LOGGER.warn("User with login '{}' tried to login with email '{}' which doesn't match the email on record '{}'", userIdentity.getProviderLogin(), externalEmail, dbEmail);
       throw failAuthenticationException(userIdentity, source);
     }
diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserRegistrarImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserRegistrarImplTest.java
index 97991e5945b..43def63369f 100644
--- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserRegistrarImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserRegistrarImplTest.java
@@ -386,6 +386,24 @@ public class UserRegistrarImplTest {
   }
 
   @Test
+  public void authenticate_and_update_existing_github_user_matching_external_login_if_emails_match_case_insensitive() {
+    UserDto user = db.users().insertUser(u -> u
+      .setLogin("Old login")
+      .setName("Old name")
+      .setEmail("John@Email.com")
+      .setExternalId(USER_IDENTITY.getProviderId())
+      .setExternalLogin("old identity")
+      .setExternalIdentityProvider(GH_IDENTITY_PROVIDER.getKey()));
+
+    underTest.register(newUserRegistration());
+
+    assertThat(db.getDbClient().userDao().selectByUuid(db.getSession(), user.getUuid()))
+      .extracting(UserDto::getLogin, UserDto::getName, UserDto::getEmail, UserDto::getExternalId, UserDto::getExternalLogin, UserDto::getExternalIdentityProvider,
+        UserDto::isActive)
+      .contains(USER_LOGIN, "John", "john@email.com", "ABCD", "johndoo", "github", true);
+  }
+
+  @Test
   public void authenticate_and_update_existing_user_matching_external_login_and_emails_mismatch() {
     UserRegistration registration = UserRegistration.builder()
       .setUserIdentity(USER_IDENTITY)