libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

[KEYCLOAK-17080] Fix ConcurrentModificationException in the migration to 8.0.0 that was introduced by the streamification work

Browse source
This commit is contained in:
Stefan Guilhen 2021-02-08 22:46:05 -03:00 committed by Hynek Mlnařík
parent 33bb1fda38
commit bea3410357
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server-spi-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_0.java
View file

@ -28,6 +28,7 @@ import org.keycloak.models.RealmModel;
import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RealmRepresentation;
import java.util.Collections; import java.util.Collections;
import java.util.stream.Collectors;
/** /**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a> * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
@ -78,11 +79,12 @@ public class MigrateTo8_0_0 implements Migration {
} }
protected void migrateRealmMFA(RealmModel realm) { protected void migrateRealmMFA(RealmModel realm) {
realm.getAuthenticationFlowsStream() realm.getAuthenticationFlowsStream().collect(Collectors.toList())
.forEach(authFlow -> .forEach(authFlow ->
realm.getAuthenticationExecutionsStream(authFlow.getId()) realm.getAuthenticationExecutionsStream(authFlow.getId())
.filter(exe -> exe.getRequirement() == AuthenticationExecutionModel.Requirement.CONDITIONAL) .filter(exe -> exe.getRequirement() == AuthenticationExecutionModel.Requirement.CONDITIONAL)
.forEachOrdered(exe -> migrateOptionalAuthenticationExecution(realm, authFlow, exe, true))); .collect(Collectors.toList())
.forEach(exe -> migrateOptionalAuthenticationExecution(realm, authFlow, exe, true)));
} }
public static void migrateOptionalAuthenticationExecution(RealmModel realm, AuthenticationFlowModel parentFlow, AuthenticationExecutionModel optionalExecution, boolean updateOptionalExecution) { public static void migrateOptionalAuthenticationExecution(RealmModel realm, AuthenticationFlowModel parentFlow, AuthenticationExecutionModel optionalExecution, boolean updateOptionalExecution) {