From 5fd6b9048ff0b38510c33bd278375d47b4efe495 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Thu, 9 May 2019 08:30:19 +0200 Subject: [PATCH] SONAR-12020 SONAR-12021 sonar-users should have issue admin and hotspot admin permission by default --- .../server/startup/RegisterPermissionTemplates.java | 4 ++-- .../startup/RegisterPermissionTemplatesTest.java | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java index 89716cbcc8d..e16a4cca99e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java @@ -95,8 +95,6 @@ public class RegisterPermissionTemplates { Optional admins = dbClient.groupDao().selectByName(dbSession, template.getOrganizationUuid(), DefaultGroups.ADMINISTRATORS); if (admins.isPresent()) { insertGroupPermission(dbSession, template, UserRole.ADMIN, admins.get()); - insertGroupPermission(dbSession, template, UserRole.ISSUE_ADMIN, admins.get()); - insertGroupPermission(dbSession, template, UserRole.SECURITYHOTSPOT_ADMIN, admins.get()); insertGroupPermission(dbSession, template, OrganizationPermission.APPLICATION_CREATOR.getKey(), admins.get()); insertGroupPermission(dbSession, template, OrganizationPermission.PORTFOLIO_CREATOR.getKey(), admins.get()); } else { @@ -112,6 +110,8 @@ public class RegisterPermissionTemplates { .orElseThrow(() -> new IllegalStateException(format("Default group with id %s for organization %s doesn't exist", defaultGroupId, organizationUuid))); insertGroupPermission(dbSession, template, UserRole.USER, defaultGroup); insertGroupPermission(dbSession, template, UserRole.CODEVIEWER, defaultGroup); + insertGroupPermission(dbSession, template, UserRole.ISSUE_ADMIN, defaultGroup); + insertGroupPermission(dbSession, template, UserRole.SECURITYHOTSPOT_ADMIN, defaultGroup); } private void insertGroupPermission(DbSession dbSession, PermissionTemplateDto template, String permission, GroupDto group) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java index f7e92345b1a..b7683ee184d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java @@ -32,7 +32,6 @@ import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.api.web.UserRole; -import org.sonar.api.web.page.Page; import org.sonar.db.DbTester; import org.sonar.db.organization.DefaultTemplates; import org.sonar.db.permission.OrganizationPermission; @@ -95,12 +94,12 @@ public class RegisterPermissionTemplatesTest { List groupPermissions = selectGroupPermissions(defaultTemplate); assertThat(groupPermissions).hasSize(7); expectGroupPermission(groupPermissions, UserRole.ADMIN, DefaultGroups.ADMINISTRATORS); - expectGroupPermission(groupPermissions, UserRole.ISSUE_ADMIN, DefaultGroups.ADMINISTRATORS); - expectGroupPermission(groupPermissions, UserRole.SECURITYHOTSPOT_ADMIN, DefaultGroups.ADMINISTRATORS); expectGroupPermission(groupPermissions, OrganizationPermission.APPLICATION_CREATOR.getKey(), DefaultGroups.ADMINISTRATORS); expectGroupPermission(groupPermissions, OrganizationPermission.PORTFOLIO_CREATOR.getKey(), DefaultGroups.ADMINISTRATORS); expectGroupPermission(groupPermissions, UserRole.CODEVIEWER, defaultGroup.getName()); expectGroupPermission(groupPermissions, UserRole.USER, defaultGroup.getName()); + expectGroupPermission(groupPermissions, UserRole.ISSUE_ADMIN, defaultGroup.getName()); + expectGroupPermission(groupPermissions, UserRole.SECURITYHOTSPOT_ADMIN, defaultGroup.getName()); verifyDefaultTemplates(); @@ -122,12 +121,12 @@ public class RegisterPermissionTemplatesTest { List groupPermissions = selectGroupPermissions(defaultTemplate); assertThat(groupPermissions).hasSize(7); expectGroupPermission(groupPermissions, UserRole.ADMIN, DefaultGroups.ADMINISTRATORS); - expectGroupPermission(groupPermissions, UserRole.ISSUE_ADMIN, DefaultGroups.ADMINISTRATORS); - expectGroupPermission(groupPermissions, UserRole.SECURITYHOTSPOT_ADMIN, DefaultGroups.ADMINISTRATORS); expectGroupPermission(groupPermissions, OrganizationPermission.APPLICATION_CREATOR.getKey(), DefaultGroups.ADMINISTRATORS); expectGroupPermission(groupPermissions, OrganizationPermission.PORTFOLIO_CREATOR.getKey(), DefaultGroups.ADMINISTRATORS); expectGroupPermission(groupPermissions, UserRole.CODEVIEWER, defaultGroup.getName()); expectGroupPermission(groupPermissions, UserRole.USER, defaultGroup.getName()); + expectGroupPermission(groupPermissions, UserRole.ISSUE_ADMIN, defaultGroup.getName()); + expectGroupPermission(groupPermissions, UserRole.SECURITYHOTSPOT_ADMIN, defaultGroup.getName()); verifyDefaultTemplates(); @@ -144,9 +143,11 @@ public class RegisterPermissionTemplatesTest { assertThat(defaultTemplate.getName()).isEqualTo("Default template"); List groupPermissions = selectGroupPermissions(defaultTemplate); - assertThat(groupPermissions).hasSize(2); + assertThat(groupPermissions).hasSize(4); expectGroupPermission(groupPermissions, UserRole.CODEVIEWER, defaultGroup.getName()); expectGroupPermission(groupPermissions, UserRole.USER, defaultGroup.getName()); + expectGroupPermission(groupPermissions, UserRole.ISSUE_ADMIN, defaultGroup.getName()); + expectGroupPermission(groupPermissions, UserRole.SECURITYHOTSPOT_ADMIN, defaultGroup.getName()); verifyDefaultTemplates(); -- 2.39.5