SONAR-8134 remove useless CE step about permissions

No need to apply default permission template in CE
as it's already done during submit of report to WS.

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStep.java
deleted file mode 100644 (file)
index 29c79d1..0000000
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStep.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact 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.computation.task.projectanalysis.step;
-
-import org.sonar.db.DbClient;
-import org.sonar.db.DbSession;
-import org.sonar.db.permission.PermissionRepository;
-import org.sonar.server.computation.task.projectanalysis.component.Component;
-import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit;
-import org.sonar.server.computation.task.projectanalysis.component.DbIdsRepository;
-import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler;
-import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder;
-import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter;
-import org.sonar.server.computation.task.step.ComputationStep;
-import org.sonar.server.permission.index.PermissionIndexer;
-
-import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT;
-import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW;
-import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER;
-
-/**
- * Apply default permissions on new projects and index issues/authorization
- */
-public class ApplyPermissionsStep implements ComputationStep {
-
-  private final DbClient dbClient;
-  private final DbIdsRepository dbIdsRepository;
-  private final PermissionIndexer indexer;
-  private final PermissionRepository permissionRepository;
-  private final TreeRootHolder treeRootHolder;
-
-  public ApplyPermissionsStep(DbClient dbClient, DbIdsRepository dbIdsRepository, PermissionIndexer indexer, PermissionRepository permissionRepository,
-                              TreeRootHolder treeRootHolder) {
-    this.dbClient = dbClient;
-    this.dbIdsRepository = dbIdsRepository;
-    this.indexer = indexer;
-    this.permissionRepository = permissionRepository;
-    this.treeRootHolder = treeRootHolder;
-  }
-
-  @Override
-  public void execute() {
-    new DepthTraversalTypeAwareCrawler(
-      new TypeAwareVisitorAdapter(CrawlerDepthLimit.reportMaxDepth(PROJECT).withViewsMaxDepth(VIEW), PRE_ORDER) {
-        @Override
-        public void visitProject(Component project) {
-          execute(project);
-        }
-
-        @Override
-        public void visitView(Component view) {
-          execute(view);
-        }
-      }).visit(treeRootHolder.getRoot());
-  }
-
-  private void execute(Component project) {
-    try (DbSession dbSession = dbClient.openSession(false)) {
-      long projectId = dbIdsRepository.getComponentId(project);
-      if (hasNoPermissions(dbSession, projectId)) {
-        permissionRepository.applyDefaultPermissionTemplate(dbSession, projectId);
-        dbSession.commit();
-        indexer.index(dbSession, project.getUuid());
-      }
-    }
-  }
-
-  private boolean hasNoPermissions(DbSession dbSession, long projectId) {
-    return !dbClient.groupPermissionDao().hasRootComponentPermissions(dbSession, projectId) &&
-      !dbClient.userPermissionDao().hasRootComponentPermissions(dbSession, projectId);
-  }
-
-  @Override
-  public String getDescription() {
-    return "Apply permissions";
-  }
-
-}

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java
index 55c66df8e5c53ca668ce428890db369cdeffd21d..3d6f4fecd184e8f0bd8b664f97b95f7a87925982 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java
@@ -102,7 +102,6 @@ public class ReportComputationSteps extends AbstractComputationSteps {
     UpdateQualityProfilesLastUsedDateStep.class,
     IndexComponentsStep.class,
     PurgeDatastoresStep.class,
-    ApplyPermissionsStep.class,
 
     // ES indexing is done after all db changes
     IndexIssuesStep.class,

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStepTest.java
deleted file mode 100644 (file)
index 218446d..0000000
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStepTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact 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.computation.task.projectanalysis.step;
-
-import java.util.List;
-import java.util.Map;
-import org.elasticsearch.search.SearchHit;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.sonar.api.config.MapSettings;
-import org.sonar.api.config.Settings;
-import org.sonar.api.security.DefaultGroups;
-import org.sonar.api.utils.System2;
-import org.sonar.api.web.UserRole;
-import org.sonar.db.DbClient;
-import org.sonar.db.DbSession;
-import org.sonar.db.DbTester;
-import org.sonar.db.component.ComponentDto;
-import org.sonar.db.component.ComponentTesting;
-import org.sonar.db.permission.PermissionRepository;
-import org.sonar.db.permission.template.PermissionTemplateDto;
-import org.sonar.server.component.es.ProjectMeasuresIndexDefinition;
-import org.sonar.server.computation.task.projectanalysis.component.Component;
-import org.sonar.server.computation.task.projectanalysis.component.MutableDbIdsRepositoryRule;
-import org.sonar.server.computation.task.projectanalysis.component.ReportComponent;
-import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule;
-import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent;
-import org.sonar.server.computation.task.step.ComputationStep;
-import org.sonar.server.es.EsTester;
-import org.sonar.server.issue.index.IssueIndexDefinition;
-import org.sonar.server.permission.index.PermissionIndexer;
-import org.sonar.server.permission.index.PermissionIndexerTester;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.sonar.db.component.ComponentTesting.newView;
-import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateDto;
-import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT;
-import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW;
-
-public class ApplyPermissionsStepTest extends BaseStepTest {
-
-  private static final String ROOT_KEY = "ROOT_KEY";
-  private static final String ROOT_UUID = "ROOT_UUID";
-  private static final long SOME_DATE = 1000L;
-
-  @Rule
-  public EsTester esTester = new EsTester(new IssueIndexDefinition(new MapSettings()), new ProjectMeasuresIndexDefinition(new MapSettings()));
-
-  @Rule
-  public DbTester dbTester = DbTester.create(System2.INSTANCE);
-
-  @Rule
-  public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule();
-
-  @Rule
-  public MutableDbIdsRepositoryRule dbIdsRepository = MutableDbIdsRepositoryRule.create(treeRootHolder);
-
-  private PermissionIndexerTester authorizationIndexerTester = new PermissionIndexerTester(esTester);
-
-  private DbSession dbSession;
-  private DbClient dbClient = dbTester.getDbClient();
-  private Settings settings = new MapSettings();
-  private ApplyPermissionsStep step;
-
-  @Before
-  public void setUp() {
-    dbSession = dbClient.openSession(false);
-    step = new ApplyPermissionsStep(dbClient, dbIdsRepository, new PermissionIndexer(dbClient, esTester.client()), new PermissionRepository(dbClient, settings), treeRootHolder);
-  }
-
-  @After
-  public void tearDown() {
-    dbSession.close();
-  }
-
-  @Test
-  public void grant_permission_on_new_project() {
-    ComponentDto projectDto = ComponentTesting.newProjectDto(ROOT_UUID).setKey(ROOT_KEY);
-    dbClient.componentDao().insert(dbSession, projectDto);
-
-    // Create a permission template containing browse permission for anonymous group
-    createDefaultPermissionTemplate(UserRole.USER);
-
-    Component project = ReportComponent.builder(PROJECT, 1).setUuid(ROOT_UUID).setKey(ROOT_KEY).build();
-    dbIdsRepository.setComponentId(project, projectDto.getId());
-    treeRootHolder.setRoot(project);
-
-    step.execute();
-    dbSession.commit();
-
-    assertThat(dbClient.componentDao().selectOrFailByKey(dbSession, ROOT_KEY).getAuthorizationUpdatedAt()).isNotNull();
-    assertThat(dbClient.groupPermissionDao().selectProjectPermissionsOfGroup(dbSession,
-      dbTester.getDefaultOrganization().getUuid(), null, projectDto.getId())).containsOnly(UserRole.USER);
-    authorizationIndexerTester.verifyProjectExistsWithPermission(ROOT_UUID, singletonList(DefaultGroups.ANYONE), emptyList());
-  }
-
-  @Test
-  public void nothing_to_do_on_existing_project() {
-    ComponentDto projectDto = ComponentTesting.newProjectDto(ROOT_UUID).setKey(ROOT_KEY).setAuthorizationUpdatedAt(SOME_DATE);
-    dbTester.components().insertComponent(projectDto);
-    // Permissions are already set on the project
-    dbTester.users().insertProjectPermissionOnAnyone(UserRole.USER, projectDto);
-
-    dbSession.commit();
-
-    Component project = ReportComponent.builder(PROJECT, 1).setUuid(ROOT_UUID).setKey(ROOT_KEY).build();
-    dbIdsRepository.setComponentId(project, projectDto.getId());
-    treeRootHolder.setRoot(project);
-
-    step.execute();
-    dbSession.commit();
-
-    // Check that authorization updated at has not been changed -> Nothing has been done
-    assertThat(projectDto.getAuthorizationUpdatedAt()).isEqualTo(SOME_DATE);
-  }
-
-  @Test
-  public void grant_permission_on_new_view() {
-    ComponentDto viewDto = newView(ROOT_UUID).setKey(ROOT_KEY);
-    dbClient.componentDao().insert(dbSession, viewDto);
-
-    String permission = UserRole.USER;
-    // Create a permission template containing browse permission for anonymous group
-    createDefaultPermissionTemplate(permission);
-
-    Component project = ViewsComponent.builder(VIEW, ROOT_KEY).setUuid(ROOT_UUID).build();
-    dbIdsRepository.setComponentId(project, viewDto.getId());
-    treeRootHolder.setRoot(project);
-
-    step.execute();
-    dbSession.commit();
-
-    assertThat(dbClient.componentDao().selectOrFailByKey(dbSession, ROOT_KEY).getAuthorizationUpdatedAt()).isNotNull();
-    assertThat(dbClient.groupPermissionDao().selectProjectPermissionsOfGroup(dbSession,
-      dbTester.getDefaultOrganization().getUuid(), null, viewDto.getId())).containsOnly(permission);
-  }
-
-  @Test
-  public void nothing_to_do_on_existing_view() {
-    ComponentDto viewDto = newView(ROOT_UUID).setKey(ROOT_KEY).setAuthorizationUpdatedAt(SOME_DATE);
-    dbTester.components().insertComponent(viewDto);
-    // Permissions are already set on the view
-    dbTester.users().insertProjectPermissionOnAnyone(UserRole.USER, viewDto);
-
-    Component project = ReportComponent.builder(PROJECT, 1).setUuid(ROOT_UUID).setKey(ROOT_KEY).build();
-    dbIdsRepository.setComponentId(project, viewDto.getId());
-    treeRootHolder.setRoot(project);
-
-    step.execute();
-    dbSession.commit();
-
-    // Check that authorization updated at has not been changed -> Nothing has been done
-    assertThat(viewDto.getAuthorizationUpdatedAt()).isEqualTo(SOME_DATE);
-  }
-
-  private void createDefaultPermissionTemplate(String permission) {
-    PermissionTemplateDto defaultTemplate = newPermissionTemplateDto()
-      .setOrganizationUuid(dbTester.getDefaultOrganization().getUuid())
-      .setName("Default");
-    dbClient.permissionTemplateDao().insert(dbSession, defaultTemplate);
-    settings.setProperty("sonar.permission.template.default", defaultTemplate.getKee());
-    dbClient.permissionTemplateDao().insertGroupPermission(dbSession, defaultTemplate.getId(), null, permission);
-    dbSession.commit();
-  }
-
-  @Override
-  protected ComputationStep step() {
-    return step;
-  }
-}