diff options
Diffstat (limited to 'sonar-db/src/test/java/org/sonar')
3 files changed, 103 insertions, 33 deletions
diff --git a/sonar-db/src/test/java/org/sonar/db/permission/AuthorizationDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/AuthorizationDaoTest.java index 68201780ed9..726b2959cfe 100644 --- a/sonar-db/src/test/java/org/sonar/db/permission/AuthorizationDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/AuthorizationDaoTest.java @@ -175,6 +175,59 @@ public class AuthorizationDaoTest { } @Test + public void countRemainingUserIdsWithGlobalPermissionIfExcludeGroup() { + // users with global permission "perm1" : + // - "u1" and "u2" through group "g1" + // - "u1" and "u3" through group "g2" + // - "u4" + + UserDto user1 = db.users().insertUser(); + UserDto user2 = db.users().insertUser(); + UserDto user3 = db.users().insertUser(); + UserDto user4 = db.users().insertUser(); + UserDto user5 = db.users().insertUser(); + + OrganizationDto org = OrganizationTesting.insert(db, newOrganizationDto()); + GroupDto group1 = db.users().insertGroup(org, "g1"); + db.users().insertPermissionOnGroup(group1, "perm1"); + db.users().insertPermissionOnGroup(group1, "perm2"); + db.users().insertMember(group1, user1); + db.users().insertMember(group1, user2); + + GroupDto group2 = db.users().insertGroup(org, "g2"); + db.users().insertPermissionOnGroup(group2, "perm1"); + db.users().insertPermissionOnGroup(group2, "perm2"); + db.users().insertMember(group2, user1); + db.users().insertMember(group2, user3); + + // group3 has the permission "perm1" but has no users + GroupDto group3 = db.users().insertGroup(org, "g2"); + db.users().insertPermissionOnGroup(group3, "perm1"); + + db.users().insertPermissionOnUser(user4, "perm1"); + db.users().insertPermissionOnUser(user4, "perm2"); + + db.users().insertPermissionOnAnyone(org, "perm1"); + + // excluding group "g1" -> remain u1, u3 and u4 + assertThat(underTest.countRemainingUserIdsWithGlobalPermissionIfExcludeGroup(db.getSession(), + org.getUuid(), "perm1", group1.getId())).isEqualTo(3); + + // excluding group "g2" -> remain u1, u2 and u4 + assertThat(underTest.countRemainingUserIdsWithGlobalPermissionIfExcludeGroup(db.getSession(), + org.getUuid(), "perm1", group2.getId())).isEqualTo(3); + + // excluding group "g3" -> remain u1, u2, u3 and u4 + assertThat(underTest.countRemainingUserIdsWithGlobalPermissionIfExcludeGroup(db.getSession(), + org.getUuid(), "perm1", group3.getId())).isEqualTo(4); + + // nobody has the permission + assertThat(underTest.countRemainingUserIdsWithGlobalPermissionIfExcludeGroup(db.getSession(), + org.getUuid(), "missingPermission", group1.getId())).isEqualTo(0); + + } + + @Test public void keep_authorized_project_ids_for_user() { db.prepareDbUnit(getClass(), "keep_authorized_project_ids_for_user.xml"); diff --git a/sonar-db/src/test/java/org/sonar/db/permission/GroupPermissionDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/GroupPermissionDaoTest.java index 453e05bce37..9c1c34c31bc 100644 --- a/sonar-db/src/test/java/org/sonar/db/permission/GroupPermissionDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/GroupPermissionDaoTest.java @@ -30,6 +30,8 @@ import org.sonar.api.web.UserRole; import org.sonar.db.DbSession; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; +import org.sonar.db.organization.OrganizationDto; +import org.sonar.db.organization.OrganizationTesting; import org.sonar.db.user.GroupDto; import static java.util.Arrays.asList; @@ -43,6 +45,7 @@ import static org.sonar.core.permission.GlobalPermissions.PROVISIONING; import static org.sonar.core.permission.GlobalPermissions.SCAN_EXECUTION; import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; import static org.sonar.db.component.ComponentTesting.newProjectDto; +import static org.sonar.db.organization.OrganizationTesting.newOrganizationDto; import static org.sonar.db.user.GroupTesting.newGroupDto; public class GroupPermissionDaoTest { @@ -277,43 +280,51 @@ public class GroupPermissionDaoTest { } @Test - public void selectGroupPermissions() { - GroupDto group1 = db.users().insertGroup(newGroupDto()); - GroupDto group2 = db.users().insertGroup(newGroupDto()); + public void selectGlobalPermissionsOfGroup() { + OrganizationDto org1 = OrganizationTesting.insert(db, newOrganizationDto()); + OrganizationDto org2 = OrganizationTesting.insert(db, newOrganizationDto()); + GroupDto group1 = db.users().insertGroup(org1, "group1"); + GroupDto group2 = db.users().insertGroup(org2, "group2"); ComponentDto project = db.components().insertProject(); - db.users().insertPermissionOnAnyone("perm1"); + db.users().insertPermissionOnAnyone(org1, "perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); db.users().insertPermissionOnGroup(group1, "perm3"); db.users().insertPermissionOnGroup(group2, "perm4"); db.users().insertProjectPermissionOnGroup(group1, "perm5", project); - db.users().insertProjectPermissionOnAnyone("perm6", project); + db.users().insertProjectPermissionOnAnyone(org1, "perm6", project); - // select global permissions on group - assertThat(underTest.selectGroupPermissions(dbSession, group1.getId(), null)).containsOnly("perm2", "perm3"); - assertThat(underTest.selectGroupPermissions(dbSession, UNKNOWN_GROUP_ID, null)).isEmpty(); + assertThat(underTest.selectGlobalPermissionsOfGroup(dbSession, org1.getUuid(), group1.getId())).containsOnly("perm2", "perm3"); + assertThat(underTest.selectGlobalPermissionsOfGroup(dbSession, org2.getUuid(), group2.getId())).containsOnly("perm4"); + assertThat(underTest.selectGlobalPermissionsOfGroup(dbSession, org1.getUuid(), null)).containsOnly("perm1"); - // select project permissions on group - assertThat(underTest.selectGroupPermissions(dbSession, group1.getId(), project.getId())).containsOnly("perm5"); - assertThat(underTest.selectGroupPermissions(dbSession, group1.getId(), UNKNOWN_PROJECT_ID)).isEmpty(); + // group1 is not in org2 + assertThat(underTest.selectGlobalPermissionsOfGroup(dbSession, org2.getUuid(), group1.getId())).isEmpty(); + assertThat(underTest.selectGlobalPermissionsOfGroup(dbSession, org2.getUuid(), null)).isEmpty(); } @Test - public void selectAnyonePermissions() { - GroupDto group1 = db.users().insertGroup(newGroupDto()); - ComponentDto project = db.components().insertProject(); + public void selectProjectPermissionsOfGroup() { + OrganizationDto org1 = OrganizationTesting.insert(db, newOrganizationDto()); + GroupDto group1 = db.users().insertGroup(org1, "group1"); + ComponentDto project1 = db.components().insertProject(); + ComponentDto project2 = db.components().insertProject(); - db.users().insertPermissionOnAnyone("perm1"); + db.users().insertPermissionOnAnyone(org1, "perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); - db.users().insertProjectPermissionOnGroup(group1, "perm3", project); - db.users().insertProjectPermissionOnAnyone("perm4", project); - - // select global permissions on group - assertThat(underTest.selectAnyonePermissions(dbSession, null)).containsOnly("perm1"); - - // select project permissions on group - assertThat(underTest.selectAnyonePermissions(dbSession, project.getId())).containsOnly("perm4"); - assertThat(underTest.selectAnyonePermissions(dbSession, UNKNOWN_PROJECT_ID)).isEmpty(); + db.users().insertProjectPermissionOnGroup(group1, "perm3", project1); + db.users().insertProjectPermissionOnGroup(group1, "perm4", project1); + db.users().insertProjectPermissionOnGroup(group1, "perm5", project2); + db.users().insertProjectPermissionOnAnyone(org1, "perm6", project1); + + assertThat(underTest.selectProjectPermissionsOfGroup(dbSession, org1.getUuid(), group1.getId(), project1.getId())) + .containsOnly("perm3", "perm4"); + assertThat(underTest.selectProjectPermissionsOfGroup(dbSession, org1.getUuid(), group1.getId(), project2.getId())) + .containsOnly("perm5"); + assertThat(underTest.selectProjectPermissionsOfGroup(dbSession, org1.getUuid(), null, project1.getId())) + .containsOnly("perm6"); + assertThat(underTest.selectProjectPermissionsOfGroup(dbSession, org1.getUuid(), null, project2.getId())) + .isEmpty(); } @Test diff --git a/sonar-db/src/test/java/org/sonar/db/user/UserDbTester.java b/sonar-db/src/test/java/org/sonar/db/user/UserDbTester.java index a2a75166c45..444beb61ee8 100644 --- a/sonar-db/src/test/java/org/sonar/db/user/UserDbTester.java +++ b/sonar-db/src/test/java/org/sonar/db/user/UserDbTester.java @@ -167,15 +167,21 @@ public class UserDbTester { } public List<String> selectGroupPermissions(GroupDto group, @Nullable ComponentDto project) { - return db.getDbClient().groupPermissionDao().selectGroupPermissions(db.getSession(), group.getId(), project == null ? null : project.getId()); - } - - /** - * @deprecated does not support organizations - */ - @Deprecated - public List<String> selectAnyonePermissions(@Nullable ComponentDto project) { - return db.getDbClient().groupPermissionDao().selectAnyonePermissions(db.getSession(), project == null ? null : project.getId()); + if (project == null) { + return db.getDbClient().groupPermissionDao().selectGlobalPermissionsOfGroup(db.getSession(), + group.getOrganizationUuid(), group.getId()); + } + return db.getDbClient().groupPermissionDao().selectProjectPermissionsOfGroup(db.getSession(), + group.getOrganizationUuid(), group.getId(), project.getId()); + } + + public List<String> selectAnyonePermissions(OrganizationDto org, @Nullable ComponentDto project) { + if (project == null) { + return db.getDbClient().groupPermissionDao().selectGlobalPermissionsOfGroup(db.getSession(), + org.getUuid(), null); + } + return db.getDbClient().groupPermissionDao().selectProjectPermissionsOfGroup(db.getSession(), + org.getUuid(), null, project.getId()); } // USER PERMISSIONS |