From 276abb42335b4609f922bbf7c289cc26bb98f302 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 12 Oct 2020 17:00:17 +0200 Subject: [PATCH] SONAR-13936 Remove use of organizations in Permissions WS and DB * SONAR-13936 Remove organization parameters from permissions WS * SONAR-13936 Remove organization_uuid column from user_roles table * SONAR-13936 Fix developer ITs * SONAR-13936 Remove organization_uuid column from group_roles table * SONAR-13936 Remove organization_uuid column from permission_templates table --- .../db/permission/UserPermissionDao.java | 8 +-- .../db/permission/UserPermissionMapper.java | 4 +- .../template/PermissionTemplateDto.java | 6 --- .../db/organization/OrganizationMapper.xml | 8 +-- .../db/permission/GroupPermissionMapper.xml | 2 - .../db/permission/UserPermissionMapper.xml | 2 - .../template/PermissionTemplateMapper.xml | 3 +- server/sonar-db-dao/src/schema/schema-sq.ddl | 5 +- .../db/permission/UserPermissionDaoTest.java | 6 +-- .../template/PermissionTemplateDaoTest.java | 1 - .../sonar/db/component/ComponentDbTester.java | 4 ++ .../template/PermissionTemplateDbTester.java | 2 - .../java/org/sonar/db/user/UserDbTester.java | 4 +- .../db/migration/version/v86/DbVersion86.java | 3 ++ .../v86/DropOrganizationInGroupRoles.java | 54 +++++++++++++++++++ ...DropOrganizationInPermissionTemplates.java | 39 ++++++++++++++ .../v86/DropOrganizationInUserRoles.java | 39 ++++++++++++++ .../v86/DropOrganizationInGroupRolesTest.java | 42 +++++++++++++++ ...OrganizationInPermissionTemplatesTest.java | 41 ++++++++++++++ .../v86/DropOrganizationInUserRolesTest.java | 41 ++++++++++++++ .../schema.sql | 10 ++++ .../schema.sql | 10 ++++ .../schema.sql | 10 ++++ .../organization/OrganizationUpdaterImpl.java | 3 +- .../server/permission/PermissionService.java | 2 +- .../permission/PermissionServiceImpl.java | 2 +- .../permission/PermissionServiceImplTest.java | 2 +- .../startup/RegisterPermissionTemplates.java | 1 - .../RegisterPermissionTemplatesTest.java | 7 +-- .../server/permission/PermissionChange.java | 4 +- .../permission/PermissionTemplateService.java | 6 +-- .../permission/UserPermissionChanger.java | 7 +-- .../server/permission/ws/AddGroupAction.java | 2 - .../server/permission/ws/AddUserAction.java | 3 -- .../server/permission/ws/GroupsAction.java | 3 -- .../permission/ws/PermissionWsSupport.java | 10 +--- .../permission/ws/RemoveGroupAction.java | 2 - .../permission/ws/RemoveUserAction.java | 2 - .../ws/SearchGlobalPermissionsAction.java | 4 +- .../server/permission/ws/UsersAction.java | 2 - .../server/permission/ws/WsParameters.java | 21 +++----- .../AddProjectCreatorToTemplateAction.java | 2 - .../ws/template/AddUserToTemplateAction.java | 2 - .../ws/template/BulkApplyTemplateAction.java | 4 +- .../ws/template/CreateTemplateAction.java | 6 +-- ...emoveProjectCreatorFromTemplateAction.java | 2 - .../RemoveUserFromTemplateAction.java | 2 - .../ws/template/SearchTemplatesAction.java | 3 -- .../ws/template/SetDefaultTemplateAction.java | 4 +- .../project/ws/UpdateVisibilityAction.java | 7 +-- .../sonar/server/user/ws/CurrentAction.java | 2 +- .../server/user/ws/DeactivateAction.java | 28 ++-------- .../GroupPermissionChangerTest.java | 15 +++--- .../permission/UserPermissionChangerTest.java | 13 +++-- .../permission/ws/AddGroupActionTest.java | 50 ++++++++--------- .../permission/ws/AddUserActionTest.java | 26 +++++---- .../permission/ws/BasePermissionWsTest.java | 3 +- .../permission/ws/GroupsActionTest.java | 23 ++++---- .../permission/ws/RemoveGroupActionTest.java | 47 ++++++---------- .../permission/ws/RemoveUserActionTest.java | 41 ++++++-------- .../SearchProjectPermissionsActionTest.java | 32 +++++------ .../server/permission/ws/UsersActionTest.java | 48 ++++------------- .../AddGroupToTemplateActionTest.java | 2 +- ...AddProjectCreatorToTemplateActionTest.java | 2 +- .../template/AddUserToTemplateActionTest.java | 27 ++-------- .../ws/template/ApplyTemplateActionTest.java | 3 -- .../template/BulkApplyTemplateActionTest.java | 4 +- .../RemoveUserFromTemplateActionTest.java | 5 +- .../template/SearchTemplatesActionTest.java | 3 -- .../SetDefaultTemplateActionTest.java | 1 - .../ws/template/TemplateUsersActionTest.java | 2 - .../ws/template/UpdateTemplateActionTest.java | 3 +- .../ws/UpdateVisibilityActionTest.java | 4 +- .../server/user/ws/DeactivateActionTest.java | 46 ++++++++++------ .../usergroups/ws/DeleteActionTest.java | 2 +- .../permission/PermissionsWsParameters.java | 1 - 76 files changed, 492 insertions(+), 400 deletions(-) create mode 100644 server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRoles.java create mode 100644 server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplates.java create mode 100644 server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRoles.java create mode 100644 server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRolesTest.java create mode 100644 server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplatesTest.java create mode 100644 server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRolesTest.java create mode 100644 server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRolesTest/schema.sql create mode 100644 server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplatesTest/schema.sql create mode 100644 server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRolesTest/schema.sql diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/permission/UserPermissionDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/permission/UserPermissionDao.java index 96856f31412..efa3efc7595 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/permission/UserPermissionDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/permission/UserPermissionDao.java @@ -80,9 +80,9 @@ public class UserPermissionDao implements Dao { } /** - * Gets all the global permissions granted to user for the specified organization. + * Gets all the global permissions granted to user * - * @return the global permissions. An empty list is returned if user or organization do not exist. + * @return the global permissions. An empty list is returned if user do not exist. */ public List selectGlobalPermissionsOfUser(DbSession dbSession, String userUuid) { return mapper(dbSession).selectGlobalPermissionsOfUser(userUuid); @@ -101,8 +101,8 @@ public class UserPermissionDao implements Dao { return mapper(session).selectUserUuidsWithPermissionOnProjectBut(projectUuid, permission); } - public void insert(DbSession dbSession, UserPermissionDto dto, String defaultOrgUuid) { - mapper(dbSession).insert(dto, defaultOrgUuid); + public void insert(DbSession dbSession, UserPermissionDto dto) { + mapper(dbSession).insert(dto); } /** diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/permission/UserPermissionMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/permission/UserPermissionMapper.java index 5abbbc3e7de..2c0b3a55c2d 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/permission/UserPermissionMapper.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/permission/UserPermissionMapper.java @@ -31,7 +31,7 @@ public interface UserPermissionMapper { List selectUserUuidsByQuery(@Param("query") PermissionQuery query); /** - * Fetch user ids based on permission query and only in a specific scope (global permissions only, organization permissions only or project permissions only) + * Fetch user ids based on permission query and only in a specific scope (global permissions only or project permissions only) */ List selectUserUuidsByQueryAndScope(@Param("query") PermissionQuery query); @@ -52,7 +52,7 @@ public interface UserPermissionMapper { */ Set selectUserUuidsWithPermissionOnProjectBut(@Param("projectUuid") String projectUuid, @Param("permission") String permission); - void insert(@Param("dto")UserPermissionDto dto, @Param("defaultOrgUuid") String defaultOrgUuid); + void insert(@Param("dto")UserPermissionDto dto); void deleteGlobalPermission(@Param("userUuid") String userUuid, @Param("permission") String permission); diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/permission/template/PermissionTemplateDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/permission/template/PermissionTemplateDto.java index 43b101f95ae..e6094cb497d 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/permission/template/PermissionTemplateDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/permission/template/PermissionTemplateDto.java @@ -24,7 +24,6 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; public class PermissionTemplateDto { - private String organizationUuid; private String name; private String uuid; private String description; @@ -41,11 +40,6 @@ public class PermissionTemplateDto { return this; } - public PermissionTemplateDto setOrganizationUuid(String uuid) { - this.organizationUuid = uuid; - return this; - } - /** * @since 5.2 the kee column is a proper uuid. Before that it was build on the name + timestamp */ diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml index 449b2b73bc5..cf9445386c2 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml @@ -148,18 +148,14 @@ select from organizations org - inner join user_roles ur on - ur.organization_uuid = org.uuid - and ur.user_uuid = #{userUuid,jdbcType=VARCHAR} + inner join user_roles ur on ur.user_uuid = #{userUuid,jdbcType=VARCHAR} and ur.component_uuid is null and ur.role = #{permission,jdbcType=VARCHAR} union select from organizations org - inner join group_roles g on - g.organization_uuid = org.uuid - and g.component_uuid is null + inner join group_roles g on g.component_uuid is null and g.role = #{permission,jdbcType=VARCHAR} inner join groups_users gu on gu.group_uuid = g.group_uuid diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml index 163ffd078bd..1ce169e2918 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml @@ -190,13 +190,11 @@ insert into group_roles ( - organization_uuid, uuid, group_uuid, component_uuid, role ) values ( - 'asd', #{uuid,jdbcType=VARCHAR}, #{groupUuid,jdbcType=VARCHAR}, #{componentUuid,jdbcType=BIGINT}, diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml index 5e3ffce7a05..c99065538ee 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml @@ -132,13 +132,11 @@ insert into user_roles ( - organization_uuid, uuid, user_uuid, component_uuid, role ) values ( - #{defaultOrgUuid,jdbcType=VARCHAR}, #{dto.uuid,jdbcType=VARCHAR}, #{dto.userUuid,jdbcType=VARCHAR}, #{dto.componentUuid,jdbcType=VARCHAR}, diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/template/PermissionTemplateMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/template/PermissionTemplateMapper.xml index b05f8bb8bb9..c67173c0a29 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/template/PermissionTemplateMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/template/PermissionTemplateMapper.xml @@ -4,9 +4,8 @@ - INSERT INTO permission_templates (organization_uuid, name, uuid, description, key_pattern, created_at, updated_at) + INSERT INTO permission_templates (name, uuid, description, key_pattern, created_at, updated_at) VALUES ( - #{organizationUuid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, diff --git a/server/sonar-db-dao/src/schema/schema-sq.ddl b/server/sonar-db-dao/src/schema/schema-sq.ddl index c0ed77595ea..25052cb6ecc 100644 --- a/server/sonar-db-dao/src/schema/schema-sq.ddl +++ b/server/sonar-db-dao/src/schema/schema-sq.ddl @@ -315,7 +315,6 @@ CREATE INDEX "FILE_SOURCES_PROJECT_UUID" ON "FILE_SOURCES"("PROJECT_UUID"); CREATE INDEX "FILE_SOURCES_UPDATED_AT" ON "FILE_SOURCES"("UPDATED_AT"); CREATE TABLE "GROUP_ROLES"( - "ORGANIZATION_UUID" VARCHAR(40) NOT NULL, "ROLE" VARCHAR(64) NOT NULL, "COMPONENT_UUID" VARCHAR(40), "UUID" VARCHAR(40) NOT NULL, @@ -323,7 +322,7 @@ CREATE TABLE "GROUP_ROLES"( ); ALTER TABLE "GROUP_ROLES" ADD CONSTRAINT "PK_GROUP_ROLES" PRIMARY KEY("UUID"); CREATE INDEX "GROUP_ROLES_COMPONENT_UUID" ON "GROUP_ROLES"("COMPONENT_UUID"); -CREATE UNIQUE INDEX "UNIQ_GROUP_ROLES" ON "GROUP_ROLES"("ORGANIZATION_UUID", "GROUP_UUID", "COMPONENT_UUID", "ROLE"); +CREATE UNIQUE INDEX "UNIQ_GROUP_ROLES" ON "GROUP_ROLES"("GROUP_UUID", "COMPONENT_UUID", "ROLE"); CREATE TABLE "GROUPS"( "ORGANIZATION_UUID" VARCHAR(40) NOT NULL, @@ -585,7 +584,6 @@ ALTER TABLE "PERM_TPL_CHARACTERISTICS" ADD CONSTRAINT "PK_PERM_TPL_CHARACTERISTI CREATE UNIQUE INDEX "UNIQ_PERM_TPL_CHARAC" ON "PERM_TPL_CHARACTERISTICS"("TEMPLATE_UUID", "PERMISSION_KEY"); CREATE TABLE "PERMISSION_TEMPLATES"( - "ORGANIZATION_UUID" VARCHAR(40) NOT NULL, "NAME" VARCHAR(100) NOT NULL, "DESCRIPTION" VARCHAR(4000), "CREATED_AT" TIMESTAMP, @@ -916,7 +914,6 @@ ALTER TABLE "USER_PROPERTIES" ADD CONSTRAINT "PK_USER_PROPERTIES" PRIMARY KEY("U CREATE UNIQUE INDEX "USER_PROPERTIES_USER_UUID_KEE" ON "USER_PROPERTIES"("USER_UUID", "KEE"); CREATE TABLE "USER_ROLES"( - "ORGANIZATION_UUID" VARCHAR(40) NOT NULL, "ROLE" VARCHAR(64) NOT NULL, "COMPONENT_UUID" VARCHAR(40), "UUID" VARCHAR(40) NOT NULL, diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java index 87ce35d799c..674e132cd82 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java @@ -35,7 +35,6 @@ import org.sonar.core.util.Uuids; 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.user.UserDto; import static java.util.Arrays.asList; @@ -67,7 +66,6 @@ public class UserPermissionDaoTest { @Test public void select_global_permissions() { - OrganizationDto org2 = db.organizations().insert(); UserDto user1 = insertUser(u -> u.setLogin("login1").setName("Marius").setEmail("email1@email.com")); UserDto user2 = insertUser(u -> u.setLogin("login2").setName("Marie").setEmail("email2@email.com")); UserDto user3 = insertUser(u -> u.setLogin("zanother").setName("Zoe").setEmail("zanother3@another.com")); @@ -634,14 +632,14 @@ public class UserPermissionDaoTest { private UserPermissionDto addGlobalPermission(String permission, UserDto user) { UserPermissionDto dto = new UserPermissionDto(Uuids.create(), permission, user.getUuid(), null); - underTest.insert(dbSession, dto, db.getDefaultOrganization().getUuid()); + underTest.insert(dbSession, dto); db.commit(); return dto; } private UserPermissionDto addProjectPermission(String permission, UserDto user, ComponentDto project) { UserPermissionDto dto = new UserPermissionDto(Uuids.create(), permission, user.getUuid(), project.uuid()); - underTest.insert(dbSession, dto, db.getDefaultOrganization().getUuid()); + underTest.insert(dbSession, dto); db.commit(); return dto; } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java index 615b899e6c5..f633cf55528 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java @@ -74,7 +74,6 @@ public class PermissionTemplateDaoTest { @Test public void create_permission_template() { PermissionTemplateDto permissionTemplate = underTest.insert(db.getSession(), newPermissionTemplateDto() - .setOrganizationUuid(db.getDefaultOrganization().getUuid()) .setUuid("ABCD") .setName("my template") .setDescription("my description") diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java index 8a7ca726cae..b46a7eb5e3a 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java @@ -82,6 +82,10 @@ public class ComponentDbTester { return insertComponentAndBranchAndProject(componentDto, false); } + public ComponentDto insertPrivateProject(String uuid) { + return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization(), uuid), true); + } + public final ComponentDto insertPrivateProject(Consumer dtoPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()), true, defaults(), dtoPopulator); diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/permission/template/PermissionTemplateDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/permission/template/PermissionTemplateDbTester.java index 3d1b0c0d024..eae6c1c8fac 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/permission/template/PermissionTemplateDbTester.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/permission/template/PermissionTemplateDbTester.java @@ -45,10 +45,8 @@ public class PermissionTemplateDbTester { } public PermissionTemplateDto insertTemplate(PermissionTemplateDto template) { - template.setOrganizationUuid(db.getDefaultOrganization().getUuid()); PermissionTemplateDto templateInDb = dbClient.permissionTemplateDao().insert(dbSession, template); db.commit(); - return templateInDb; } diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/user/UserDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/user/UserDbTester.java index 687177e13b2..7ee38344a1e 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/user/UserDbTester.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/user/UserDbTester.java @@ -304,7 +304,7 @@ public class UserDbTester { @Deprecated public UserPermissionDto insertPermissionOnUser(UserDto user, String permission) { UserPermissionDto dto = new UserPermissionDto(Uuids.create(), permission, user.getUuid(), null); - db.getDbClient().userPermissionDao().insert(db.getSession(), dto, db.getDefaultOrganization().getUuid()); + db.getDbClient().userPermissionDao().insert(db.getSession(), dto); db.commit(); return dto; } @@ -327,7 +327,7 @@ public class UserDbTester { "%s can't be granted on a public project", permission); checkArgument(project.getMainBranchProjectUuid() == null, "Permissions can't be granted on branches"); UserPermissionDto dto = new UserPermissionDto(Uuids.create(), permission, user.getUuid(), project.uuid()); - db.getDbClient().userPermissionDao().insert(db.getSession(), dto, db.getDefaultOrganization().getUuid()); + db.getDbClient().userPermissionDao().insert(db.getSession(), dto); db.commit(); return dto; } diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DbVersion86.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DbVersion86.java index 660e864dfb7..29ccb9dcefe 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DbVersion86.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DbVersion86.java @@ -35,6 +35,9 @@ public class DbVersion86 implements DbVersion { .add(4105, "Drop 'organization_uuid' in 'rules_metadata'", DropOrganizationInRulesMetadata.class) .add(4106, "Update 'change_data' column of 'qprofile_changes' table to use ruleUuid", UpdateChangeDataOfQProfileChanges.class) .add(4107, "Drop 'organization_uuid' in 'users'", DropOrganizationInUsers.class) + .add(4108, "Drop 'organization_uuid' in 'user_roles'", DropOrganizationInUserRoles.class) + .add(4109, "Drop 'organization_uuid' in 'group_roles'", DropOrganizationInGroupRoles.class) + .add(4110, "Drop 'organization_uuid' in 'permission_templates'", DropOrganizationInPermissionTemplates.class) ; } } diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRoles.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRoles.java new file mode 100644 index 00000000000..d6276890323 --- /dev/null +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRoles.java @@ -0,0 +1,54 @@ +/* + * SonarQube + * Copyright (C) 2009-2020 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.platform.db.migration.version.v86; + +import java.sql.SQLException; +import org.sonar.db.Database; +import org.sonar.server.platform.db.migration.sql.CreateIndexBuilder; +import org.sonar.server.platform.db.migration.sql.DropColumnsBuilder; +import org.sonar.server.platform.db.migration.sql.DropIndexBuilder; +import org.sonar.server.platform.db.migration.step.DdlChange; + +public class DropOrganizationInGroupRoles extends DdlChange { + + private static final String TABLE_NAME = "group_roles"; + + public DropOrganizationInGroupRoles(Database db) { + super(db); + } + + @Override + public void execute(Context context) throws SQLException { + context.execute( + new DropIndexBuilder(getDialect()) + .setTable(TABLE_NAME) + .setName("uniq_group_roles") + .build()); + context.execute(new DropColumnsBuilder(getDialect(), TABLE_NAME, "organization_uuid").build()); + context.execute(new CreateIndexBuilder() + .setTable(TABLE_NAME) + .setName("uniq_group_roles") + .addColumn("group_uuid") + .addColumn("component_uuid") + .addColumn("role") + .setUnique(true) + .build()); + } +} diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplates.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplates.java new file mode 100644 index 00000000000..868205eebfe --- /dev/null +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplates.java @@ -0,0 +1,39 @@ +/* + * SonarQube + * Copyright (C) 2009-2020 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.platform.db.migration.version.v86; + +import java.sql.SQLException; +import org.sonar.db.Database; +import org.sonar.server.platform.db.migration.sql.DropColumnsBuilder; +import org.sonar.server.platform.db.migration.step.DdlChange; + +public class DropOrganizationInPermissionTemplates extends DdlChange { + + private static final String TABLE_NAME = "permission_templates"; + + public DropOrganizationInPermissionTemplates(Database db) { + super(db); + } + + @Override + public void execute(Context context) throws SQLException { + context.execute(new DropColumnsBuilder(getDialect(), TABLE_NAME, "organization_uuid").build()); + } +} diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRoles.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRoles.java new file mode 100644 index 00000000000..7e02815b6c5 --- /dev/null +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRoles.java @@ -0,0 +1,39 @@ +/* + * SonarQube + * Copyright (C) 2009-2020 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.platform.db.migration.version.v86; + +import java.sql.SQLException; +import org.sonar.db.Database; +import org.sonar.server.platform.db.migration.sql.DropColumnsBuilder; +import org.sonar.server.platform.db.migration.step.DdlChange; + +public class DropOrganizationInUserRoles extends DdlChange { + + private static final String TABLE_NAME = "user_roles"; + + public DropOrganizationInUserRoles(Database db) { + super(db); + } + + @Override + public void execute(Context context) throws SQLException { + context.execute(new DropColumnsBuilder(getDialect(), TABLE_NAME, "organization_uuid").build()); + } +} diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRolesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRolesTest.java new file mode 100644 index 00000000000..29f3551fc74 --- /dev/null +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRolesTest.java @@ -0,0 +1,42 @@ +/* + * SonarQube + * Copyright (C) 2009-2020 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.platform.db.migration.version.v86; + +import java.sql.SQLException; +import org.junit.Rule; +import org.junit.Test; +import org.sonar.db.CoreDbTester; +import org.sonar.server.platform.db.migration.step.MigrationStep; + +public class DropOrganizationInGroupRolesTest { + + @Rule + public CoreDbTester dbTester = CoreDbTester.createForSchema(DropOrganizationInGroupRolesTest.class, "schema.sql"); + + private MigrationStep underTest = new DropOrganizationInGroupRoles(dbTester.database()); + + @Test + public void column_has_been_dropped() throws SQLException { + underTest.execute(); + dbTester.assertColumnDoesNotExist("group_roles", "organization_uuid"); + dbTester.assertUniqueIndex("group_roles", "uniq_group_roles", "group_uuid", "component_uuid", "role"); + } + +} diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplatesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplatesTest.java new file mode 100644 index 00000000000..9fd1f8d8738 --- /dev/null +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplatesTest.java @@ -0,0 +1,41 @@ +/* + * SonarQube + * Copyright (C) 2009-2020 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.platform.db.migration.version.v86; + +import java.sql.SQLException; +import org.junit.Rule; +import org.junit.Test; +import org.sonar.db.CoreDbTester; +import org.sonar.server.platform.db.migration.step.MigrationStep; + +public class DropOrganizationInPermissionTemplatesTest { + + @Rule + public CoreDbTester dbTester = CoreDbTester.createForSchema(DropOrganizationInPermissionTemplatesTest.class, "schema.sql"); + + private MigrationStep underTest = new DropOrganizationInPermissionTemplates(dbTester.database()); + + @Test + public void column_has_been_dropped() throws SQLException { + underTest.execute(); + dbTester.assertColumnDoesNotExist("permission_templates", "organization_uuid"); + } + +} diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRolesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRolesTest.java new file mode 100644 index 00000000000..3eb971c3c05 --- /dev/null +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRolesTest.java @@ -0,0 +1,41 @@ +/* + * SonarQube + * Copyright (C) 2009-2020 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.platform.db.migration.version.v86; + +import java.sql.SQLException; +import org.junit.Rule; +import org.junit.Test; +import org.sonar.db.CoreDbTester; +import org.sonar.server.platform.db.migration.step.MigrationStep; + +public class DropOrganizationInUserRolesTest { + + @Rule + public CoreDbTester dbTester = CoreDbTester.createForSchema(DropOrganizationInUserRolesTest.class, "schema.sql"); + + private MigrationStep underTest = new DropOrganizationInUserRoles(dbTester.database()); + + @Test + public void column_has_been_dropped() throws SQLException { + underTest.execute(); + dbTester.assertColumnDoesNotExist("user_roles", "organization_uuid"); + } + +} diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRolesTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRolesTest/schema.sql new file mode 100644 index 00000000000..0a63c1e9aec --- /dev/null +++ b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInGroupRolesTest/schema.sql @@ -0,0 +1,10 @@ +CREATE TABLE "GROUP_ROLES"( + "ORGANIZATION_UUID" VARCHAR(40) NOT NULL, + "ROLE" VARCHAR(64) NOT NULL, + "COMPONENT_UUID" VARCHAR(40), + "UUID" VARCHAR(40) NOT NULL, + "GROUP_UUID" VARCHAR(40) +); +ALTER TABLE "GROUP_ROLES" ADD CONSTRAINT "PK_GROUP_ROLES" PRIMARY KEY("UUID"); +CREATE INDEX "GROUP_ROLES_COMPONENT_UUID" ON "GROUP_ROLES"("COMPONENT_UUID"); +CREATE UNIQUE INDEX "UNIQ_GROUP_ROLES" ON "GROUP_ROLES"("ORGANIZATION_UUID", "GROUP_UUID", "COMPONENT_UUID", "ROLE"); diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplatesTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplatesTest/schema.sql new file mode 100644 index 00000000000..c9a2ab5a05c --- /dev/null +++ b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInPermissionTemplatesTest/schema.sql @@ -0,0 +1,10 @@ +CREATE TABLE "PERMISSION_TEMPLATES"( + "ORGANIZATION_UUID" VARCHAR(40) NOT NULL, + "NAME" VARCHAR(100) NOT NULL, + "DESCRIPTION" VARCHAR(4000), + "CREATED_AT" TIMESTAMP, + "UPDATED_AT" TIMESTAMP, + "KEY_PATTERN" VARCHAR(500), + "UUID" VARCHAR(40) NOT NULL +); +ALTER TABLE "PERMISSION_TEMPLATES" ADD CONSTRAINT "PK_PERMISSION_TEMPLATES" PRIMARY KEY("UUID"); diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRolesTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRolesTest/schema.sql new file mode 100644 index 00000000000..5acabc59b9e --- /dev/null +++ b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v86/DropOrganizationInUserRolesTest/schema.sql @@ -0,0 +1,10 @@ +CREATE TABLE "USER_ROLES"( + "ORGANIZATION_UUID" VARCHAR(40) NOT NULL, + "ROLE" VARCHAR(64) NOT NULL, + "COMPONENT_UUID" VARCHAR(40), + "UUID" VARCHAR(40) NOT NULL, + "USER_UUID" VARCHAR(255) +); +ALTER TABLE "USER_ROLES" ADD CONSTRAINT "PK_USER_ROLES" PRIMARY KEY("UUID"); +CREATE INDEX "USER_ROLES_COMPONENT_UUID" ON "USER_ROLES"("COMPONENT_UUID"); +CREATE INDEX "USER_ROLES_USER" ON "USER_ROLES"("USER_UUID"); diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationUpdaterImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationUpdaterImpl.java index 8284ab6f4d1..5277ae59103 100644 --- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationUpdaterImpl.java +++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationUpdaterImpl.java @@ -164,7 +164,6 @@ public class OrganizationUpdaterImpl implements OrganizationUpdater { new PermissionTemplateDto() .setUuid(uuidFactory.create()) .setName(PERM_TEMPLATE_NAME) - .setOrganizationUuid(organizationDto.getUuid()) .setDescription(format(PERM_TEMPLATE_DESCRIPTION_PATTERN, organizationDto.getName())) .setCreatedAt(now) .setUpdatedAt(now)); @@ -221,7 +220,7 @@ public class OrganizationUpdaterImpl implements OrganizationUpdater { .setUuid(uuidFactory.create()) .setName(OWNERS_GROUP_NAME) .setDescription(OWNERS_GROUP_DESCRIPTION)); - permissionService.getAllOrganizationPermissions().forEach(p -> addPermissionToGroup(dbSession, group, p)); + permissionService.getGlobalPermissions().forEach(p -> addPermissionToGroup(dbSession, group, p)); return group; } diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionService.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionService.java index 75175dc4920..93b5f65a82c 100644 --- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionService.java +++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionService.java @@ -24,7 +24,7 @@ import org.sonar.db.permission.OrganizationPermission; public interface PermissionService { - List getAllOrganizationPermissions(); + List getGlobalPermissions(); List getAllProjectPermissions(); } diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionServiceImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionServiceImpl.java index 9e621091595..9f5b72da99b 100644 --- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionServiceImpl.java +++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionServiceImpl.java @@ -55,7 +55,7 @@ public class PermissionServiceImpl implements PermissionService { * Return an immutable Set of all organization permissions */ @Override - public List getAllOrganizationPermissions() { + public List getGlobalPermissions() { return globalPermissions; } diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/permission/PermissionServiceImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/permission/PermissionServiceImplTest.java index e014b8b687d..44e92ab0051 100644 --- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/permission/PermissionServiceImplTest.java +++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/permission/PermissionServiceImplTest.java @@ -32,7 +32,7 @@ public class PermissionServiceImplTest { @Test public void organizationPermissions_must_be_ordered() { - assertThat(underTest.getAllOrganizationPermissions()) + assertThat(underTest.getGlobalPermissions()) .extracting(OrganizationPermission::getKey) .containsExactly("admin", "gateadmin", "profileadmin", "provisioning", "scan", "applicationcreator", "portfoliocreator"); } diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java index a32c28e89e1..ce495844b16 100644 --- a/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java +++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java @@ -79,7 +79,6 @@ public class RegisterPermissionTemplates implements Startable { } PermissionTemplateDto template = new PermissionTemplateDto() - .setOrganizationUuid(defaultOrganizationProvider.get().getUuid()) .setName("Default template") .setUuid(DEFAULT_TEMPLATE_UUID) .setDescription("This permission template will be used as default when no other permission configuration is available") diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java index 232a907ac32..1c9d0879c11 100644 --- a/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java +++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java @@ -156,9 +156,7 @@ public class RegisterPermissionTemplatesTest { @Test public void do_not_create_default_template_if_already_exists_but_register_when_it_is_not() { - db.permissionTemplates().insertTemplate(newPermissionTemplateDto() - .setOrganizationUuid(db.getDefaultOrganization().getUuid()) - .setUuid(DEFAULT_TEMPLATE_UUID)); + db.permissionTemplates().insertTemplate(newPermissionTemplateDto().setUuid(DEFAULT_TEMPLATE_UUID)); underTest.start(); @@ -168,7 +166,6 @@ public class RegisterPermissionTemplatesTest { @Test public void do_not_fail_if_default_template_exists_and_is_registered() { PermissionTemplateDto projectTemplate = db.permissionTemplates().insertTemplate(newPermissionTemplateDto() - .setOrganizationUuid(db.getDefaultOrganization().getUuid()) .setUuid(DEFAULT_TEMPLATE_UUID)); db.organizations().setDefaultTemplates(projectTemplate, null, null); @@ -189,7 +186,7 @@ public class RegisterPermissionTemplatesTest { String expectedGroupName) { assertThat( groupPermissions.stream().anyMatch(gp -> gp.getPermission().equals(expectedPermission) && Objects.equals(gp.getGroupName(), expectedGroupName))) - .isTrue(); + .isTrue(); } private void verifyDefaultTemplates() { diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionChange.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionChange.java index 8fab15c28ab..db6dd0c36e5 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionChange.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionChange.java @@ -44,9 +44,9 @@ public abstract class PermissionChange { this.projectUuid = projectUuid; this.permissionService = permissionService; if (projectUuid == null) { - checkRequest(permissionService.getAllOrganizationPermissions().stream().anyMatch(p -> p.getKey().equals(permission)), + checkRequest(permissionService.getGlobalPermissions().stream().anyMatch(p -> p.getKey().equals(permission)), "Invalid global permission '%s'. Valid values are %s", permission, - permissionService.getAllOrganizationPermissions().stream().map(OrganizationPermission::getKey).collect(toList())); + permissionService.getGlobalPermissions().stream().map(OrganizationPermission::getKey).collect(toList())); } else { checkRequest(permissionService.getAllProjectPermissions().contains(permission), "Invalid project permission '%s'. Valid values are %s", permission, permissionService.getAllProjectPermissions()); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java index d445484df72..cae41108bed 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java @@ -141,7 +141,7 @@ public class PermissionTemplateService { .filter(up -> permissionValidForProject(project, up.getPermission())) .forEach(up -> { UserPermissionDto dto = new UserPermissionDto(uuidFactory.create(), up.getPermission(), userDtoMap.get(up.getUserUuid()), project.uuid()); - dbClient.userPermissionDao().insert(dbSession, dto, defaultOrganizationProvider.get().getUuid()); + dbClient.userPermissionDao().insert(dbSession, dto); }); List groupsPermissions = dbClient.permissionTemplateDao().selectGroupPermissionsByTemplateUuid(dbSession, template.getUuid()); @@ -172,7 +172,7 @@ public class PermissionTemplateService { .filter(characteristic -> !permissionsForCurrentUserAlreadyInDb.contains(characteristic.getPermission())) .forEach(c -> { UserPermissionDto dto = new UserPermissionDto(uuidFactory.create(), c.getPermission(), userDto.getUuid(), project.uuid()); - dbClient.userPermissionDao().insert(dbSession, dto, defaultOrganizationProvider.get().getUuid()); + dbClient.userPermissionDao().insert(dbSession, dto); }); } } @@ -230,7 +230,7 @@ public class PermissionTemplateService { private static void checkAtMostOneMatchForComponentKey(String componentKey, List matchingTemplates) { if (matchingTemplates.size() > 1) { StringBuilder templatesNames = new StringBuilder(); - for (Iterator it = matchingTemplates.iterator(); it.hasNext(); ) { + for (Iterator it = matchingTemplates.iterator(); it.hasNext();) { templatesNames.append("\"").append(it.next().getName()).append("\""); if (it.hasNext()) { templatesNames.append(", "); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChanger.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChanger.java index 3a20ac99524..de6eb0c12b0 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChanger.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChanger.java @@ -24,7 +24,6 @@ import org.sonar.core.util.UuidFactory; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.permission.UserPermissionDto; -import org.sonar.server.organization.DefaultOrganizationProvider; import static org.sonar.api.web.UserRole.PUBLIC_PERMISSIONS; import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; @@ -39,12 +38,10 @@ public class UserPermissionChanger { private final DbClient dbClient; private final UuidFactory uuidFactory; - private final DefaultOrganizationProvider defaultOrganizationProvider; - public UserPermissionChanger(DbClient dbClient, UuidFactory uuidFactory, DefaultOrganizationProvider defaultOrganizationProvider) { + public UserPermissionChanger(DbClient dbClient, UuidFactory uuidFactory) { this.dbClient = dbClient; this.uuidFactory = uuidFactory; - this.defaultOrganizationProvider = defaultOrganizationProvider; } public boolean apply(DbSession dbSession, UserPermissionChange change) { @@ -98,7 +95,7 @@ public class UserPermissionChanger { } UserPermissionDto dto = new UserPermissionDto(uuidFactory.create(), change.getPermission(), change.getUserId().getUuid(), change.getProjectUuid()); - dbClient.userPermissionDao().insert(dbSession, dto, defaultOrganizationProvider.get().getUuid()); + dbClient.userPermissionDao().insert(dbSession, dto); return true; } diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java index 040f55efb20..e77f8629cf8 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java @@ -38,7 +38,6 @@ import org.sonar.server.user.UserSession; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdmin; import static org.sonar.server.permission.ws.WsParameters.createGroupIdParameter; import static org.sonar.server.permission.ws.WsParameters.createGroupNameParameter; -import static org.sonar.server.permission.ws.WsParameters.createOrganizationParameter; import static org.sonar.server.permission.ws.WsParameters.createProjectParameters; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; @@ -81,7 +80,6 @@ public class AddGroupAction implements PermissionsWsAction { .setHandler(this); wsParameters.createPermissionParameter(action, "The permission you would like to grant to the group."); - createOrganizationParameter(action).setSince("6.2"); createGroupNameParameter(action); createGroupIdParameter(action); createProjectParameters(action); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddUserAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddUserAction.java index 9d8c767c944..e0f0b34f2e6 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddUserAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddUserAction.java @@ -37,7 +37,6 @@ import org.sonar.server.user.UserSession; import static java.util.Collections.singletonList; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdmin; -import static org.sonar.server.permission.ws.WsParameters.createOrganizationParameter; import static org.sonar.server.permission.ws.WsParameters.createProjectParameters; import static org.sonar.server.permission.ws.WsParameters.createUserLoginParameter; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; @@ -83,8 +82,6 @@ public class AddUserAction implements PermissionsWsAction { wsParameters.createPermissionParameter(action, "The permission you would like to grant to the user"); createUserLoginParameter(action); createProjectParameters(action); - createOrganizationParameter(action) - .setSince("6.2"); } @Override diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/GroupsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/GroupsAction.java index ffca086b2e2..24d1e64148a 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/GroupsAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/GroupsAction.java @@ -49,7 +49,6 @@ import static org.sonar.db.permission.PermissionQuery.DEFAULT_PAGE_SIZE; import static org.sonar.db.permission.PermissionQuery.RESULTS_MAX_SIZE; import static org.sonar.db.permission.PermissionQuery.SEARCH_QUERY_MIN_LENGTH; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdmin; -import static org.sonar.server.permission.ws.WsParameters.createOrganizationParameter; import static org.sonar.server.permission.ws.WsParameters.createProjectParameters; import static org.sonar.server.ws.WsUtils.writeProtobuf; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; @@ -91,7 +90,6 @@ public class GroupsAction implements PermissionsWsAction { .setDescription("Limit search to group names that contain the supplied string.") .setMinimumLength(SEARCH_QUERY_MIN_LENGTH); - createOrganizationParameter(action).setSince("6.2"); wsParameters.createPermissionParameter(action).setRequired(false); createProjectParameters(action); } @@ -103,7 +101,6 @@ public class GroupsAction implements PermissionsWsAction { checkProjectAdmin(userSession, project); PermissionQuery query = buildPermissionQuery(request, project); - // TODO validatePermission(groupsRequest.getPermission(), wsProjectRef); List groups = findGroups(dbSession, query); int total = dbClient.groupPermissionDao().countGroupsByQuery(dbSession, query); List groupsWithPermission = findGroupPermissions(dbSession, groups, project); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java index c2f23160ae2..735cb6e46a4 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java @@ -24,7 +24,6 @@ import org.sonar.api.server.ws.Request; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.ComponentDto; -import org.sonar.db.organization.OrganizationDto; import org.sonar.db.permission.template.PermissionTemplateDto; import org.sonar.db.user.UserDto; import org.sonar.server.component.ComponentFinder; @@ -36,11 +35,9 @@ import org.sonar.server.usergroups.ws.GroupWsRef; import org.sonar.server.usergroups.ws.GroupWsSupport; import org.sonarqube.ws.client.permission.PermissionsWsParameters; -import static com.google.common.base.Preconditions.checkArgument; import static org.sonar.server.exceptions.NotFoundException.checkFound; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_NAME; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; public class PermissionWsSupport { @@ -75,9 +72,8 @@ public class PermissionWsSupport { public GroupUuidOrAnyone findGroup(DbSession dbSession, Request request) { String groupUuid = request.param(PARAM_GROUP_ID); - String orgKey = request.param(PARAM_ORGANIZATION); String groupName = request.param(PARAM_GROUP_NAME); - GroupWsRef groupRef = GroupWsRef.create(groupUuid, orgKey, groupName); + GroupWsRef groupRef = GroupWsRef.create(groupUuid, null, groupName); return groupWsSupport.findGroupOrAnyone(dbSession, groupRef); } @@ -99,8 +95,4 @@ public class PermissionWsSupport { } } - public void checkMembership(DbSession dbSession, OrganizationDto organization, UserId user) { - checkArgument(dbClient.organizationMemberDao().select(dbSession, organization.getUuid(), user.getUuid()).isPresent(), - "User '%s' is not member of organization '%s'", user.getLogin(), organization.getKey()); - } } diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java index 4a3e4640aa4..efdfe5062de 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java @@ -38,7 +38,6 @@ import static java.util.Arrays.asList; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdmin; import static org.sonar.server.permission.ws.WsParameters.createGroupIdParameter; import static org.sonar.server.permission.ws.WsParameters.createGroupNameParameter; -import static org.sonar.server.permission.ws.WsParameters.createOrganizationParameter; import static org.sonar.server.permission.ws.WsParameters.createProjectParameters; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; @@ -81,7 +80,6 @@ public class RemoveGroupAction implements PermissionsWsAction { .setHandler(this); wsParameters.createPermissionParameter(action, "The permission you would like to revoke from the group."); - createOrganizationParameter(action).setSince("6.2"); createGroupNameParameter(action); createGroupIdParameter(action); createProjectParameters(action); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java index dd8e71df2f7..037f48a30ca 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java @@ -35,7 +35,6 @@ import org.sonar.server.user.UserSession; import static java.util.Collections.singletonList; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdmin; -import static org.sonar.server.permission.ws.WsParameters.createOrganizationParameter; import static org.sonar.server.permission.ws.WsParameters.createProjectParameters; import static org.sonar.server.permission.ws.WsParameters.createUserLoginParameter; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; @@ -79,7 +78,6 @@ public class RemoveUserAction implements PermissionsWsAction { wsParameters.createPermissionParameter(action, "The permission you would like to revoke from the user."); createUserLoginParameter(action); createProjectParameters(action); - createOrganizationParameter(action).setSince("6.2"); } @Override diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java index fabe89817bb..fa40ab81cf8 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java @@ -64,8 +64,6 @@ public class SearchGlobalPermissionsAction implements PermissionsWsAction { .setSince("5.2") .setDeprecatedSince("6.5") .setHandler(this); - - WsParameters.createOrganizationParameter(action).setSince("6.2"); } @Override @@ -82,7 +80,7 @@ public class SearchGlobalPermissionsAction implements PermissionsWsAction { WsSearchGlobalPermissionsResponse.Builder response = WsSearchGlobalPermissionsResponse.newBuilder(); Permission.Builder permission = newBuilder(); - permissionService.getAllOrganizationPermissions().stream() + permissionService.getGlobalPermissions().stream() .map(OrganizationPermission::getKey) .forEach(permissionKey -> { PermissionQuery query = permissionQuery(permissionKey); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/UsersAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/UsersAction.java index 45a2e19c314..6def62e7aec 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/UsersAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/UsersAction.java @@ -51,7 +51,6 @@ import static org.sonar.db.permission.PermissionQuery.RESULTS_MAX_SIZE; import static org.sonar.db.permission.PermissionQuery.SEARCH_QUERY_MIN_LENGTH; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdmin; import static org.sonar.server.permission.RequestValidator.validateGlobalPermission; -import static org.sonar.server.permission.ws.WsParameters.createOrganizationParameter; import static org.sonar.server.permission.ws.WsParameters.createProjectParameters; import static org.sonar.server.ws.WsUtils.writeProtobuf; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; @@ -99,7 +98,6 @@ public class UsersAction implements PermissionsWsAction { .setDescription("Limit search to user names that contain the supplied string.
") .setExampleValue("eri"); - createOrganizationParameter(action).setSince("6.2"); wsParameters.createPermissionParameter(action).setRequired(false); createProjectParameters(action); } diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/WsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/WsParameters.java index 6ec3ce3a7eb..a375041da3d 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/WsParameters.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/WsParameters.java @@ -30,7 +30,6 @@ import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_D import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_NAME; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ID; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_KEY; @@ -49,15 +48,15 @@ public class WsParameters { this.permissionService = permissionService; String allProjectsPermissionsOnOneLine = Joiner.on(", ").join(permissionService.getAllProjectPermissions()); permissionParamDescription = String.format("
    " + - "
  • Possible values for global permissions: %s
    • " + - "
  • Possible values for project permissions %s
    • " + - "
", + "
  • Possible values for global permissions: %s
    • " + + "
  • Possible values for project permissions %s
    • " + + "", GlobalPermissions.ALL_ON_ONE_LINE, allProjectsPermissionsOnOneLine); projectPermissionParamDescription = String.format("Permission" + - "
      " + - "
    • Possible values for project permissions %s
      • " + - "
    ", + "
      " + + "
    • Possible values for project permissions %s
      • " + + "
    ", allProjectsPermissionsOnOneLine); } @@ -88,13 +87,6 @@ public class WsParameters { .setExampleValue("sonar-administrators"); } - public static WebService.NewParam createOrganizationParameter(WebService.NewAction action) { - return action.createParam(PARAM_ORGANIZATION) - .setDescription("Key of organization, used when group name is set") - .setExampleValue("my-org") - .setInternal(true); - } - public static void createGroupIdParameter(WebService.NewAction action) { action.createParam(PARAM_GROUP_ID) .setDescription("Group id, use 'name' param instead") @@ -126,7 +118,6 @@ public class WsParameters { action.createParam(PARAM_TEMPLATE_ID) .setDescription("Template id") .setExampleValue(UUID_EXAMPLE_01); - createOrganizationParameter(action); action.createParam(PARAM_TEMPLATE_NAME) .setDescription("Template name") .setExampleValue("Default Permission Template for Projects"); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java index 40e461776cf..7dab5449a1a 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java @@ -40,7 +40,6 @@ import org.sonar.server.user.UserSession; import static java.util.Objects.requireNonNull; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdmin; import static org.sonar.server.permission.ws.WsParameters.createTemplateParameters; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME; @@ -67,7 +66,6 @@ public class AddProjectCreatorToTemplateAction implements PermissionsWsAction { AddProjectCreatorToTemplateRequest wsRequest = AddProjectCreatorToTemplateRequest.builder() .setPermission(request.mandatoryParam(PARAM_PERMISSION)) .setTemplateId(request.param(PARAM_TEMPLATE_ID)) - .setOrganization(request.param(PARAM_ORGANIZATION)) .setTemplateName(request.param(PARAM_TEMPLATE_NAME)) .build(); requestValidator.validateProjectPermission(wsRequest.getPermission()); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java index d23f8b20dc2..869150df917 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java @@ -40,7 +40,6 @@ import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobal import static org.sonar.server.permission.ws.WsParameters.createTemplateParameters; import static org.sonar.server.permission.ws.WsParameters.createUserLoginParameter; import static org.sonar.server.permission.ws.template.WsTemplateRef.newTemplateRef; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME; @@ -64,7 +63,6 @@ public class AddUserToTemplateAction implements PermissionsWsAction { .setLogin(request.mandatoryParam(PARAM_USER_LOGIN)) .setPermission(request.mandatoryParam(PARAM_PERMISSION)) .setTemplateId(request.param(PARAM_TEMPLATE_ID)) - .setOrganization(request.param(PARAM_ORGANIZATION)) .setTemplateName(request.param(PARAM_TEMPLATE_NAME)); } diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java index c39c6b6b9f6..babe83632ea 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java @@ -56,7 +56,6 @@ import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_001; import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_002; import static org.sonar.server.ws.WsParameterBuilder.createRootQualifiersParameter; import static org.sonar.server.ws.WsParameterBuilder.QualifierParameterContext.newQualifierParameterContext; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_QUALIFIER; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME; @@ -120,7 +119,7 @@ public class BulkApplyTemplateAction implements PermissionsWsAction { action.createParam(PARAM_VISIBILITY) .setDescription("Filter the projects that should be visible to everyone (%s), or only specific user/groups (%s).
    " + - "If no visibility is specified, the default project visibility of the organization will be used.", + "If no visibility is specified, the default project visibility of the organization will be used.", Visibility.PUBLIC.getLabel(), Visibility.PRIVATE.getLabel()) .setRequired(false) .setInternal(true) @@ -161,7 +160,6 @@ public class BulkApplyTemplateAction implements PermissionsWsAction { private static BulkApplyTemplateRequest toBulkApplyTemplateWsRequest(Request request) { return new BulkApplyTemplateRequest() - .setOrganization(request.param(PARAM_ORGANIZATION)) .setTemplateId(request.param(PARAM_TEMPLATE_ID)) .setTemplateName(request.param(PARAM_TEMPLATE_NAME)) .setQualifiers(request.mandatoryParamAsStrings(PARAM_QUALIFIERS)) diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java index f47618589ce..ae66f5e9656 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java @@ -47,7 +47,6 @@ import static org.sonar.server.permission.ws.template.PermissionTemplateDtoToPer import static org.sonar.server.ws.WsUtils.writeProtobuf; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_DESCRIPTION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_NAME; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_KEY_PATTERN; public class CreateTemplateAction implements PermissionsWsAction { @@ -67,8 +66,7 @@ public class CreateTemplateAction implements PermissionsWsAction { return new CreateTemplateRequest() .setName(request.mandatoryParam(PARAM_NAME)) .setDescription(request.param(PARAM_DESCRIPTION)) - .setProjectKeyPattern(request.param(PARAM_PROJECT_KEY_PATTERN)) - .setOrganization(request.param(PARAM_ORGANIZATION)); + .setProjectKeyPattern(request.param(PARAM_PROJECT_KEY_PATTERN)); } private static CreateTemplateWsResponse buildResponse(PermissionTemplateDto permissionTemplateDto) { @@ -93,7 +91,6 @@ public class CreateTemplateAction implements PermissionsWsAction { WsParameters.createTemplateProjectKeyPatternParameter(action); WsParameters.createTemplateDescriptionParameter(action); - WsParameters.createOrganizationParameter(action).setSince("6.2"); } @Override @@ -124,7 +121,6 @@ public class CreateTemplateAction implements PermissionsWsAction { private PermissionTemplateDto insertTemplate(DbSession dbSession, CreateTemplateRequest request) { Date now = new Date(system.now()); PermissionTemplateDto template = dbClient.permissionTemplateDao().insert(dbSession, new PermissionTemplateDto() - .setOrganizationUuid(defaultOrganizationProvider.get().getUuid()) .setUuid(Uuids.create()) .setName(request.getName()) .setDescription(request.getDescription()) diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java index 48384b0c0d8..189dee54538 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java @@ -39,7 +39,6 @@ import org.sonar.server.user.UserSession; import static java.util.Objects.requireNonNull; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdmin; import static org.sonar.server.permission.ws.WsParameters.createTemplateParameters; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME; @@ -66,7 +65,6 @@ public class RemoveProjectCreatorFromTemplateAction implements PermissionsWsActi RemoveProjectCreatorFromTemplateRequest wsRequest = RemoveProjectCreatorFromTemplateRequest.builder() .setPermission(request.mandatoryParam(PARAM_PERMISSION)) .setTemplateId(request.param(PARAM_TEMPLATE_ID)) - .setOrganization(request.param(PARAM_ORGANIZATION)) .setTemplateName(request.param(PARAM_TEMPLATE_NAME)) .build(); requestValidator.validateProjectPermission(wsRequest.getPermission()); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java index 30138acddf7..6ebd6630fa9 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java @@ -38,7 +38,6 @@ import static java.util.Objects.requireNonNull; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdmin; import static org.sonar.server.permission.ws.WsParameters.createTemplateParameters; import static org.sonar.server.permission.ws.WsParameters.createUserLoginParameter; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME; @@ -64,7 +63,6 @@ public class RemoveUserFromTemplateAction implements PermissionsWsAction { .setPermission(request.mandatoryParam(PARAM_PERMISSION)) .setLogin(request.mandatoryParam(PARAM_USER_LOGIN)) .setTemplateId(request.param(PARAM_TEMPLATE_ID)) - .setOrganization(request.param(PARAM_ORGANIZATION)) .setTemplateName(request.param(PARAM_TEMPLATE_NAME)); } diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java index 5ea6d245b0f..1f056a7849d 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java @@ -43,7 +43,6 @@ import org.sonar.server.permission.DefaultTemplatesResolver; import org.sonar.server.permission.DefaultTemplatesResolver.ResolvedDefaultTemplates; import org.sonar.server.permission.PermissionService; import org.sonar.server.permission.ws.PermissionsWsAction; -import org.sonar.server.permission.ws.WsParameters; import org.sonar.server.user.UserSession; import org.sonarqube.ws.Permissions; import org.sonarqube.ws.Permissions.Permission; @@ -88,8 +87,6 @@ public class SearchTemplatesAction implements PermissionsWsAction { .setSince("5.2") .addSearchQuery("defau", "permission template names") .setHandler(this); - - WsParameters.createOrganizationParameter(action).setSince("6.2"); } @Override diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java index 1cc3f6ceba6..35407297c16 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java @@ -42,9 +42,8 @@ import org.sonar.server.user.UserSession; import static org.sonar.server.exceptions.NotFoundException.checkFoundWithOptional; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdmin; import static org.sonar.server.permission.ws.template.WsTemplateRef.newTemplateRef; -import static org.sonar.server.ws.WsParameterBuilder.QualifierParameterContext.newQualifierParameterContext; import static org.sonar.server.ws.WsParameterBuilder.createDefaultTemplateQualifierParameter; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; +import static org.sonar.server.ws.WsParameterBuilder.QualifierParameterContext.newQualifierParameterContext; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_QUALIFIER; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME; @@ -71,7 +70,6 @@ public class SetDefaultTemplateAction implements PermissionsWsAction { return new SetDefaultTemplateRequest() .setQualifier(request.param(PARAM_QUALIFIER)) .setTemplateId(request.param(PARAM_TEMPLATE_ID)) - .setOrganization(request.param(PARAM_ORGANIZATION)) .setTemplateName(request.param(PARAM_TEMPLATE_NAME)); } diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java index ac54a067ec3..4496bdec69b 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java @@ -39,7 +39,6 @@ import org.sonar.db.permission.UserPermissionDto; import org.sonar.server.component.ComponentFinder; import org.sonar.server.es.ProjectIndexer; import org.sonar.server.es.ProjectIndexers; -import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.project.Visibility; import org.sonar.server.user.UserSession; import org.sonarqube.ws.client.project.ProjectsWsParameters; @@ -61,17 +60,15 @@ public class UpdateVisibilityAction implements ProjectsWsAction { private final ProjectIndexers projectIndexers; private final ProjectsWsSupport projectsWsSupport; private final UuidFactory uuidFactory; - private final DefaultOrganizationProvider defaultOrganizationProvider; public UpdateVisibilityAction(DbClient dbClient, ComponentFinder componentFinder, UserSession userSession, - ProjectIndexers projectIndexers, ProjectsWsSupport projectsWsSupport, UuidFactory uuidFactory, DefaultOrganizationProvider defaultOrganizationProvider) { + ProjectIndexers projectIndexers, ProjectsWsSupport projectsWsSupport, UuidFactory uuidFactory) { this.dbClient = dbClient; this.componentFinder = componentFinder; this.userSession = userSession; this.projectIndexers = projectIndexers; this.projectsWsSupport = projectsWsSupport; this.uuidFactory = uuidFactory; - this.defaultOrganizationProvider = defaultOrganizationProvider; } public void define(WebService.NewController context) { @@ -155,7 +152,7 @@ public class UpdateVisibilityAction implements ProjectsWsAction { } private void insertProjectPermissionOnUser(DbSession dbSession, ComponentDto component, String permission, String userUuid) { - dbClient.userPermissionDao().insert(dbSession, new UserPermissionDto(Uuids.create(), permission, userUuid, component.uuid()), defaultOrganizationProvider.get().getUuid()); + dbClient.userPermissionDao().insert(dbSession, new UserPermissionDto(Uuids.create(), permission, userUuid, component.uuid())); } private void insertProjectPermissionOnGroup(DbSession dbSession, ComponentDto component, String permission, String groupUuid) { diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/CurrentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/CurrentAction.java index 29dae521f9d..00efadbc94b 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/CurrentAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/CurrentAction.java @@ -133,7 +133,7 @@ public class CurrentAction implements UsersWsAction { private List getGlobalPermissions() { String defaultOrganizationUuid = defaultOrganizationProvider.get().getUuid(); - return permissionService.getAllOrganizationPermissions().stream() + return permissionService.getGlobalPermissions().stream() .filter(permission -> userSession.hasPermission(permission)) .map(OrganizationPermission::getKey) .collect(toList()); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/DeactivateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/DeactivateAction.java index 62c5d2f1b01..57db06a7ce0 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/DeactivateAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/DeactivateAction.java @@ -20,9 +20,7 @@ package org.sonar.server.user.ws; import java.util.HashSet; -import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; @@ -30,18 +28,14 @@ import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.utils.text.JsonWriter; import org.sonar.db.DbClient; import org.sonar.db.DbSession; -import org.sonar.db.organization.OrganizationDto; -import org.sonar.db.organization.OrganizationHelper; import org.sonar.db.property.PropertyQuery; import org.sonar.db.user.UserDto; -import org.sonar.server.exceptions.BadRequestException; -import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.user.UserSession; import org.sonar.server.user.index.UserIndexer; -import static java.lang.String.format; import static java.util.Collections.singletonList; import static org.sonar.api.CoreProperties.DEFAULT_ISSUE_ASSIGNEE; +import static org.sonar.db.permission.OrganizationPermission.ADMINISTER; import static org.sonar.server.exceptions.BadRequestException.checkRequest; import static org.sonar.server.exceptions.NotFoundException.checkFound; @@ -53,15 +47,12 @@ public class DeactivateAction implements UsersWsAction { private final UserIndexer userIndexer; private final UserSession userSession; private final UserJsonWriter userWriter; - private final DefaultOrganizationProvider defaultOrganizationProvider; - public DeactivateAction(DbClient dbClient, UserIndexer userIndexer, UserSession userSession, UserJsonWriter userWriter, - DefaultOrganizationProvider defaultOrganizationProvider) { + public DeactivateAction(DbClient dbClient, UserIndexer userIndexer, UserSession userSession, UserJsonWriter userWriter) { this.dbClient = dbClient; this.userIndexer = userIndexer; this.userSession = userSession; this.userWriter = userWriter; - this.defaultOrganizationProvider = defaultOrganizationProvider; } @Override @@ -131,19 +122,8 @@ public class DeactivateAction implements UsersWsAction { } private void ensureNotLastAdministrator(DbSession dbSession, UserDto user) { - //TODO can this be removed? - List problematicOrgs = new OrganizationHelper(dbClient).selectOrganizationsWithLastAdmin(dbSession, user.getUuid()); - if (problematicOrgs.isEmpty()) { - return; - } - checkRequest(problematicOrgs.size() != 1 || !defaultOrganizationProvider.get().getUuid().equals(problematicOrgs.get(0).getUuid()), - "User is last administrator, and cannot be deactivated"); - String keys = problematicOrgs - .stream() - .map(OrganizationDto::getKey) - .sorted() - .collect(Collectors.joining(", ")); - throw BadRequestException.create(format("User '%s' is last administrator of organizations [%s], and cannot be deactivated", user.getLogin(), keys)); + boolean isLastAdmin = dbClient.authorizationDao().countUsersWithGlobalPermissionExcludingUser(dbSession, ADMINISTER.getKey(), user.getUuid()) == 0; + checkRequest(!isLastAdmin, "User is last administrator, and cannot be deactivated"); } } diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java index f6968a37568..c8573b46936 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java @@ -34,7 +34,6 @@ import org.sonar.core.util.Uuids; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ResourceTypesRule; -import org.sonar.db.organization.OrganizationDto; import org.sonar.db.permission.GroupPermissionDto; import org.sonar.db.permission.OrganizationPermission; import org.sonar.db.user.GroupDto; @@ -57,21 +56,19 @@ public class GroupPermissionChangerTest { private ResourceTypes resourceTypes = new ResourceTypesRule().setRootQualifiers(Qualifiers.PROJECT); private PermissionService permissionService = new PermissionServiceImpl(resourceTypes); private GroupPermissionChanger underTest = new GroupPermissionChanger(db.getDbClient(), new SequenceUuidFactory()); - private OrganizationDto org; private GroupDto group; private ComponentDto privateProject; private ComponentDto publicProject; @Before public void setUp() { - org = db.organizations().insert(); group = db.users().insertGroup("a-group"); - privateProject = db.components().insertPrivateProject(org); - publicProject = db.components().insertPublicProject(org); + privateProject = db.components().insertPrivateProject(); + publicProject = db.components().insertPublicProject(); } @Test - public void apply_adds_organization_permission_to_group() { + public void apply_adds_global_permission_to_group() { GroupUuidOrAnyone groupUuid = GroupUuidOrAnyone.from(group); apply(new GroupPermissionChange(PermissionChange.Operation.ADD, GlobalPermissions.QUALITY_GATE_ADMIN, null, groupUuid, permissionService)); @@ -80,7 +77,7 @@ public class GroupPermissionChangerTest { } @Test - public void apply_adds_organization_permission_to_group_AnyOne() { + public void apply_adds_global_permission_to_group_AnyOne() { GroupUuidOrAnyone groupUuid = GroupUuidOrAnyone.forAnyone(); apply(new GroupPermissionChange(PermissionChange.Operation.ADD, GlobalPermissions.QUALITY_GATE_ADMIN, null, groupUuid, permissionService)); @@ -318,7 +315,7 @@ public class GroupPermissionChangerTest { public void fail_to_add_global_permission_but_SCAN_and_ADMIN_on_private_project() { GroupUuidOrAnyone groupUuid = GroupUuidOrAnyone.from(group); - permissionService.getAllOrganizationPermissions().stream() + permissionService.getGlobalPermissions().stream() .map(OrganizationPermission::getKey) .filter(perm -> !UserRole.ADMIN.equals(perm) && !GlobalPermissions.SCAN_EXECUTION.equals(perm)) .forEach(perm -> { @@ -336,7 +333,7 @@ public class GroupPermissionChangerTest { public void fail_to_add_global_permission_but_SCAN_and_ADMIN_on_public_project() { GroupUuidOrAnyone groupUuid = GroupUuidOrAnyone.from(group); - permissionService.getAllOrganizationPermissions().stream() + permissionService.getGlobalPermissions().stream() .map(OrganizationPermission::getKey) .filter(perm -> !UserRole.ADMIN.equals(perm) && !GlobalPermissions.SCAN_EXECUTION.equals(perm)) .forEach(perm -> { diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java index 55a66dc3a4a..56100e16906 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java @@ -35,7 +35,6 @@ import org.sonar.db.permission.OrganizationPermission; import org.sonar.db.user.GroupDto; import org.sonar.db.user.UserDto; import org.sonar.server.exceptions.BadRequestException; -import org.sonar.server.organization.TestDefaultOrganizationProvider; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.web.UserRole.ADMIN; @@ -60,7 +59,7 @@ public class UserPermissionChangerTest { private ResourceTypes resourceTypes = new ResourceTypesRule().setRootQualifiers(Qualifiers.PROJECT); private PermissionService permissionService = new PermissionServiceImpl(resourceTypes); - private UserPermissionChanger underTest = new UserPermissionChanger(db.getDbClient(), new SequenceUuidFactory(), TestDefaultOrganizationProvider.from(db)); + private UserPermissionChanger underTest = new UserPermissionChanger(db.getDbClient(), new SequenceUuidFactory()); private UserDto user1; private UserDto user2; private ComponentDto privateProject; @@ -75,8 +74,8 @@ public class UserPermissionChangerTest { } @Test - public void apply_adds_any_organization_permission_to_user() { - permissionService.getAllOrganizationPermissions().stream() + public void apply_adds_any_global_permission_to_user() { + permissionService.getGlobalPermissions().stream() .forEach(perm -> { UserPermissionChange change = new UserPermissionChange(ADD, perm.getKey(), null, UserId.from(user1), permissionService); @@ -90,12 +89,12 @@ public class UserPermissionChangerTest { public void apply_removes_any_organization_permission_to_user() { // give ADMIN perm to user2 so that user1 is not the only one with this permission and it can be removed from user1 db.users().insertPermissionOnUser(user2, OrganizationPermission.ADMINISTER); - permissionService.getAllOrganizationPermissions().stream() + permissionService.getGlobalPermissions().stream() .forEach(perm -> db.users().insertPermissionOnUser(user1, perm)); assertThat(db.users().selectPermissionsOfUser(user1)) - .containsOnly(permissionService.getAllOrganizationPermissions().toArray(new OrganizationPermission[0])); + .containsOnly(permissionService.getGlobalPermissions().toArray(new OrganizationPermission[0])); - permissionService.getAllOrganizationPermissions().stream() + permissionService.getGlobalPermissions().stream() .forEach(perm -> { UserPermissionChange change = new UserPermissionChange(REMOVE, perm.getKey(), null, UserId.from(user1), permissionService); diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java index 00ff421a1d2..a94d2248a65 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java @@ -28,7 +28,6 @@ import org.sonar.api.web.UserRole; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; import org.sonar.db.component.ResourceTypesRule; -import org.sonar.db.organization.OrganizationDto; import org.sonar.db.user.GroupDto; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; @@ -51,7 +50,6 @@ import static org.sonar.db.component.ComponentTesting.newFileDto; import static org.sonar.db.component.ComponentTesting.newModuleDto; import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; import static org.sonar.db.component.ComponentTesting.newSubView; -import static org.sonar.db.component.ComponentTesting.newView; import static org.sonar.db.permission.OrganizationPermission.SCAN; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_NAME; @@ -98,7 +96,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void reference_group_by_its_name_in_organization() { + public void reference_group_by_its_name() { GroupDto group = db.users().insertGroup("the-group"); loginAsAdmin(); @@ -156,20 +154,19 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void add_with_view_uuid() { - OrganizationDto organizationDto = db.getDefaultOrganization(); + public void add_with_portfolio_uuid() { GroupDto group = db.users().insertGroup("sonar-administrators"); - ComponentDto view = db.components().insertComponent(newView(organizationDto, "view-uuid").setDbKey("view-key")); + ComponentDto portfolio = db.components().insertPrivatePortfolio(); loginAsAdmin(); newRequest() .setParam(PARAM_GROUP_NAME, group.getName()) - .setParam(PARAM_PROJECT_ID, view.uuid()) + .setParam(PARAM_PROJECT_ID, portfolio.uuid()) .setParam(PARAM_PERMISSION, SYSTEM_ADMIN) .execute(); assertThat(db.users().selectGroupPermissions(group, null)).isEmpty(); - assertThat(db.users().selectGroupPermissions(group, view)).containsOnly(SYSTEM_ADMIN); + assertThat(db.users().selectGroupPermissions(group, portfolio)).containsOnly(SYSTEM_ADMIN); } @Test @@ -187,28 +184,32 @@ public class AddGroupActionTest extends BasePermissionWsTest { @Test public void fail_when_component_is_a_module() { - ComponentDto module = db.components().insertComponent(newModuleDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()))); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto module = db.components().insertComponent(newModuleDto(project)); failIfComponentIsNotAProjectOrView(module); } @Test public void fail_when_component_is_a_directory() { - ComponentDto file = db.components().insertComponent(newDirectory(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), "A/B")); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto file = db.components().insertComponent(newDirectory(project, "A/B")); failIfComponentIsNotAProjectOrView(file); } @Test public void fail_when_component_is_a_file() { - ComponentDto file = db.components().insertComponent(newFileDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), null, "file-uuid")); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto file = db.components().insertComponent(newFileDto(project, null, "file-uuid")); failIfComponentIsNotAProjectOrView(file); } @Test public void fail_when_component_is_a_subview() { - ComponentDto file = db.components().insertComponent(newSubView(ComponentTesting.newView(db.organizations().insert()))); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto file = db.components().insertComponent(newSubView(project)); failIfComponentIsNotAProjectOrView(file); } @@ -239,9 +240,8 @@ public class AddGroupActionTest extends BasePermissionWsTest { @Test public void adding_a_project_permission_fails_if_component_is_not_a_project() { - OrganizationDto organizationDto = db.getDefaultOrganization(); GroupDto group = db.users().insertGroup("sonar-administrators"); - ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, A_PROJECT_UUID).setDbKey(A_PROJECT_KEY)); + ComponentDto project = db.components().insertPrivateProject(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project, null, "file-uuid")); loginAsAdmin(); @@ -292,7 +292,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void fail_if_not_administrator_of_organization() { + public void fail_if_not_global_administrator() { GroupDto group = db.users().insertGroup(); loginAsAdmin(); @@ -306,7 +306,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { @Test public void fail_when_project_uuid_and_project_key_are_provided() { GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert())); + ComponentDto project = db.components().insertPrivateProject(); loginAsAdmin(); expectedException.expect(BadRequestException.class); @@ -388,8 +388,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { @Test public void no_effect_when_adding_USER_permission_to_group_AnyOne_on_a_public_project() { - OrganizationDto organization = db.organizations().insert(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -403,8 +402,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { @Test public void no_effect_when_adding_CODEVIEWER_permission_to_group_AnyOne_on_a_public_project() { - OrganizationDto organization = db.organizations().insert(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -418,9 +416,8 @@ public class AddGroupActionTest extends BasePermissionWsTest { @Test public void no_effect_when_adding_USER_permission_to_group_on_a_public_project() { - OrganizationDto organization = db.organizations().insert(); GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -434,9 +431,8 @@ public class AddGroupActionTest extends BasePermissionWsTest { @Test public void no_effect_when_adding_CODEVIEWER_permission_to_group_on_a_public_project() { - OrganizationDto organization = db.organizations().insert(); GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -450,9 +446,8 @@ public class AddGroupActionTest extends BasePermissionWsTest { @Test public void fail_when_using_branch_db_key() { - OrganizationDto organization = db.organizations().insert(); GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -468,9 +463,8 @@ public class AddGroupActionTest extends BasePermissionWsTest { @Test public void fail_when_using_branch_uuid() { - OrganizationDto organization = db.organizations().insert(); GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java index 2c40e685cf1..436a0f5c130 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java @@ -25,9 +25,7 @@ import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.ResourceTypes; import org.sonar.api.web.UserRole; import org.sonar.db.component.ComponentDto; -import org.sonar.db.component.ComponentTesting; import org.sonar.db.component.ResourceTypesRule; -import org.sonar.db.organization.OrganizationDto; import org.sonar.db.user.UserDto; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; @@ -45,11 +43,9 @@ import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; import static org.sonar.db.component.ComponentTesting.newDirectory; import static org.sonar.db.component.ComponentTesting.newFileDto; import static org.sonar.db.component.ComponentTesting.newModuleDto; -import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; import static org.sonar.db.component.ComponentTesting.newSubView; import static org.sonar.db.component.ComponentTesting.newView; import static org.sonar.db.permission.OrganizationPermission.ADMINISTER; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_KEY; @@ -65,7 +61,6 @@ public class AddUserActionTest extends BasePermissionWsTest { @Before public void setUp() { user = db.users().insertUser("ray.bradbury"); - db.organizations().addMember(db.getDefaultOrganization(), user); } @Override @@ -145,28 +140,32 @@ public class AddUserActionTest extends BasePermissionWsTest { @Test public void fail_when_component_is_a_module() { - ComponentDto module = db.components().insertComponent(newModuleDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()))); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto module = db.components().insertComponent(newModuleDto(project)); failIfComponentIsNotAProjectOrView(module); } @Test public void fail_when_component_is_a_directory() { - ComponentDto file = db.components().insertComponent(newDirectory(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), "A/B")); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto file = db.components().insertComponent(newDirectory(project, "A/B")); failIfComponentIsNotAProjectOrView(file); } @Test public void fail_when_component_is_a_file() { - ComponentDto file = db.components().insertComponent(newFileDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), null, "file-uuid")); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto file = db.components().insertComponent(newFileDto(project, null, "file-uuid")); failIfComponentIsNotAProjectOrView(file); } @Test public void fail_when_component_is_a_subview() { - ComponentDto file = db.components().insertComponent(newSubView(ComponentTesting.newView(db.organizations().insert()))); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto file = db.components().insertComponent(newSubView(project)); failIfComponentIsNotAProjectOrView(file); } @@ -198,7 +197,8 @@ public class AddUserActionTest extends BasePermissionWsTest { @Test public void fail_when_component_is_not_a_project() { - db.components().insertComponent(newFileDto(newPrivateProjectDto(db.organizations().insert(), "project-uuid"), null, "file-uuid")); + ComponentDto project = db.components().insertPrivateProject(); + db.components().insertComponent(newFileDto(project, null, "file-uuid")); loginAsAdmin(); expectedException.expect(BadRequestException.class); @@ -262,7 +262,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void adding_global_permission_fails_if_not_administrator_of_organization() { + public void adding_global_permission_fails_if_not_system_administrator() { userSession.logIn(); expectedException.expect(ForbiddenException.class); @@ -351,8 +351,7 @@ public class AddUserActionTest extends BasePermissionWsTest { @Test public void fail_when_using_branch_uuid() { - OrganizationDto organization = db.organizations().insert(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -360,7 +359,6 @@ public class AddUserActionTest extends BasePermissionWsTest { expectedException.expectMessage(format("Project id '%s' not found", branch.uuid())); newRequest() - .setParam(PARAM_ORGANIZATION, organization.getKey()) .setParam(PARAM_PROJECT_ID, branch.uuid()) .setParam(PARAM_USER_LOGIN, user.getLogin()) .setParam(PARAM_PERMISSION, SYSTEM_ADMIN) diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java index 9440ddca004..588fab45048 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java @@ -85,7 +85,7 @@ public abstract class BasePermissionWsTest { protected PermissionUpdater newPermissionUpdater() { return new PermissionUpdater( new ProjectIndexersImpl(new PermissionIndexer(db.getDbClient(), es.client())), - new UserPermissionChanger(db.getDbClient(), new SequenceUuidFactory(), defaultOrganizationProvider), + new UserPermissionChanger(db.getDbClient(), new SequenceUuidFactory()), new GroupPermissionChanger(db.getDbClient(), new SequenceUuidFactory())); } @@ -103,7 +103,6 @@ public abstract class BasePermissionWsTest { protected PermissionTemplateDto addTemplate() { PermissionTemplateDto dto = newPermissionTemplateDto(); - dto.setOrganizationUuid(db.getDefaultOrganization().getUuid()); db.getDbClient().permissionTemplateDao().insert(db.getSession(), dto); db.commit(); return dto; diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java index 70f085484ba..6ebcbe04037 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java @@ -27,9 +27,7 @@ import org.sonar.api.security.DefaultGroups; import org.sonar.api.server.ws.Change; import org.sonar.api.server.ws.WebService.Action; import org.sonar.db.component.ComponentDto; -import org.sonar.db.component.ComponentTesting; import org.sonar.db.component.ResourceTypesRule; -import org.sonar.db.organization.OrganizationDto; import org.sonar.db.user.GroupDto; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; @@ -178,12 +176,11 @@ public class GroupsActionTest extends BasePermissionWsTest { @Test public void search_groups_with_project_permissions() { - OrganizationDto organizationDto = db.getDefaultOrganization(); - ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "project-uuid")); + ComponentDto project = db.components().insertPrivateProject(); GroupDto group = db.users().insertGroup("project-group-name"); db.users().insertProjectPermissionOnGroup(group, ISSUE_ADMIN, project); - ComponentDto anotherProject = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(organizationDto)); + ComponentDto anotherProject = db.components().insertPrivateProject(); GroupDto anotherGroup = db.users().insertGroup("another-project-group-name"); db.users().insertProjectPermissionOnGroup(anotherGroup, ISSUE_ADMIN, anotherProject); @@ -192,7 +189,7 @@ public class GroupsActionTest extends BasePermissionWsTest { userSession.logIn().addProjectPermission(ADMIN, project); String result = newRequest() .setParam(PARAM_PERMISSION, ISSUE_ADMIN) - .setParam(PARAM_PROJECT_ID, "project-uuid") + .setParam(PARAM_PROJECT_ID, project.uuid()) .execute() .getInput(); @@ -203,8 +200,7 @@ public class GroupsActionTest extends BasePermissionWsTest { @Test public void return_also_groups_without_permission_when_search_query() { - OrganizationDto organizationDto = db.getDefaultOrganization(); - ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "project-uuid")); + ComponentDto project = db.components().insertPrivateProject(); GroupDto group = db.users().insertGroup("group-with-permission"); db.users().insertProjectPermissionOnGroup(group, ISSUE_ADMIN, project); @@ -214,7 +210,7 @@ public class GroupsActionTest extends BasePermissionWsTest { loginAsAdmin(); String result = newRequest() .setParam(PARAM_PERMISSION, ISSUE_ADMIN) - .setParam(PARAM_PROJECT_ID, "project-uuid") + .setParam(PARAM_PROJECT_ID, project.uuid()) .setParam(TEXT_QUERY, "group-with") .execute() .getInput(); @@ -245,8 +241,7 @@ public class GroupsActionTest extends BasePermissionWsTest { @Test public void return_anyone_group_when_search_query_and_no_param_permission() { - OrganizationDto organizationDto = db.organizations().insert(); - ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "project-uuid")); + ComponentDto project = db.components().insertPrivateProject(); GroupDto group = db.users().insertGroup("group-with-permission"); db.users().insertProjectPermissionOnGroup(group, ISSUE_ADMIN, project); @@ -301,15 +296,15 @@ public class GroupsActionTest extends BasePermissionWsTest { @Test public void fail_if_project_uuid_and_project_key_are_provided() { - db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), "project-uuid").setDbKey("project-key")); + ComponentDto project = db.components().insertPrivateProject(); expectedException.expect(BadRequestException.class); loginAsAdmin(); newRequest() .setParam(PARAM_PERMISSION, SCAN_EXECUTION) - .setParam(PARAM_PROJECT_ID, "project-uuid") - .setParam(PARAM_PROJECT_KEY, "project-key") + .setParam(PARAM_PROJECT_ID, project.uuid()) + .setParam(PARAM_PROJECT_KEY, project.getKey()) .execute(); } diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java index ba566bcaada..692e35080c2 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java @@ -28,9 +28,7 @@ import org.sonar.api.server.ws.WebService.Action; import org.sonar.api.web.UserRole; import org.sonar.core.util.Uuids; import org.sonar.db.component.ComponentDto; -import org.sonar.db.component.ComponentTesting; import org.sonar.db.component.ResourceTypesRule; -import org.sonar.db.organization.OrganizationDto; import org.sonar.db.permission.GroupPermissionDto; import org.sonar.db.user.GroupDto; import org.sonar.server.exceptions.BadRequestException; @@ -56,7 +54,6 @@ import static org.sonar.db.permission.OrganizationPermission.ADMINISTER; import static org.sonar.db.permission.OrganizationPermission.PROVISION_PROJECTS; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_NAME; -import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_ID; import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_KEY; @@ -209,28 +206,32 @@ public class RemoveGroupActionTest extends BasePermissionWsTest @Test public void remove_permission_from_project() { - ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), A_PROJECT_UUID).setDbKey(A_PROJECT_KEY)); + ComponentDto project = db.components().insertPrivateProject(); db.users().insertProjectPermissionOnUser(user, CODEVIEWER, project); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); loginAsAdmin(); @@ -127,7 +122,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest @Test public void remove_with_project_key() { - ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), A_PROJECT_UUID).setDbKey(A_PROJECT_KEY)); + ComponentDto project = db.components().insertPrivateProject(); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); db.users().insertProjectPermissionOnUser(user, CODEVIEWER, project); loginAsAdmin(); @@ -143,7 +138,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest @Test public void remove_with_view_uuid() { - ComponentDto view = db.components().insertComponent(newView(db.organizations().insert(), "view-uuid").setDbKey("view-key")); + ComponentDto view = db.components().insertView(); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, view); db.users().insertProjectPermissionOnUser(user, ADMIN, view); loginAsAdmin(); @@ -184,28 +179,32 @@ public class RemoveUserActionTest extends BasePermissionWsTest @Test public void fail_when_component_is_a_module() { - ComponentDto module = db.components().insertComponent(newModuleDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()))); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto module = db.components().insertComponent(newModuleDto(project)); failIfComponentIsNotAProjectOrView(module); } @Test public void fail_when_component_is_a_directory() { - ComponentDto file = db.components().insertComponent(newDirectory(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), "A/B")); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto file = db.components().insertComponent(newDirectory(project, "A/B")); failIfComponentIsNotAProjectOrView(file); } @Test public void fail_when_component_is_a_file() { - ComponentDto file = db.components().insertComponent(newFileDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), null, "file-uuid")); + ComponentDto project = db.components().insertPrivateProject(); + ComponentDto file = db.components().insertComponent(newFileDto(project, null, "file-uuid")); failIfComponentIsNotAProjectOrView(file); } @Test public void fail_when_component_is_a_subview() { - ComponentDto file = db.components().insertComponent(newSubView(ComponentTesting.newView(db.organizations().insert()))); + ComponentDto portfolio = db.components().insertPrivatePortfolio(); + ComponentDto file = db.components().insertComponent(newSubView(portfolio)); failIfComponentIsNotAProjectOrView(file); } @@ -260,7 +259,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest @Test public void fail_when_project_uuid_and_project_key_are_provided() { - ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), A_PROJECT_UUID).setDbKey(A_PROJECT_KEY)); + ComponentDto project = db.components().insertPrivateProject(); loginAsAdmin(); expectedException.expect(BadRequestException.class); @@ -275,7 +274,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void removing_global_permission_fails_if_not_administrator_of_organization() { + public void removing_global_permission_fails_if_not_system_administrator() { userSession.logIn(); expectedException.expect(ForbiddenException.class); @@ -321,8 +320,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest @Test public void fail_when_removing_USER_permission_on_a_public_project() { - OrganizationDto organization = db.organizations().insert(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); expectedException.expect(BadRequestException.class); @@ -337,8 +335,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest @Test public void fail_when_removing_CODEVIEWER_permission_on_a_public_project() { - OrganizationDto organization = db.organizations().insert(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); expectedException.expect(BadRequestException.class); @@ -353,8 +350,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest @Test public void fail_when_using_branch_db_key() { - OrganizationDto organization = db.organizations().insert(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -362,7 +358,6 @@ public class RemoveUserActionTest extends BasePermissionWsTest expectedException.expectMessage(format("Project key '%s' not found", branch.getDbKey())); newRequest() - .setParam(PARAM_ORGANIZATION, organization.getKey()) .setParam(PARAM_PROJECT_KEY, branch.getDbKey()) .setParam(PARAM_USER_LOGIN, user.getLogin()) .setParam(PARAM_PERMISSION, SYSTEM_ADMIN) @@ -371,8 +366,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest @Test public void fail_when_using_branch_uuid() { - OrganizationDto organization = db.organizations().insert(); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -380,7 +374,6 @@ public class RemoveUserActionTest extends BasePermissionWsTest expectedException.expectMessage(format("Project id '%s' not found", branch.uuid())); newRequest() - .setParam(PARAM_ORGANIZATION, organization.getKey()) .setParam(PARAM_PROJECT_ID, branch.uuid()) .setParam(PARAM_USER_LOGIN, user.getLogin()) .setParam(PARAM_PERMISSION, SYSTEM_ADMIN) diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java index ea0d5b814ed..82832d8f0a1 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java @@ -19,6 +19,7 @@ */ package org.sonar.server.permission.ws; +import java.util.stream.IntStream; import org.junit.Before; import org.junit.Test; import org.sonar.api.resources.Qualifiers; @@ -28,7 +29,6 @@ import org.sonar.db.component.ComponentDbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; import org.sonar.db.component.ResourceTypesRule; -import org.sonar.db.organization.OrganizationDto; import org.sonar.db.user.GroupDto; import org.sonar.db.user.UserDto; import org.sonar.server.exceptions.ForbiddenException; @@ -188,11 +188,7 @@ public class SearchProjectPermissionsActionTest extends BasePermissionWsTest= 1; i--) { - db.components().insertComponent(ComponentTesting.newPrivateProjectDto(organizationDto) - .setName("project-name-" + i)); - } + IntStream.rangeClosed(1, 9).forEach(i -> db.components().insertPrivateProject(p -> p.setName("project-name-" + i))); String result = newRequest() .setParam(PAGE, "1") @@ -206,8 +202,8 @@ public class SearchProjectPermissionsActionTest extends BasePermissionWsTest p.setName("project-name")); + db.components().insertPrivateProject(p -> p.setName("another-name")); String result = newRequest() .setParam(TEXT_QUERY, "project") @@ -219,9 +215,8 @@ public class SearchProjectPermissionsActionTest extends BasePermissionWsTest p.setDbKey("project-key")); + db.components().insertPrivateProject(p -> p.setDbKey("another-key")); String result = newRequest() .setParam(TEXT_QUERY, "project-key") @@ -234,9 +229,9 @@ public class SearchProjectPermissionsActionTest extends BasePermissionWsTest { + db.components().insertPrivateProject("project-uuid-" + i); + }); String result = newRequest() .setParam(TEXT_QUERY, "project") @@ -249,9 +244,8 @@ public class SearchProjectPermissionsActionTest extends BasePermissionWsTest { @Test public void search_for_users_with_response_example() { UserDto user1 = db.users().insertUser(newUserDto().setLogin("admin").setName("Administrator").setEmail("admin@admin.com")); - db.organizations().addMember(db.getDefaultOrganization(), user1); UserDto user2 = db.users().insertUser(newUserDto().setLogin("adam.west").setName("Adam West").setEmail("adamwest@adamwest.com")); - db.organizations().addMember(db.getDefaultOrganization(), user2); UserDto user3 = db.users().insertUser(newUserDto().setLogin("george.orwell").setName("George Orwell").setEmail("george.orwell@1984.net")); - db.organizations().addMember(db.getDefaultOrganization(), user3); db.users().insertPermissionOnUser(user1, ADMINISTER_QUALITY_PROFILES); db.users().insertPermissionOnUser(user1, ADMINISTER); db.users().insertPermissionOnUser(user1, ADMINISTER_QUALITY_GATES); @@ -105,20 +98,17 @@ public class UsersActionTest extends BasePermissionWsTest { @Test public void search_for_users_with_permission_on_project() { // User has permission on project - ComponentDto project = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization())); + ComponentDto project = db.components().insertPrivateProject(); UserDto user = db.users().insertUser(newUserDto()); - db.organizations().addMember(db.getDefaultOrganization(), user); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); // User has permission on another project - ComponentDto anotherProject = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization())); + ComponentDto anotherProject = db.components().insertPrivateProject(); UserDto userHavePermissionOnAnotherProject = db.users().insertUser(newUserDto()); - db.organizations().addMember(db.getDefaultOrganization(), userHavePermissionOnAnotherProject); db.users().insertProjectPermissionOnUser(userHavePermissionOnAnotherProject, ISSUE_ADMIN, anotherProject); // User has no permission UserDto withoutPermission = db.users().insertUser(newUserDto()); - db.organizations().addMember(db.getDefaultOrganization(), withoutPermission); userSession.logIn().addProjectPermission(SYSTEM_ADMIN, project); String result = newRequest() @@ -135,16 +125,13 @@ public class UsersActionTest extends BasePermissionWsTest { @Test public void search_also_for_users_without_permission_when_filtering_name() { // User with permission on project - ComponentDto project = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert())); + ComponentDto project = db.components().insertPrivateProject(); UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email")); - db.organizations().addMember(db.getDefaultOrganization(), user); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); // User without permission UserDto withoutPermission = db.users().insertUser(newUserDto("without-permission-login", "without-permission-name", "without-permission-email")); - db.organizations().addMember(db.getDefaultOrganization(), withoutPermission); UserDto anotherUser = db.users().insertUser(newUserDto("another-user", "another-user", "another-user")); - db.organizations().addMember(db.getDefaultOrganization(), anotherUser); loginAsAdmin(); String result = newRequest() @@ -159,16 +146,13 @@ public class UsersActionTest extends BasePermissionWsTest { @Test public void search_also_for_users_without_permission_when_filtering_email() { // User with permission on project - ComponentDto project = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert())); + ComponentDto project = db.components().insertPrivateProject(); UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email")); - db.organizations().addMember(db.getDefaultOrganization(), user); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); // User without permission UserDto withoutPermission = db.users().insertUser(newUserDto("without-permission-login", "without-permission-name", "without-permission-email")); - db.organizations().addMember(db.getDefaultOrganization(), withoutPermission); UserDto anotherUser = db.users().insertUser(newUserDto("another-user", "another-user", "another-user")); - db.organizations().addMember(db.getDefaultOrganization(), anotherUser); loginAsAdmin(); String result = newRequest().setParam(PARAM_PROJECT_ID, project.uuid()).setParam(TEXT_QUERY, "email").execute().getInput(); @@ -179,16 +163,13 @@ public class UsersActionTest extends BasePermissionWsTest { @Test public void search_also_for_users_without_permission_when_filtering_login() { // User with permission on project - ComponentDto project = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert())); + ComponentDto project = db.components().insertPrivateProject(); UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email")); - db.organizations().addMember(db.getDefaultOrganization(), user); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); // User without permission UserDto withoutPermission = db.users().insertUser(newUserDto("without-permission-login", "without-permission-name", "without-permission-email")); - db.organizations().addMember(db.getDefaultOrganization(), withoutPermission); UserDto anotherUser = db.users().insertUser(newUserDto("another-user", "another-user", "another-user")); - db.organizations().addMember(db.getDefaultOrganization(), anotherUser); loginAsAdmin(); String result = newRequest().setParam(PARAM_PROJECT_ID, project.uuid()).setParam(TEXT_QUERY, "login").execute().getInput(); @@ -228,7 +209,6 @@ public class UsersActionTest extends BasePermissionWsTest { public void search_for_users_is_paginated() { for (int i = 9; i >= 0; i--) { UserDto user = db.users().insertUser(newUserDto().setName("user-" + i)); - db.organizations().addMember(db.getDefaultOrganization(), user); db.users().insertPermissionOnUser(user, ADMINISTER); db.users().insertPermissionOnUser(user, ADMINISTER_QUALITY_GATES); } @@ -271,7 +251,6 @@ public class UsersActionTest extends BasePermissionWsTest { loginAsAdmin(); for (int i = 0; i < 30; i++) { UserDto user = db.users().insertUser(newUserDto().setLogin("user-" + i)); - db.organizations().addMember(db.getDefaultOrganization(), user); db.users().insertPermissionOnUser(user, SCAN); db.users().insertPermissionOnUser(user, PROVISION_PROJECTS); } @@ -320,7 +299,7 @@ public class UsersActionTest extends BasePermissionWsTest { @Test public void fail_if_project_uuid_and_project_key_are_provided() { - db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), "project-uuid").setDbKey("project-key")); + ComponentDto project = db.components().insertPrivateProject(); loginAsAdmin(); expectedException.expect(BadRequestException.class); @@ -328,8 +307,8 @@ public class UsersActionTest extends BasePermissionWsTest { newRequest() .setParam(PARAM_PERMISSION, SYSTEM_ADMIN) - .setParam(PARAM_PROJECT_ID, "project-uuid") - .setParam(PARAM_PROJECT_KEY, "project-key") + .setParam(PARAM_PROJECT_ID, project.uuid()) + .setParam(PARAM_PROJECT_KEY, project.getKey()) .execute(); } @@ -345,9 +324,8 @@ public class UsersActionTest extends BasePermissionWsTest { @Test public void fail_when_using_branch_db_key() throws Exception { - OrganizationDto organization = db.organizations().insert(); UserDto user = db.users().insertUser(newUserDto()); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); ComponentDto branch = db.components().insertProjectBranch(project); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -356,7 +334,6 @@ public class UsersActionTest extends BasePermissionWsTest { expectedException.expectMessage(format("Project key '%s' not found", branch.getDbKey())); newRequest() - .setParam(PARAM_ORGANIZATION, organization.getKey()) .setParam(PARAM_PROJECT_KEY, branch.getDbKey()) .setParam(PARAM_USER_LOGIN, user.getLogin()) .setParam(PARAM_PERMISSION, SYSTEM_ADMIN) @@ -365,9 +342,8 @@ public class UsersActionTest extends BasePermissionWsTest { @Test public void fail_when_using_branch_uuid() { - OrganizationDto organization = db.organizations().insert(); UserDto user = db.users().insertUser(newUserDto()); - ComponentDto project = db.components().insertPublicProject(organization); + ComponentDto project = db.components().insertPublicProject(); ComponentDto branch = db.components().insertProjectBranch(project); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -376,7 +352,6 @@ public class UsersActionTest extends BasePermissionWsTest { expectedException.expectMessage(format("Project id '%s' not found", branch.uuid())); newRequest() - .setParam(PARAM_ORGANIZATION, organization.getKey()) .setParam(PARAM_PROJECT_ID, branch.uuid()) .setParam(PARAM_USER_LOGIN, user.getLogin()) .setParam(PARAM_PERMISSION, SYSTEM_ADMIN) @@ -385,11 +360,8 @@ public class UsersActionTest extends BasePermissionWsTest { private void insertUsersHavingGlobalPermissions() { UserDto user1 = db.users().insertUser(newUserDto("login-1", "name-1", "email-1")); - db.organizations().addMember(db.getDefaultOrganization(), user1); UserDto user2 = db.users().insertUser(newUserDto("login-2", "name-2", "email-2")); - db.organizations().addMember(db.getDefaultOrganization(), user2); UserDto user3 = db.users().insertUser(newUserDto("login-3", "name-3", "email-3")); - db.organizations().addMember(db.getDefaultOrganization(), user3); db.users().insertPermissionOnUser(user1, SCAN); db.users().insertPermissionOnUser(user2, SCAN); db.users().insertPermissionOnUser(user3, ADMINISTER); diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java index 542e3f59c97..b7f21d221f6 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java @@ -158,7 +158,7 @@ public class AddGroupToTemplateActionTest extends BasePermissionWsTest { UserDto user = db.users().insertUser("User-" + i); - db.organizations().addMember(db.getDefaultOrganization(), user); db.permissionTemplates().addUserToTemplate(otherTemplate, user, UserRole.USER); }); String lastLogin = "User-" + (DEFAULT_PAGE_SIZE + 1); @@ -306,7 +305,6 @@ public class TemplateUsersActionTest extends BasePermissionWsTest u .setLogin("ada.lovelace") .setEmail("ada.lovelace@noteg.com") @@ -115,6 +109,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_group_membership() { + createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); GroupDto group1 = db.users().insertGroup(); @@ -128,6 +123,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_tokens() { + createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); db.users().insertToken(user); @@ -141,6 +137,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_properties() { + createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); ComponentDto project = db.components().insertPrivateProject(); @@ -156,6 +153,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_permissions() { + createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); ComponentDto project = db.components().insertPrivateProject(); @@ -172,6 +170,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_permission_templates() { + createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); PermissionTemplateDto template = db.permissionTemplates().insertTemplate(); @@ -189,6 +188,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_qprofiles_permissions() { + createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); QProfileDto profile = db.qualityProfiles().insert(); @@ -201,6 +201,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_default_assignee_settings() { + createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); ComponentDto project = db.components().insertPrivateProject(); @@ -217,6 +218,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_organization_membership() { + createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); OrganizationDto organization = db.organizations().insert(); @@ -232,6 +234,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_user_settings() { + createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); db.users().insertUserSetting(user); @@ -247,10 +250,9 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_alm_pat() { + createAdminUser(); logInAsSystemAdministrator(); - AlmSettingDto almSettingDto = db.almSettings().insertBitbucketAlmSetting(); - UserDto user = db.users().insertUser(); db.almPats().insert(p -> p.setUserUuid(user.getUuid()), p -> p.setAlmSettingUuid(almSettingDto.getUuid())); UserDto anotherUser = db.users().insertUser(); @@ -264,6 +266,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_session_tokens() { + createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); SessionTokenDto sessionToken1 = db.users().insertSessionToken(user); @@ -280,6 +283,7 @@ public class DeactivateActionTest { @Test public void deactivate_user_deletes_his_dismissed_messages() { + createAdminUser(); logInAsSystemAdministrator(); ProjectDto project1 = db.components().insertPrivateProjectDto(); ProjectDto project2 = db.components().insertPrivateProjectDto(); @@ -301,6 +305,7 @@ public class DeactivateActionTest { @Test public void user_cannot_deactivate_itself_on_sonarqube() { + createAdminUser(); UserDto user = db.users().insertUser(); userSession.logIn(user.getLogin()).setSystemAdministrator(); @@ -314,6 +319,8 @@ public class DeactivateActionTest { @Test public void deactivation_requires_to_be_logged_in() { + createAdminUser(); + expectedException.expect(UnauthorizedException.class); expectedException.expectMessage("Authentication is required"); @@ -322,6 +329,7 @@ public class DeactivateActionTest { @Test public void deactivation_requires_administrator_permission_on_sonarqube() { + createAdminUser(); userSession.logIn(); expectedException.expect(ForbiddenException.class); @@ -332,6 +340,7 @@ public class DeactivateActionTest { @Test public void fail_if_user_does_not_exist() { + createAdminUser(); logInAsSystemAdministrator(); expectedException.expect(NotFoundException.class); @@ -342,6 +351,7 @@ public class DeactivateActionTest { @Test public void fail_if_login_is_blank() { + createAdminUser(); logInAsSystemAdministrator(); expectedException.expect(IllegalArgumentException.class); @@ -352,6 +362,7 @@ public class DeactivateActionTest { @Test public void fail_if_login_is_missing() { + createAdminUser(); logInAsSystemAdministrator(); expectedException.expect(IllegalArgumentException.class); @@ -374,11 +385,8 @@ public class DeactivateActionTest { @Test public void administrators_can_be_deactivated_if_there_are_still_other_administrators() { - UserDto admin = db.users().insertUser(); - UserDto anotherAdmin = db.users().insertUser(); - db.users().insertPermissionOnUser(admin, ADMINISTER); - db.users().insertPermissionOnUser(anotherAdmin, ADMINISTER); - db.commit(); + UserDto admin = createAdminUser();; + UserDto anotherAdmin = createAdminUser(); logInAsSystemAdministrator(); deactivate(admin.getLogin()); @@ -396,6 +404,7 @@ public class DeactivateActionTest { @Test public void test_example() { + createAdminUser(); UserDto user = db.users().insertUser(u -> u .setLogin("ada.lovelace") .setEmail("ada.lovelace@noteg.com") @@ -436,4 +445,11 @@ public class DeactivateActionTest { assertThat(user.get().getScmAccountsAsList()).isEmpty(); } + private UserDto createAdminUser() { + UserDto admin = db.users().insertUser(); + db.users().insertPermissionOnUser(admin, ADMINISTER); + db.commit(); + return admin; + } + } diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java index cb5825763d2..360ebffa3ab 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java @@ -154,7 +154,7 @@ public class DeleteActionTest { insertDefaultGroup(); GroupDto group = db.users().insertGroup(); PermissionTemplateDto template = db.getDbClient().permissionTemplateDao().insert(db.getSession(), - PermissionTemplateTesting.newPermissionTemplateDto().setOrganizationUuid(db.getDefaultOrganization().getUuid())); + PermissionTemplateTesting.newPermissionTemplateDto()); db.getDbClient().permissionTemplateDao().insertGroupPermission(db.getSession(), template.getUuid(), group.getUuid(), "perm"); db.commit(); loginAsAdmin(); diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsParameters.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsParameters.java index 45a268e1a34..7d60d835600 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsParameters.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsParameters.java @@ -23,7 +23,6 @@ public class PermissionsWsParameters { public static final String CONTROLLER = "api/permissions"; public static final String PARAM_PERMISSION = "permission"; - public static final String PARAM_ORGANIZATION = "organization"; public static final String PARAM_GROUP_NAME = "groupName"; public static final String PARAM_GROUP_ID = "groupId"; public static final String PARAM_PROJECT_ID = "projectId"; -- 2.39.5