Skip to content

Enable mothership module so its controller can handle requests #7761

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 3 commits into from
Jun 17, 2026
Merged

Enable mothership module so its controller can handle requests #7761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58485ed
Enable mothership module so its controller can handle requests
labkey-jeckels Jun 16, 2026
f599c22
Minor tweaks
labkey-jeckels Jun 16, 2026
70a7877
Share module activation
labkey-jeckels Jun 16, 2026
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
18 changes: 17 additions & 1 deletion api/src/org/labkey/api/security/permissions/AbstractContainerScopingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.junit.Assert;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.module.Module;
import org.labkey.api.security.MutableSecurityPolicy;
import org.labkey.api.security.SecurityManager;
import org.labkey.api.security.SecurityPolicyManager;
Expand All @@ -33,8 +34,11 @@
import org.springframework.mock.web.MockHttpServletResponse;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

/**
* Base class for "container scoping" (a.k.a. broken-object-level-authorization / BOLA / IDOR) integration tests. These
Expand Down Expand Up @@ -71,14 +75,26 @@ protected User getAdmin()
* automatic cleanup. Callers pass a short local name (e.g. "A"/"B"/"Source"); the class name is prepended so two
* test classes can both ask for "A" without colliding.
*/
protected Container createContainer(String name)
protected Container createContainer(String name, org.labkey.api.module.Module... enabledModules)
{
Container junit = JunitUtil.getTestContainer();
Container c = ContainerManager.ensureContainer(junit.getParsedPath().append(getClass().getSimpleName() + "-" + name, true), getAdmin());
activateModules(c, enabledModules);
_containers.add(c);
return c;
}

protected Container activateModules(Container c, Module... enabledModules)
{
if (enabledModules.length > 0)
{
Set<org.labkey.api.module.Module> m = new HashSet<>(c.getActiveModules());
Collections.addAll(m, enabledModules);
c.setActiveModules(m, getAdmin());
}
return c;
}

/**
* Create a user that has {@code role} assigned in {@code scope} <em>only</em> (it has no rights in any other
* container), registered for automatic cleanup. This is the canonical way to build a caller who is privileged in
Expand Down
5 changes: 3 additions & 2 deletions mothership/src/org/labkey/mothership/MothershipController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.labkey.api.data.TableInfo;
import org.labkey.api.data.TableSelector;
import org.labkey.api.module.AllowedDuringUpgrade;
import org.labkey.api.module.ModuleLoader;
import org.labkey.api.query.DetailsURL;
import org.labkey.api.query.FieldKey;
import org.labkey.api.query.QueryService;
Expand Down Expand Up @@ -1887,8 +1888,8 @@ public static class ContainerScopingTestCase extends AbstractContainerScopingTes
public void testUpdateInstallationContainerScoping() throws Exception
{
User admin = getAdmin();
Container folderA = createContainer("A");
Container folderB = createContainer("B");
Container folderA = createContainer("A", ModuleLoader.getInstance().getModule(MothershipModule.class));
Container folderB = createContainer("B", ModuleLoader.getInstance().getModule(MothershipModule.class));

// An installation row that lives in folder B
ServerInstallation si = new ServerInstallation();
Expand Down