MaDgIK
/
uoa-repository-manager-service
13
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed (?) interface role checking

This commit is contained in:
Antonis Lempesis 2021-10-22 10:52:48 +00:00
parent 35825693ce
commit 702abc38e6
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
View File

@ -163,13 +163,13 @@ public class RepositoryController {
@RequestMapping(value = "/updateRepository", method = RequestMethod.POST,
consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
@PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#repository.id)")
@PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOfInterface(#repository.id)")
public Repository updateRepository(@RequestBody Repository repository, Authentication authentication) throws Exception {
return repositoryService.updateRepository(repository, authentication);
}
@RequestMapping(value = "/deleteInterface/", method = RequestMethod.DELETE)
@PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id)")
@PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOfInterface(#id)")
public void deleteRepositoryInterface(@RequestParam("id") String id,
@RequestParam("registeredBy") String registeredBy) {
repositoryService.deleteRepositoryInterface(id, registeredBy);

5
src/main/java/eu/dnetlib/repo/manager/service/security/AuthorizationService.java
View File

@ -21,6 +21,11 @@ public interface AuthorizationService {
*/
boolean isMemberOf(String id);
/**
* @param id repository interface Id to check.
* @return Checks if a user is a member of a repository interface.
*/
boolean isMemberOfInterface(String id);
/**
* Returns a list of admins of the resource.

11
src/main/java/eu/dnetlib/repo/manager/service/security/AuthorizationServiceImpl.java
View File

@ -53,7 +53,16 @@ public class AuthorizationServiceImpl implements AuthorizationService {
public boolean isMemberOf(String repoId) {
String repoRole = roleMappingService.convertRepoIdToEncodedAuthorityId(repoId);
return SecurityContextHolder.getContext().getAuthentication().getAuthorities()
.parallelStream().anyMatch(authority -> authority.toString().equals(repoRole));
.stream().anyMatch(authority -> authority.toString().equals(repoRole));
}
@Override
public boolean isMemberOfInterface(String interfaceId) {
//TODO blame Konstantinos Spyrou. He forced my hand...
String repoId = interfaceId.split("::")[1] + "::" + interfaceId.split("::")[2];
return isMemberOf(repoId);
}
@Override