Skip to content

feat: Add object type filtering for delete membership in LDAP/AD provisioner #261

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

Open
tushyjw wants to merge 4 commits into
base: GROUPER_5_BRANCH
Choose a base branch
from
Open

feat: Add object type filtering for delete membership in LDAP/AD provisioner #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e32b1de
Update grouper-loader.base.properties
tushyjw Dec 19, 2025
7863666
Update GrouperProvisioningConfiguration.java feat: Add configuration …
tushyjw Dec 19, 2025
8bba8fd
Update GrouperProvisioningBehavior.java feat: Implement object type f…
tushyjw Dec 19, 2025
ad20d52
Update GrouperProvisioningConfigurationValidation.java feat: Add vali…
tushyjw Dec 19, 2025
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
4 changes: 4 additions & 0 deletions grouper/conf/grouper-loader.base.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2950,6 +2950,10 @@ grouper.provisioning.removeSyncLogRowsAfterDays = 7
# {valueType: "boolean", order: 3500, indent: 1, defaultValue: "true", subSection: "membership", showEl: "${operateOnGrouperMemberships && customizeMembershipCrud}"}
# provisioner.genericProvisioner.deleteMemberships =

# Delete memberships filter by object type
# {valueType: "string", order: 3550, indent: 2, defaultValue: "", subSection: "membership", showEl: "${operateOnGrouperMemberships && customizeMembershipCrud && deleteMemberships}", formElement: "dropdown", optionValues: ["", "user", "group", "entity"]}
provisioner.genericProvisioner.deleteMembershipsObjectTypeFilter =

# Delete memberships if not exist in grouper
# {valueType: "boolean", order: 4500, indent: 2, defaultValue: "false", subSection: "membership", showEl: "${operateOnGrouperMemberships && customizeMembershipCrud && deleteMemberships}"}
# provisioner.genericProvisioner.deleteMembershipsIfNotExistInGrouper =
Expand Down
12 changes: 11 additions & 1 deletion ...rouper/edu/internet2/middleware/grouper/app/provisioning/GrouperProvisioningBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,17 @@ public boolean isDeleteMembership(ProvisioningMembershipWrapper provisioningMemb
if (provisioningMembershipWrapper == null) {
return this.isDeleteMembershipsIfNotExistInGrouper();
}

// Apply object type filter
String objectTypeFilter = this.getGrouperProvisioner().retrieveGrouperProvisioningConfiguration().getDeleteMembershipsObjectTypeFilter();
if (!StringUtils.isBlank(objectTypeFilter)) {
ProvisioningEntity provisioningEntity = provisioningMembershipWrapper.getProvisioningEntity();
if (provisioningEntity != null) {
String entityType = provisioningEntity.getEntityType();
if (!objectTypeFilter.equals(entityType)) {
return false;
}
}
}
if ((this.grouperProvisioner.retrieveGrouperProvisioningConfiguration().isOperateOnGrouperGroups() && !this.grouperProvisioner.retrieveGrouperProvisioningBehavior().isDeleteGroupsIfUnmarkedProvisionable()) ||
(this.grouperProvisioner.retrieveGrouperProvisioningConfiguration().isOperateOnGrouperMemberships() && !this.grouperProvisioner.retrieveGrouperProvisioningBehavior().isDeleteMembershipsIfGroupUnmarkedProvisionable())) {

Expand Down
5 changes: 4 additions & 1 deletion ...r/edu/internet2/middleware/grouper/app/provisioning/GrouperProvisioningConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1987,7 +1987,10 @@ public void setSelectMemberships(boolean selectMemberships) {
* if memberships should be deleted in target
*/
private boolean deleteMemberships = true;

/**
* delete memberships object type filter
*/
private String deleteMembershipsObjectTypeFilter;
/**
*
*/
Expand Down
14 changes: 12 additions & 2 deletions ...rnet2/middleware/grouper/app/provisioning/GrouperProvisioningConfigurationValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,12 +798,22 @@ public void validateMembershipDeleteHasDeleteType() {
if (deleteMembershipsIfGrouperCreated) {
deleteTypes++;
}

if (deleteTypes != 1) {
this.addErrorMessage(new ProvisioningValidationIssue()
.assignMessage(GrouperTextContainer.textOrNull("provisioning.configuration.validation.oneMembershipDeleteType"))
.assignJqueryHandle("deleteMemberships"));
}
// Add validation for object type filter
String objectTypeFilter = (String) suffixToConfigValue.get("deleteMembershipsObjectTypeFilter");
if (!StringUtils.isBlank(objectTypeFilter)) {
Set<String> validObjectTypes = GrouperUtil.toSet("user", "group", "entity");
if (!validObjectTypes.contains(objectTypeFilter)) {
this.addErrorMessage(new ProvisioningValidationIssue()
.assignMessage("Invalid object type filter: " + objectTypeFilter)
.assignJqueryHandle("deleteMembershipsObjectTypeFilter"));
}
}
}

}
Expand Down Expand Up @@ -1738,4 +1748,4 @@ public Collection<String> validateEntityAttributeNamesForbidden() {
}

}