add missing permission checks

This commit is contained in:
Eduard Heimbuch
2020-08-05 15:05:07 +02:00
parent 4929784a2b
commit 1f64d04816
2 changed files with 6 additions and 0 deletions

View File

@@ -29,8 +29,10 @@ import io.swagger.v3.oas.annotations.headers.Header;
import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.apache.shiro.SecurityUtils;
import sonia.scm.group.Group; import sonia.scm.group.Group;
import sonia.scm.group.GroupManager; import sonia.scm.group.GroupManager;
import sonia.scm.group.GroupPermissions;
import sonia.scm.search.SearchRequest; import sonia.scm.search.SearchRequest;
import sonia.scm.search.SearchUtil; import sonia.scm.search.SearchUtil;
import sonia.scm.web.VndMediaType; import sonia.scm.web.VndMediaType;
@@ -106,6 +108,7 @@ public class GroupCollectionResource {
@QueryParam("desc") boolean desc, @QueryParam("desc") boolean desc,
@DefaultValue("") @QueryParam("q") String search @DefaultValue("") @QueryParam("q") String search
) { ) {
GroupPermissions.list().check();
return adapter.getAll(page, pageSize, createSearchPredicate(search), sortBy, desc, return adapter.getAll(page, pageSize, createSearchPredicate(search), sortBy, desc,
pageResult -> groupCollectionToDtoMapper.map(page, pageSize, pageResult)); pageResult -> groupCollectionToDtoMapper.map(page, pageSize, pageResult));
} }

View File

@@ -30,10 +30,12 @@ import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.apache.shiro.authc.credential.PasswordService; import org.apache.shiro.authc.credential.PasswordService;
import sonia.scm.group.GroupPermissions;
import sonia.scm.search.SearchRequest; import sonia.scm.search.SearchRequest;
import sonia.scm.search.SearchUtil; import sonia.scm.search.SearchUtil;
import sonia.scm.user.User; import sonia.scm.user.User;
import sonia.scm.user.UserManager; import sonia.scm.user.UserManager;
import sonia.scm.user.UserPermissions;
import sonia.scm.web.VndMediaType; import sonia.scm.web.VndMediaType;
import javax.inject.Inject; import javax.inject.Inject;
@@ -108,6 +110,7 @@ public class UserCollectionResource {
@DefaultValue("false") @QueryParam("desc") boolean desc, @DefaultValue("false") @QueryParam("desc") boolean desc,
@DefaultValue("") @QueryParam("q") String search @DefaultValue("") @QueryParam("q") String search
) { ) {
UserPermissions.list().check();
return adapter.getAll(page, pageSize, createSearchPredicate(search), sortBy, desc, return adapter.getAll(page, pageSize, createSearchPredicate(search), sortBy, desc,
pageResult -> userCollectionToDtoMapper.map(page, pageSize, pageResult)); pageResult -> userCollectionToDtoMapper.map(page, pageSize, pageResult));
} }