Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 09:46:16 +01:00
Code Issues Packages Projects Releases Activity

Fail assignment on not existing permission

Browse Source
This commit is contained in:
René Pfeuffer
2019-01-19 20:27:25 +01:00
parent 54ea940c64
commit 6815634fad
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scm-webapp/src/main/java/sonia/scm/security/PermissionAssigner.java
View File

@@ -1,5 +1,8 @@
package sonia.scm.security; package sonia.scm.security;
import sonia.scm.ContextEntry;
import sonia.scm.NotFoundException;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@@ -62,9 +65,21 @@ public class PermissionAssigner {
.collect(Collectors.toList()); .collect(Collectors.toList());
toRemove.forEach(securitySystem::deletePermission); toRemove.forEach(securitySystem::deletePermission);
Collection<PermissionDescriptor> availablePermissions = this.getAvailablePermissions();
permissions.stream() permissions.stream()
.filter(permissionExists(availablePermissions))
.map(p -> new AssignedPermission(id, groupPermission, p)) .map(p -> new AssignedPermission(id, groupPermission, p))
.filter(p -> !existingPermissions.contains(p)) .filter(p -> !existingPermissions.contains(p))
.forEach(securitySystem::addPermission); .forEach(securitySystem::addPermission);
} }
private Predicate<PermissionDescriptor> permissionExists(Collection<PermissionDescriptor> availablePermissions) {
return p -> {
if (!availablePermissions.contains(p)) {
throw NotFoundException.notFound(ContextEntry.ContextBuilder.entity("permission", p.getValue()));
}
return true;
};
}
} }

18
scm-webapp/src/test/java/sonia/scm/security/PermissionAssignerTest.java
View File

@@ -8,11 +8,14 @@ import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import sonia.scm.NotFoundException;
import sonia.scm.plugin.PluginLoader; import sonia.scm.plugin.PluginLoader;
import sonia.scm.store.InMemoryConfigurationEntryStoreFactory; import sonia.scm.store.InMemoryConfigurationEntryStoreFactory;
import sonia.scm.util.ClassLoaders; import sonia.scm.util.ClassLoaders;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.stream.Collectors;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -35,7 +38,14 @@ public class PermissionAssignerTest {
PluginLoader pluginLoader = mock(PluginLoader.class); PluginLoader pluginLoader = mock(PluginLoader.class);
when(pluginLoader.getUberClassLoader()).thenReturn(ClassLoaders.getContextClassLoader(DefaultSecuritySystem.class)); when(pluginLoader.getUberClassLoader()).thenReturn(ClassLoaders.getContextClassLoader(DefaultSecuritySystem.class));
securitySystem = new DefaultSecuritySystem(new InMemoryConfigurationEntryStoreFactory(), pluginLoader); securitySystem = new DefaultSecuritySystem(new InMemoryConfigurationEntryStoreFactory(), pluginLoader) {
@Override
public Collection<PermissionDescriptor> getAvailablePermissions() {
return Arrays.stream(new String[]{"perm:read:1", "perm:read:2", "perm:read:3", "perm:read:4"})
.map(PermissionDescriptor::new)
.collect(Collectors.toList());
}
};
try { try {
securitySystem.addPermission(new AssignedPermission("1", "perm:read:1")); securitySystem.addPermission(new AssignedPermission("1", "perm:read:1"));
@@ -86,4 +96,10 @@ public class PermissionAssignerTest {
permissionAssigner.setPermissionsForUser("2", asList(new PermissionDescriptor("perm:read:3"), new PermissionDescriptor("perm:read:4"))); permissionAssigner.setPermissionsForUser("2", asList(new PermissionDescriptor("perm:read:3"), new PermissionDescriptor("perm:read:4")));
} }
@Test
public void shouldFailForNotExistingPermissions() {
expectedException.expect(NotFoundException.class);
permissionAssigner.setPermissionsForUser("2", asList(new PermissionDescriptor("perm:read:5"), new PermissionDescriptor("perm:read:4")));
}
} }