Skip to content

Issue 52614: AssertionError deleting site group from its details page #343

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
labkey-jeckels merged 1 commit into from
Mar 25, 2025
Merged

Issue 52614: AssertionError deleting site group from its details page #343

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
5 changes: 3 additions & 2 deletions OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncAuditProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.labkey.api.audit.AuditTypeProvider;
import org.labkey.api.audit.query.AbstractAuditDomainKind;
import org.labkey.api.audit.query.DefaultAuditTypeTable;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerFilter;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.data.MutableColumnInfo;
Expand Down Expand Up @@ -121,7 +122,7 @@ public <K extends AuditTypeEvent> Class<K> getEventClass()
public static void addAuditEntry(User user, int usersAdded, int usersRemoved, int usersInactivated, int usersModified, int groupsAdded, int groupsRemoved, int membershipsAdded, int membershipsRemoved)
{
String comment = String.format("LDAP Sync Summary: users added: %s, users removed: %s, users inactivated: %s, users modified: %s, groups added: %s, groups removed: %s, memberships added: %s, memberships removed: %s", usersAdded, usersRemoved, usersInactivated, usersModified, groupsAdded, groupsRemoved, membershipsAdded, membershipsRemoved);
LdapSyncAuditProvider.LdapSyncAuditEvent event = new LdapSyncAuditProvider.LdapSyncAuditEvent(ContainerManager.getRoot().getId(), comment);
LdapSyncAuditProvider.LdapSyncAuditEvent event = new LdapSyncAuditProvider.LdapSyncAuditEvent(ContainerManager.getRoot(), comment);

event.setTotalUsersAndGroupsAdded(usersAdded + groupsAdded);
event.setTotalUsersAndGroupsRemoved(usersRemoved + groupsRemoved);
Expand All @@ -141,7 +142,7 @@ public LdapSyncAuditEvent()
super();
}

public LdapSyncAuditEvent(String container, String comment)
public LdapSyncAuditEvent(Container container, String comment)
{
super(LdapSyncRunner.AUDIT_EVENT_TYPE, container, comment);
}
Expand Down
29 changes: 10 additions & 19 deletions OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import org.labkey.security.xml.GroupEnumType;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -99,7 +98,7 @@ public LdapSyncRunner()
}

@Override
public void execute(JobExecutionContext context) throws JobExecutionException
public void execute(JobExecutionContext context)
{
try
{
Expand Down Expand Up @@ -284,7 +283,7 @@ private void setUserActive(User u, boolean active, String reason)
}
}

private void handleGroupsRemovedFromLdap() throws LdapException
private void handleGroupsRemovedFromLdap()
{
//find any previously synced groups that are no longer present
List<LdapSyncModel> records = getPreviouslySyncedRecords(PrincipalType.GROUP);
Expand Down Expand Up @@ -522,7 +521,7 @@ private void deactivatePrincipalsPreviouslySynced()
previouslySynced.remove(syncedUser);
}

if (previouslySynced.size() > 0)
if (!previouslySynced.isEmpty())
{
//TODO: determine whether to delete/deactive, etc?
for (Integer userId : previouslySynced)
Expand All @@ -543,7 +542,7 @@ private void deactivatePrincipalsPreviouslySynced()
previouslySyncedGroups.remove(syncedGroup);
}

if (previouslySyncedGroups.size() > 0)
if (!previouslySyncedGroups.isEmpty())
{
//TODO: determine whether to delete/deactive, etc
for (Integer groupId : previouslySyncedGroups)
Expand All @@ -569,14 +568,7 @@ private void initPreviouslySyncedRecords()
SimpleFilter filter = new SimpleFilter(FieldKey.fromString("provider"), _wrapper.getProviderName(), CompareType.EQUAL);
TableSelector ts = new TableSelector(ti, filter, null);

ts.forEach(LdapSyncModel.class, new Selector.ForEachBlock<LdapSyncModel>()
{
@Override
public void exec(LdapSyncModel model)
{
_syncedRecordMap.put(model.getSourceId(), model);
}
});
ts.forEach(LdapSyncModel.class, model -> _syncedRecordMap.put(model.getSourceId(), model));
}

private User createUser(LdapEntry ldapEntry) throws LdapException
Expand Down Expand Up @@ -702,7 +694,7 @@ private Group createGroup(String groupName)

if (!_previewOnly)
{
return SecurityManager.createGroup(getUserGroupContainer(), groupName);
return SecurityManager.createGroup(getUserGroupContainer(), groupName, _settings.getLabKeyAdminUser());
}
else
{
Expand All @@ -712,11 +704,11 @@ private Group createGroup(String groupName)

private void deleteGroup(Group g)
{
log("Deleteing LabKey group: " + g.getName());
log("Deleting LabKey group: " + g.getName());
_groupsRemoved++;

if (!_previewOnly)
SecurityManager.deleteGroup(g);
SecurityManager.deleteGroup(g, _settings.getLabKeyAdminUser());
}

private void deleteUser(User u) throws LdapException
Expand Down Expand Up @@ -894,8 +886,7 @@ public void doSetup() throws Exception
if (project == null)
{
project = ContainerManager.createContainer(ContainerManager.getRoot(), PROJECT_NAME, TestContext.get().getUser());
Set<Module> modules = new HashSet<>();
modules.addAll(project.getActiveModules());
Set<Module> modules = new HashSet<>(project.getActiveModules());
modules.add(ModuleLoader.getInstance().getModule(OpenLdapSyncModule.NAME));
project.setActiveModules(modules);
}
Expand Down Expand Up @@ -962,7 +953,7 @@ private void cleanUsersAndGroups() throws Exception
_log.info("Cleaning up group: "+ groupName);
Group g = GroupManager.getGroup(getProject(), groupName, GroupEnumType.PROJECT);
if (g != null)
SecurityManager.deleteGroup(g);
SecurityManager.deleteGroup(g, TestContext.get().getUser());
}
}

Expand Down