mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-14 22:43:57 +00:00
activated pruning of UserGroups in ACLs per default (deactivateable with
disable Pruning flag
This commit is contained in:
1 parent
8d504ba1f3
commit
6abcdcf4c6
1 file changed
+11
-4
+11
-4
@@ -57,7 +57,7 @@ public abstract class SecurityDTOUtil {
|
||||
final Map<SecurityUser, SecurityUser> fromOriginalToStrippedDownUser = new HashMap<>();
|
||||
final Map<UserGroup, UserGroup> fromOriginalToStrippedDownUserGroup = new HashMap<>();
|
||||
addSecurityInformation(securityDTOFactory, securityService, securedObject, objectId,
|
||||
fromOriginalToStrippedDownUser, fromOriginalToStrippedDownUserGroup);
|
||||
fromOriginalToStrippedDownUser, fromOriginalToStrippedDownUserGroup, false);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -89,11 +89,18 @@ public abstract class SecurityDTOUtil {
|
||||
final SecurityService securityService, final SecuredObject securedObject,
|
||||
final QualifiedObjectIdentifier objectId,
|
||||
final Map<SecurityUser, SecurityUser> fromOriginalToStrippedDownUser,
|
||||
final Map<UserGroup, UserGroup> fromOriginalToStrippedDownUserGroup) {
|
||||
final Map<UserGroup, UserGroup> fromOriginalToStrippedDownUserGroup,
|
||||
final boolean disablePruningForCurrentUser) {
|
||||
final AccessControlListAnnotation accessControlList = securityService.getAccessControlList(objectId);
|
||||
securedObject.setAccessControlList(securityDTOFactory.createAccessControlListDTO(
|
||||
AccessControlList accessControlListDTO = securityDTOFactory.createAccessControlListDTO(
|
||||
accessControlList == null ? null : accessControlList.getAnnotation(), fromOriginalToStrippedDownUser,
|
||||
fromOriginalToStrippedDownUserGroup));
|
||||
fromOriginalToStrippedDownUserGroup);
|
||||
if (disablePruningForCurrentUser) {
|
||||
securedObject.setAccessControlList(accessControlListDTO);
|
||||
} else {
|
||||
securedObject.setAccessControlList(securityDTOFactory.pruneAccessControlListForUser(accessControlListDTO,
|
||||
securityService.getCurrentUser()));
|
||||
}
|
||||
final OwnershipAnnotation ownership = securityService.getOwnership(objectId);
|
||||
securedObject.setOwnership(
|
||||
securityDTOFactory.createOwnershipDTO(ownership == null ? null : ownership.getAnnotation(),
|
||||
|
||||
Reference in new issue
Block a user