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

KEYCLOAK-3944 Imported legacy LDAP Federation provider doesn't have default mappers available

Browse source
This commit is contained in:
mposolda 2016-11-21 16:17:49 +01:00
parent 7c4591617b
commit 27e5d9672a
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -301,7 +301,7 @@ public class RepresentationToModel {
String parentId = newRealm.getId(); String parentId = newRealm.getId();
importComponents(newRealm, components, parentId); importComponents(newRealm, components, parentId);
} }
importUserFederationProvidersAndMappers(rep, newRealm); importUserFederationProvidersAndMappers(session, rep, newRealm);
if (rep.getGroups() != null) { if (rep.getGroups() != null) {
@ -358,7 +358,7 @@ public class RepresentationToModel {
} }
} }
public static void importUserFederationProvidersAndMappers(RealmRepresentation rep, RealmModel newRealm) { public static void importUserFederationProvidersAndMappers(KeycloakSession session, RealmRepresentation rep, RealmModel newRealm) {
// providers to convert to component model // providers to convert to component model
Set<String> convertSet = new HashSet<>(); Set<String> convertSet = new HashSet<>();
convertSet.add(LDAPConstants.LDAP_PROVIDER); convertSet.add(LDAPConstants.LDAP_PROVIDER);
@ -382,6 +382,10 @@ public class RepresentationToModel {
} }
newRealm.setUserFederationProviders(providerModels); newRealm.setUserFederationProviders(providerModels);
} }
// This is for case, when you have hand-written JSON file with LDAP userFederationProvider, but WITHOUT any userFederationMappers configured. Default LDAP mappers need to be created in that case.
Set<String> storageProvidersWhichShouldImportDefaultMappers = new HashSet<>(userStorageModels.keySet());
if (rep.getUserFederationMappers() != null) { if (rep.getUserFederationMappers() != null) {
// Remove builtin mappers for federation providers, which have some mappers already provided in JSON (likely due to previous export) // Remove builtin mappers for federation providers, which have some mappers already provided in JSON (likely due to previous export)
@ -409,11 +413,18 @@ public class RepresentationToModel {
ComponentModel mapper = convertFedMapperToComponent(newRealm, parent, representation, newMapperType); ComponentModel mapper = convertFedMapperToComponent(newRealm, parent, representation, newMapperType);
newRealm.importComponentModel(mapper); newRealm.importComponentModel(mapper);
storageProvidersWhichShouldImportDefaultMappers.remove(representation.getFederationProviderDisplayName());
} else { } else {
newRealm.addUserFederationMapper(toModel(newRealm, representation)); newRealm.addUserFederationMapper(toModel(newRealm, representation));
} }
} }
} }
for (String providerDisplayName : storageProvidersWhichShouldImportDefaultMappers) {
ComponentUtil.notifyCreated(session, newRealm, userStorageModels.get(providerDisplayName));
}
} }
protected static void importComponents(RealmModel newRealm, MultivaluedHashMap<String, ComponentExportRepresentation> components, String parentId) { protected static void importComponents(RealmModel newRealm, MultivaluedHashMap<String, ComponentExportRepresentation> components, String parentId) {

2
testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPLegacyImportTest.java
View file

@ -97,7 +97,7 @@ public class LDAPLegacyImportTest {
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
RepresentationToModel.importUserFederationProvidersAndMappers(imported, appRealm); RepresentationToModel.importUserFederationProvidersAndMappers(session, imported, appRealm);
ldapModel = appRealm.getComponents(appRealm.getId(), UserStorageProvider.class.getName()).get(0); ldapModel = appRealm.getComponents(appRealm.getId(), UserStorageProvider.class.getName()).get(0);
// Delete all LDAP users and add some new for testing // Delete all LDAP users and add some new for testing
LDAPStorageProvider ldapFedProvider = LDAPTestUtils.getLdapProvider(session, ldapModel); LDAPStorageProvider ldapFedProvider = LDAPTestUtils.getLdapProvider(session, ldapModel);

2
themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
View file

@ -1788,7 +1788,7 @@ module.controller('LDAPUserStorageCtrl', function($scope, $location, Notificatio
$scope.save = function() { $scope.save = function() {
$scope.changed = false; $scope.changed = false;
if (!parseInt($scope.instance.config['batchSizeForSync'][0])) { if (!$scope.instance.config['batchSizeForSync'] || !parseInt($scope.instance.config['batchSizeForSync'][0])) {
$scope.instance.config['batchSizeForSync'] = [ DEFAULT_BATCH_SIZE ]; $scope.instance.config['batchSizeForSync'] = [ DEFAULT_BATCH_SIZE ];
} else { } else {
$scope.instance.config['batchSizeForSync'][0] = parseInt($scope.instance.config.batchSizeForSync).toString(); $scope.instance.config['batchSizeForSync'][0] = parseInt($scope.instance.config.batchSizeForSync).toString();