mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-13 17:05:43 +01:00
System roles should not be modifiable
This commit is contained in:
@@ -35,6 +35,7 @@ package sonia.scm.repository;
|
|||||||
|
|
||||||
import com.google.inject.Inject;
|
import com.google.inject.Inject;
|
||||||
import com.google.inject.Singleton;
|
import com.google.inject.Singleton;
|
||||||
|
import org.apache.shiro.authz.UnauthorizedException;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import sonia.scm.EagerSingleton;
|
import sonia.scm.EagerSingleton;
|
||||||
@@ -76,6 +77,7 @@ public class DefaultRepositoryRoleManager extends AbstractRepositoryRoleManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public RepositoryRole create(RepositoryRole repositoryRole) {
|
public RepositoryRole create(RepositoryRole repositoryRole) {
|
||||||
|
assertNoSystemRole(repositoryRole);
|
||||||
String type = repositoryRole.getType();
|
String type = repositoryRole.getType();
|
||||||
if (Util.isEmpty(type)) {
|
if (Util.isEmpty(type)) {
|
||||||
repositoryRole.setType(repositoryRoleDAO.getType());
|
repositoryRole.setType(repositoryRoleDAO.getType());
|
||||||
@@ -93,6 +95,7 @@ public class DefaultRepositoryRoleManager extends AbstractRepositoryRoleManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void delete(RepositoryRole repositoryRole) {
|
public void delete(RepositoryRole repositoryRole) {
|
||||||
|
assertNoSystemRole(repositoryRole);
|
||||||
logger.info("delete repositoryRole {} of type {}", repositoryRole.getName(), repositoryRole.getType());
|
logger.info("delete repositoryRole {} of type {}", repositoryRole.getName(), repositoryRole.getType());
|
||||||
managerDaoAdapter.delete(
|
managerDaoAdapter.delete(
|
||||||
repositoryRole,
|
repositoryRole,
|
||||||
@@ -108,6 +111,7 @@ public class DefaultRepositoryRoleManager extends AbstractRepositoryRoleManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void modify(RepositoryRole repositoryRole) {
|
public void modify(RepositoryRole repositoryRole) {
|
||||||
|
assertNoSystemRole(repositoryRole);
|
||||||
logger.info("modify repositoryRole {} of type {}", repositoryRole.getName(), repositoryRole.getType());
|
logger.info("modify repositoryRole {} of type {}", repositoryRole.getName(), repositoryRole.getType());
|
||||||
managerDaoAdapter.modify(
|
managerDaoAdapter.modify(
|
||||||
repositoryRole,
|
repositoryRole,
|
||||||
@@ -130,11 +134,17 @@ public class DefaultRepositoryRoleManager extends AbstractRepositoryRoleManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public RepositoryRole get(String id) {
|
public RepositoryRole get(String id) {
|
||||||
RepositoryRolePermissions.read();
|
RepositoryRolePermissions.read().check();
|
||||||
|
|
||||||
return findSystemRole(id).orElse(findCustomRole(id));
|
return findSystemRole(id).orElse(findCustomRole(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void assertNoSystemRole(RepositoryRole repositoryRole) {
|
||||||
|
if (findSystemRole(repositoryRole.getId()).isPresent()) {
|
||||||
|
throw new UnauthorizedException("system roles cannot be modified");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private RepositoryRole findCustomRole(String id) {
|
private RepositoryRole findCustomRole(String id) {
|
||||||
RepositoryRole repositoryRole = repositoryRoleDAO.get(id);
|
RepositoryRole repositoryRole = repositoryRoleDAO.get(id);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,87 @@
|
|||||||
|
package sonia.scm.repository;
|
||||||
|
|
||||||
|
import org.apache.shiro.authz.UnauthorizedException;
|
||||||
|
import org.apache.shiro.subject.Subject;
|
||||||
|
import org.apache.shiro.subject.support.SubjectThreadState;
|
||||||
|
import org.apache.shiro.util.ThreadContext;
|
||||||
|
import org.apache.shiro.util.ThreadState;
|
||||||
|
import org.assertj.core.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Nested;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.extension.ExtendWith;
|
||||||
|
import org.mockito.InjectMocks;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.junit.jupiter.MockitoExtension;
|
||||||
|
import sonia.scm.security.RepositoryPermissionProvider;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
|
import static org.mockito.Mockito.doAnswer;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
@ExtendWith(MockitoExtension.class)
|
||||||
|
class DefaultRepositoryRoleManagerTest {
|
||||||
|
|
||||||
|
private final Subject subject = mock(Subject.class);
|
||||||
|
private final ThreadState subjectThreadState = new SubjectThreadState(subject);
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private RepositoryRoleDAO dao;
|
||||||
|
@Mock
|
||||||
|
private RepositoryPermissionProvider permissionProvider;
|
||||||
|
|
||||||
|
@InjectMocks
|
||||||
|
private DefaultRepositoryRoleManager manager;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void initUser() {
|
||||||
|
subjectThreadState.bind();
|
||||||
|
doAnswer(invocation -> {
|
||||||
|
String permission = invocation.getArguments()[0].toString();
|
||||||
|
if (!subject.isPermitted(permission)) {
|
||||||
|
throw new UnauthorizedException(permission);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}).when(subject).checkPermission(anyString());
|
||||||
|
ThreadContext.bind(subject);
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
void cleanupContext() {
|
||||||
|
ThreadContext.unbindSubject();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nested
|
||||||
|
class WithAuthorizedUser {
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void authorizeUser() {
|
||||||
|
when(subject.isPermitted(any(String.class))).thenReturn(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldReturnNull_forNotExistingRole() {
|
||||||
|
RepositoryRole role = manager.get("noSuchRole");
|
||||||
|
assertThat(role).isNull();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nested
|
||||||
|
class WithUnauthorizedUser {
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void authorizeUser() {
|
||||||
|
when(subject.isPermitted(any(String.class))).thenReturn(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void x() {
|
||||||
|
assertThrows(UnauthorizedException.class, () -> manager.get("noSuchRole"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user