Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

Accept already assigned permissions even when they are not available

Browse Source
This commit is contained in:
René Pfeuffer
2019-01-21 10:01:29 +01:00
parent 760a37409b
commit cda8c59c2d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,15 +68,15 @@ public class PermissionAssigner {
Collection<PermissionDescriptor> availablePermissions = this.getAvailablePermissions(); Collection<PermissionDescriptor> availablePermissions = this.getAvailablePermissions();
permissions.stream() permissions.stream()
.filter(permissionExists(availablePermissions)) .filter(permissionExists(availablePermissions, existingPermissions))
.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) { private Predicate<PermissionDescriptor> permissionExists(Collection<PermissionDescriptor> availablePermissions, Collection<AssignedPermission> existingPermissions) {
return p -> { return p -> {
if (!availablePermissions.contains(p)) { if (!availablePermissions.contains(p) && existingPermissions.stream().map(AssignedPermission::getPermission).noneMatch(e -> e.equals(p))) {
throw NotFoundException.notFound(ContextEntry.ContextBuilder.entity("permission", p.getValue())); throw NotFoundException.notFound(ContextEntry.ContextBuilder.entity("permission", p.getValue()));
} }
return true; return true;

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

@@ -100,6 +100,13 @@ public class PermissionAssignerTest {
@Test @Test
public void shouldFailForNotExistingPermissions() { public void shouldFailForNotExistingPermissions() {
expectedException.expect(NotFoundException.class); expectedException.expect(NotFoundException.class);
permissionAssigner.setPermissionsForUser("2", asList(new PermissionDescriptor("perm:read:5"), new PermissionDescriptor("perm:read:4"))); permissionAssigner.setPermissionsForUser("2", asList(new PermissionDescriptor("perm:read:4"), new PermissionDescriptor("perm:read:5")));
}
@Test
public void shouldAcceptNotExistingPermissionsWhenTheyWereAssignedBefore() {
securitySystem.addPermission(new AssignedPermission("2", "perm:read:5"));
permissionAssigner.setPermissionsForUser("2", asList(new PermissionDescriptor("perm:read:5")));
} }
} }