Skip to content

fix: allow to not delete memberships during synchro if the information is not present in LDAP - EXO-87414 #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdenarie merged 1 commit into from
Jun 9, 2026
Merged

fix: allow to not delete memberships during synchro if the information is not present in LDAP - EXO-87414 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 41 additions & 15 deletions ...va/org/exoplatform/services/organization/externalstore/IDMExternalStoreImportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public class IDMExternalStoreImportService implements Startable {

public static final String EXTERNAL_STORE_DELETE_MISSING_ENTRIES = "exo.idm.externalStore.entries.missing.delete";

public static final String EXTERNAL_STORE_DELETE_MISSING_USER_MEMBERSHIP = "exo.idm.externalStore.user.memberships.update.delete";

public static final String EXTERNAL_STORE_DELETE_MISSING_GROUP_MEMBERSHIP = "exo.idm.externalStore.group.memberships.update.delete";

private ExoContainer container;

private OrganizationService organizationService;
Expand All @@ -81,6 +85,10 @@ public class IDMExternalStoreImportService implements Startable {

private boolean interrupted;

private boolean updateDeletedUserMemberships = true;

private boolean updateDeletedGroupMemberships = true;

public IDMExternalStoreImportService(ExoContainer container,
OrganizationService organizationService,
ListenerService listenerService,
Expand All @@ -95,6 +103,12 @@ public IDMExternalStoreImportService(ExoContainer container,
this.externalStoreService = externalStoreService;
this.jobSchedulerService = jobSchedulerService;
if (params != null) {
if (params.containsKey(EXTERNAL_STORE_DELETE_MISSING_USER_MEMBERSHIP)) {
updateDeletedUserMemberships = Boolean.parseBoolean(params.getValueParam(EXTERNAL_STORE_DELETE_MISSING_USER_MEMBERSHIP).getValue());
}
if (params.containsKey(EXTERNAL_STORE_DELETE_MISSING_GROUP_MEMBERSHIP)) {
updateDeletedGroupMemberships = Boolean.parseBoolean(params.getValueParam(EXTERNAL_STORE_DELETE_MISSING_GROUP_MEMBERSHIP).getValue());
}
if (params.containsKey(EXTERNAL_STORE_IMPORT_CRON_EXPRESSION)) {
scheduledDataImportJobCronExpression = params.getValueParam(EXTERNAL_STORE_IMPORT_CRON_EXPRESSION).getValue();
}
Expand Down Expand Up @@ -630,20 +644,21 @@ private void importGroupMemberships(String groupId, boolean updateModified, bool
internalMemberships = organizationService.getMembershipHandler().findMembershipsByGroup(group);
}
Collection externalMemberships = externalStoreService.getEntity(IDMEntityType.GROUP_MEMBERSHIPS, groupId);
importMemberships(IDMEntityType.GROUP_MEMBERSHIPS, externalMemberships, internalMemberships);
importMemberships(IDMEntityType.GROUP_MEMBERSHIPS, externalMemberships, internalMemberships, updateDeleted);
}

@SuppressWarnings({ "rawtypes" })
private void importUserMemberships(String username, boolean updateModified, boolean updateDeleted) throws Exception {
Collection internalMemberships = organizationService.getMembershipHandler().findMembershipsByUser(username);
Collection externalMemberships = externalStoreService.getEntity(IDMEntityType.USER_MEMBERSHIPS, username);
importMemberships(IDMEntityType.USER_MEMBERSHIPS, externalMemberships, internalMemberships);
importMemberships(IDMEntityType.USER_MEMBERSHIPS, externalMemberships, internalMemberships, updateDeleted);
}

@SuppressWarnings({ "rawtypes", "unchecked" })
private void importMemberships(IDMEntityType<?> entityType,
Collection externalMemberships,
Collection internalMemberships) throws Exception {
Collection internalMemberships,
boolean updateDeleted) throws Exception {
if (externalMemberships != null && !externalMemberships.isEmpty()) {
List membershipsToAdd = new ArrayList(externalMemberships);
for (Object object : externalMemberships) {
Expand All @@ -657,17 +672,18 @@ private void importMemberships(IDMEntityType<?> entityType,
importMembership(entityType, membership, false, false);
}
}
if (updateDeleted) {
// Check deleted user memberships on external store
for (Object object : internalMemberships) {
Membership membership = (Membership) object;
Group group = organizationService.getGroupHandler().findGroupById(membership.getGroupId());
User user = organizationService.getUserHandler().findUserByName(membership.getUserName(), UserStatus.ANY);

// Check deleted user memberships on external store
for (Object object : internalMemberships) {
Membership membership = (Membership) object;
Group group = organizationService.getGroupHandler().findGroupById(membership.getGroupId());
User user = organizationService.getUserHandler().findUserByName(membership.getUserName(), UserStatus.ANY);

if (group == null || user == null || (!group.isInternalStore() && !user.isInternalStore()
&& (externalMemberships == null || !externalMemberships.contains(membership)))) {
LOG.trace("Remove deleted membership from external store '{}'", membership);
organizationService.getMembershipHandler().removeMembership(membership.getId(), true);
if (group == null || user == null || (!group.isInternalStore() && !user.isInternalStore()
&& (externalMemberships == null || !externalMemberships.contains(membership)))) {
LOG.trace("Remove deleted membership from external store '{}'", membership);
organizationService.getMembershipHandler().removeMembership(membership.getId(), true);
}
}
}
}
Expand Down Expand Up @@ -993,9 +1009,9 @@ private List<IDMQueueEntry> processQueueEntries(List<IDMQueueEntry> queueEntries
// by IDM principal IDM removal
if (IDMOperationType.ADD_OR_UPDATE.equals(queueEntry.getOperationType())) {
if (entityType.equals(IDMEntityType.USER)) {
importEntityToInternalStore(IDMEntityType.USER_MEMBERSHIPS, queueEntry.getEntityId(), true, true);
importEntityToInternalStore(IDMEntityType.USER_MEMBERSHIPS, queueEntry.getEntityId(), true, updateDeletedUserMemberships);
} else if (entityType.equals(IDMEntityType.GROUP)) {
importEntityToInternalStore(IDMEntityType.GROUP_MEMBERSHIPS, queueEntry.getEntityId(), true, true);
importEntityToInternalStore(IDMEntityType.GROUP_MEMBERSHIPS, queueEntry.getEntityId(), true, updateDeletedGroupMemberships);
}
}

Expand Down Expand Up @@ -1113,5 +1129,15 @@ private boolean containsWhitespace(String username) {

private boolean containsApostrophe(String username) {
return username.indexOf('\'') >= 0;

}

public boolean isUpdateDeletedUserMemberships() {
return this.updateDeletedUserMemberships;
}

public boolean isUpdateDeletedGroupMemberships() {
return this.updateDeletedGroupMemberships;
}

}
2 changes: 1 addition & 1 deletion ...java/org/exoplatform/services/organization/externalstore/IDMExternalStoreManagedBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public void forceImportEntity(@ManagedDescription("Entity type index, 1 = User /
getExternalStoreImportService().importEntityToInternalStore(IDMEntityType.GROUP_MEMBERSHIPS,
entityId,
true,
true);
getExternalStoreImportService().isUpdateDeletedGroupMemberships());
}
} finally {
end();
Expand Down