inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged mward/5.2.n-repo-1583-groupmem (5.2.1) to 5.2.N (5.2.1)

Browse Source 
134377 mward: REPO-1583: non-admin now supported
   Also added tests for paging.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2017-01-17 14:22:12 +00:00
parent 897cd62fa2
commit 3b41c8a4eb
2 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/rest/api/impl/GroupsImpl.java
View File

@@ -29,6 +29,7 @@ import org.alfresco.query.CannedQueryPageDetails;
import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
import org.alfresco.repo.security.authority.AuthorityDAO;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authority.AuthorityInfo;
import org.alfresco.repo.security.authority.UnknownAuthorityException;
import org.alfresco.rest.antlr.WhereClauseParser;
@@ -39,6 +40,7 @@ import org.alfresco.rest.api.model.GroupMember;
import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
import org.alfresco.rest.framework.resource.parameters.Paging;
import org.alfresco.rest.framework.resource.parameters.Parameters;
@@ -56,6 +58,8 @@ import java.text.Collator;
import java.util.*;
import java.util.stream.Collectors;
import static org.alfresco.repo.security.authentication.AuthenticationUtil.runAsSystem;
/**
* Centralises access to groups services and maps between representations.
*
@@ -190,10 +194,20 @@ public class GroupsImpl implements Groups
}
@Override
public CollectionWithPagingInfo<Group> getGroupsByPersonId(String personId, Parameters parameters)
public CollectionWithPagingInfo<Group> getGroupsByPersonId(String requestedPersonId, Parameters parameters)
{
// Canonicalize the person ID, performing -me- alias substitution.
personId = people.validatePerson(personId);
final String personId = people.validatePerson(requestedPersonId);
// Non-admins can only access their own data
// TODO: this is also in PeopleImpl.update(personId,personInfo) - refactor?
boolean isAdmin = authorityService.hasAdminAuthority();
String currentUserId = AuthenticationUtil.getFullyAuthenticatedUser();
if (!isAdmin && !currentUserId.equalsIgnoreCase(personId))
{
// The user is not an admin user and is not attempting to update *their own* details.
throw new PermissionDeniedException();
}
final List<String> includeParam = parameters.getInclude();
Paging paging = parameters.getPaging();
@@ -203,7 +217,8 @@ public class GroupsImpl implements Groups
Pair<String, Boolean> sortProp = getGroupsSortProp(parameters);
// Get all the authorities for a user, including but not limited to, groups.
final Set<String> userAuthorities = authorityService.getAuthoritiesForUser(personId);
Set<String> userAuthorities = runAsSystem(
() -> authorityService.getAuthoritiesForUser(personId));
// Filter, transform and sort the list of user authorities into
// a suitable list of AuthorityInfo objects.