Skip to content

Commit

Permalink
Extended the fix to cover IpGroups and MailDomainGroups as well. #9369.
Browse files Browse the repository at this point in the history
  • Loading branch information
landreev committed May 25, 2023
1 parent f93cf48 commit 52b316a
Showing 1 changed file with 8 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroup;
import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupProvider;
import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroup;
import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroupProvider;
import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroupsServiceBean;
import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroup;
import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroupProvider;
import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroupServiceBean;
import edu.harvard.iq.dataverse.authorization.groups.impl.shib.ShibGroup;
Expand Down Expand Up @@ -112,10 +114,12 @@ public Set<Group> groupsFor( DataverseRequest req, DvObject dvo ) {
Set<ExplicitGroup> directAncestorsOfShibGroups = new HashSet<>();
for (Group group : ret) {

if (group instanceof ShibGroup) {
// if this is a shib group, we need to find if it is included in
// some explicit group; i.e., if it has direct ancestors that
// happen to be explicit groups:
if (group instanceof ShibGroup
|| group instanceof IpGroup
|| group instanceof MailDomainGroup) {
// if this is one of the non-explicit group types above, we
// need to find if it is included in some explicit group; i.e.,
// if it has direct ancestors that happen to be explicit groups:

directAncestorsOfShibGroups.addAll(explicitGroupService.findDirectlyContainingGroups(group));
}
Expand Down

0 comments on commit 52b316a

Please sign in to comment.