Skip to content

Address folder admin assigning themselves project admin role #7492

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
labkey-adam wants to merge 1 commit into
base: release26.3-SNAPSHOT
Choose a base branch
from
Open

Address folder admin assigning themselves project admin role #7492

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
14 changes: 14 additions & 0 deletions api/src/org/labkey/api/security/SecurityPolicyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.labkey.api.data.TableSelector;
import org.labkey.api.exceptions.OptimisticConflictException;
import org.labkey.api.query.FieldKey;
import org.labkey.api.security.permissions.AddUserPermission;
import org.labkey.api.security.roles.Role;
import org.labkey.api.security.roles.RoleManager;
import org.labkey.api.util.logging.LogHelper;
Expand Down Expand Up @@ -179,6 +180,19 @@ public static boolean savePolicy(@NotNull MutableSecurityPolicy policy, @NotNull
}
}

// This is a simple 26.3 fix for GitHub Issue #909. TODO: In 26.4+, change to a first class approach for
// validating all admin attempts at assigning admin roles or impersonating admin users, groups, and roles.
//
// For now, just use AddUserPermission as a proxy for Folder Admin attemping to assign Project Admin role
if (c.isProject() && !c.hasPermission(user, AddUserPermission.class))
{
for (Role changedRole : changedRoles)
{
if (changedRole.getPermissions().contains(AddUserPermission.class))
throw new UnauthorizedException("You do not have permission to modify the " + changedRole.getName() + " role.");
}
}

savePolicyToDBAndValidate(policy);
writeToAuditLog(c, user, resource, oldPolicy, policy);

Expand Down
Loading