libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Fix NPEs during realm import (#10962)

Browse source 
Closes #10961
This commit is contained in:
Andrea Peruffo 2022-03-29 20:48:37 +01:00 committed by GitHub
parent 2b996b12a1
commit da5db5a813
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 68 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java
View file

@ -729,6 +729,7 @@ public class RepresentationToModel {
// assume this is an old version being imported // assume this is an old version being imported
DefaultAuthenticationFlows.migrateFlows(newRealm); DefaultAuthenticationFlows.migrateFlows(newRealm);
} else { } else {
if (rep.getAuthenticatorConfig() != null) {
for (AuthenticatorConfigRepresentation configRep : rep.getAuthenticatorConfig()) { for (AuthenticatorConfigRepresentation configRep : rep.getAuthenticatorConfig()) {
if (configRep.getAlias() == null) { if (configRep.getAlias() == null) {
// this can happen only during import json files from keycloak 3.4.0 and older // this can happen only during import json files from keycloak 3.4.0 and older
@ -738,6 +739,8 @@ public class RepresentationToModel {
AuthenticatorConfigModel model = toModel(configRep); AuthenticatorConfigModel model = toModel(configRep);
newRealm.addAuthenticatorConfig(model); newRealm.addAuthenticatorConfig(model);
} }
}
if (rep.getAuthenticationFlows() != null) {
for (AuthenticationFlowRepresentation flowRep : rep.getAuthenticationFlows()) { for (AuthenticationFlowRepresentation flowRep : rep.getAuthenticationFlows()) {
AuthenticationFlowModel model = toModel(flowRep); AuthenticationFlowModel model = toModel(flowRep);
// make sure new id is generated for new AuthenticationFlowModel instance // make sure new id is generated for new AuthenticationFlowModel instance
@ -755,18 +758,28 @@ public class RepresentationToModel {
} }
} }
} }
}
if (rep.getBrowserFlow() == null) { if (rep.getBrowserFlow() == null) {
newRealm.setBrowserFlow(newRealm.getFlowByAlias(DefaultAuthenticationFlows.BROWSER_FLOW)); AuthenticationFlowModel defaultFlow = newRealm.getFlowByAlias(DefaultAuthenticationFlows.BROWSER_FLOW);
if (defaultFlow != null) {
newRealm.setBrowserFlow(defaultFlow);
}
} else { } else {
newRealm.setBrowserFlow(newRealm.getFlowByAlias(rep.getBrowserFlow())); newRealm.setBrowserFlow(newRealm.getFlowByAlias(rep.getBrowserFlow()));
} }
if (rep.getRegistrationFlow() == null) { if (rep.getRegistrationFlow() == null) {
newRealm.setRegistrationFlow(newRealm.getFlowByAlias(DefaultAuthenticationFlows.REGISTRATION_FLOW)); AuthenticationFlowModel defaultFlow = newRealm.getFlowByAlias(DefaultAuthenticationFlows.REGISTRATION_FLOW);
if (defaultFlow != null) {
newRealm.setRegistrationFlow(defaultFlow);
}
} else { } else {
newRealm.setRegistrationFlow(newRealm.getFlowByAlias(rep.getRegistrationFlow())); newRealm.setRegistrationFlow(newRealm.getFlowByAlias(rep.getRegistrationFlow()));
} }
if (rep.getDirectGrantFlow() == null) { if (rep.getDirectGrantFlow() == null) {
newRealm.setDirectGrantFlow(newRealm.getFlowByAlias(DefaultAuthenticationFlows.DIRECT_GRANT_FLOW)); AuthenticationFlowModel defaultFlow = newRealm.getFlowByAlias(DefaultAuthenticationFlows.DIRECT_GRANT_FLOW);
if (defaultFlow != null) {
newRealm.setDirectGrantFlow(defaultFlow);
}
} else { } else {
newRealm.setDirectGrantFlow(newRealm.getFlowByAlias(rep.getDirectGrantFlow())); newRealm.setDirectGrantFlow(newRealm.getFlowByAlias(rep.getDirectGrantFlow()));
} }

6
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
View file

@ -238,6 +238,12 @@ public class ExportImportTest extends AbstractKeycloakTest {
addTestRealmToTestRealmReps("import-without-clients"); addTestRealmToTestRealmReps("import-without-clients");
} }
@Test
public void testImportWithNullAuthenticatorConfigAndNoDefaultBrowserFlow() {
importRealmFromFile("/import/testrealm-authenticator-config-null.json");
Assert.assertTrue("Imported realm hasn't been found!", isRealmPresent("cez"));
}
@Test @Test
public void testImportIgnoreExistingMissingClientId() { public void testImportIgnoreExistingMissingClientId() {
TestingExportImportResource resource = testingClient.testing().exportImport(); TestingExportImportResource resource = testingClient.testing().exportImport();

25
testsuite/integration-arquillian/tests/base/src/test/resources/import/testrealm-authenticator-config-null.json Normal file
View file

@ -0,0 +1,25 @@
{
"authenticationFlows": [
{
"alias": "browser",
"authenticationExecutions": [
{
"authenticator": "auth-spnego",
"authenticatorFlow": false,
"priority": 20,
"requirement": "ALTERNATIVE",
"userSetupAllowed": false
}
],
"builtIn": true,
"description": "browser based authentification2",
"id": "3e6ccf87-5473-4eb0-8cbb-28f6b9e6f4d6",
"providerId": "basic-flow",
"topLevel": true
}
],
"displayName": "CEZ",
"enabled": true,
"id": "cez",
"realm": "cez"
}