Fix duplicate key error on case-insensitive info_key (#1136)

Change collation compatible with both mysql and mariadb

Author: rmiccoli

iam-login-service/src/main/java/it/infn/mw/iam/core/IamAuthenticationHolderEntityService.java

@@ -22,7 +22,6 @@
 import org.mitre.oauth2.model.AuthenticationHolderEntity;
 import org.mitre.oauth2.repository.AuthenticationHolderRepository;
 import org.mitre.oauth2.service.AuthenticationHolderEntityService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.stereotype.Service;
@@ -39,7 +38,6 @@ public class IamAuthenticationHolderEntityService implements AuthenticationHolde
   final AuthenticationHolderRepository repo;
   final ExternalAuthenticationInfoBuilder mapBuilder;
 
-  @Autowired
   public IamAuthenticationHolderEntityService(AuthenticationHolderRepository repo,
       ExternalAuthenticationInfoBuilder mapBuilder) {
     this.repo = repo;

iam-login-service/src/test/java/it/infn/mw/iam/test/ext_authn/SavedUserAuthenticationTests.java

@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2016-2021
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package it.infn.mw.iam.test.ext_authn;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.mitre.oauth2.model.AuthenticationHolderEntity;
+import org.mitre.oauth2.model.SavedUserAuthentication;
+import org.mitre.oauth2.repository.AuthenticationHolderRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+
+@SpringBootTest
+class SavedUserAuthenticationTests {
+
+  @Autowired
+  private AuthenticationHolderRepository authHolderRepo;
+
+  @Test
+  void testMultipleCaseSensitiveAdditionalInfoAreInserted() {
+    SavedUserAuthentication userAuth =
+        new SavedUserAuthentication(new UsernamePasswordAuthenticationToken("test", "password"));
+    userAuth.setAdditionalInfo(Map.of("MAIL", "mail@example.com", "mail", "another@example.com"));
+    AuthenticationHolderEntity authHolder = new AuthenticationHolderEntity();
+    authHolder.setUserAuth(userAuth);
+    assertTrue(authHolder.getUserAuth().getAdditionalInfo().containsKey("MAIL"));
+    assertTrue(authHolder.getUserAuth().getAdditionalInfo().containsKey("mail"));
+    assertEquals("mail@example.com", authHolder.getUserAuth().getAdditionalInfo().get("MAIL"));
+    assertEquals("another@example.com", authHolder.getUserAuth().getAdditionalInfo().get("mail"));
+    AuthenticationHolderEntity saved = authHolderRepo.save(authHolder);
+    assertEquals("mail@example.com", saved.getUserAuth().getAdditionalInfo().get("MAIL"));
+    assertEquals("another@example.com", saved.getUserAuth().getAdditionalInfo().get("mail"));
+  }
+}

iam-persistence/src/main/resources/db/migration/h2/V115__alter_saved_user_auth_info_key.sql

@@ -0,0 +1 @@
+-- Nothing to do: in H2, info_key is already case-sensitive

iam-persistence/src/main/resources/db/migration/mysql/V115__alter_saved_user_auth_info_key.sql

@@ -0,0 +1 @@
+ALTER TABLE saved_user_auth_info MODIFY info_key varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;