Skip to content

Commit

Permalink
SONAR-8134 remove unused production code from RoleDao
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Brandhof committed Oct 20, 2016
1 parent f4a5e4e commit 612f98e
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 373 deletions.
18 changes: 13 additions & 5 deletions ...java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStepTest.java
View file
Expand Up @@ -19,6 +19,9 @@
*/
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;
Expand Down Expand Up @@ -107,7 +110,8 @@ public void grant_permission_on_new_project() {
dbSession.commit();

assertThat(dbClient.componentDao().selectOrFailByKey(dbSession, ROOT_KEY).getAuthorizationUpdatedAt()).isNotNull();
assertThat(dbClient.roleDao().selectGroupPermissions(dbSession, DefaultGroups.ANYONE, projectDto.getId())).containsOnly(UserRole.USER);
assertThat(dbClient.groupPermissionDao().selectProjectPermissionsOfGroup(dbSession,
dbTester.getDefaultOrganization().getUuid(), null, projectDto.getId())).containsOnly(UserRole.USER);
authorizationIndexerTester.verifyProjectExistsWithPermission(ROOT_UUID, singletonList(DefaultGroups.ANYONE), emptyList());
}

Expand Down Expand Up @@ -148,7 +152,8 @@ public void grant_permission_on_new_view() {
dbSession.commit();

assertThat(dbClient.componentDao().selectOrFailByKey(dbSession, ROOT_KEY).getAuthorizationUpdatedAt()).isNotNull();
assertThat(dbClient.roleDao().selectGroupPermissions(dbSession, DefaultGroups.ANYONE, viewDto.getId())).containsOnly(permission);
assertThat(dbClient.groupPermissionDao().selectProjectPermissionsOfGroup(dbSession,
dbTester.getDefaultOrganization().getUuid(), null, viewDto.getId())).containsOnly(permission);
}

@Test
Expand All @@ -170,9 +175,12 @@ public void nothing_to_do_on_existing_view() {
}

private void createDefaultPermissionTemplate(String permission) {
PermissionTemplateDto permissionTemplateDto = dbClient.permissionTemplateDao().insert(dbSession, newPermissionTemplateDto().setName("Default"));
settings.setProperty("sonar.permission.template.default", permissionTemplateDto.getKee());
dbClient.permissionTemplateDao().insertGroupPermission(dbSession, permissionTemplateDto.getId(), null, 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();
}

Expand Down
18 changes: 0 additions & 18 deletions sonar-db/src/main/java/org/sonar/db/permission/UserPermissionDao.java
View file
Expand Up @@ -21,7 +21,6 @@

import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.apache.ibatis.session.RowBounds;
Expand All @@ -30,7 +29,6 @@
import org.sonar.db.DbSession;

import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static org.sonar.db.DatabaseUtils.executeLargeInputs;

Expand Down Expand Up @@ -61,22 +59,6 @@ public List<String> selectLogins(DbSession dbSession, PermissionQuery query) {
.collect(Collectors.toList());
}

/**
* Shortcut over {@link #select(DbSession, PermissionQuery, Collection)}
* @param userLogin the non-null user login
* @param projectUuid if null, then return global permissions, else return permissions of user on this project
*/
public Set<String> selectPermissionsByLogin(DbSession dbSession, String userLogin, @Nullable String projectUuid) {
PermissionQuery query = PermissionQuery.builder()
.withAtLeastOnePermission()
.setComponentUuid(projectUuid)
.build();
return select(dbSession, query, asList(userLogin)).stream()
.map(ExtendedUserPermissionDto::getPermission)
.collect(Collectors.toSet());
}


/**
* @see UserPermissionMapper#countUsersByQuery(PermissionQuery, Collection)
*/
Expand Down
20 changes: 0 additions & 20 deletions sonar-db/src/main/java/org/sonar/db/user/RoleDao.java
View file
Expand Up @@ -20,8 +20,6 @@
package org.sonar.db.user;

import java.util.List;
import javax.annotation.Nullable;
import org.sonar.api.security.DefaultGroups;
import org.sonar.db.Dao;
import org.sonar.db.DbSession;

Expand All @@ -35,28 +33,10 @@ public List<Long> selectComponentIdsByPermissionAndUserId(DbSession dbSession, S
return mapper(dbSession).selectComponentIdsByPermissionAndUserId(permission, userId);
}

/**
* @deprecated replaced by {@link org.sonar.db.permission.GroupPermissionDao#selectGroupPermissions(DbSession, long, Long)}
* and {@link org.sonar.db.permission.GroupPermissionDao#selectAnyonePermissions(DbSession, Long)}
*/
@Deprecated
public List<String> selectGroupPermissions(DbSession session, String groupName, @Nullable Long resourceId) {
return session.getMapper(RoleMapper.class).selectGroupPermissions(groupName, resourceId, DefaultGroups.isAnyone(groupName));
}


public void deleteGroupRolesByGroupId(DbSession session, long groupId) {
mapper(session).deleteGroupRolesByGroupId(groupId);
}

/**
* @deprecated does not support organizations
*/
@Deprecated
public int countUserPermissions(DbSession session, String permission, @Nullable Long allGroupsExceptThisGroupId) {
return mapper(session).countUsersWithPermission(permission, allGroupsExceptThisGroupId);
}

private static RoleMapper mapper(DbSession session) {
return session.getMapper(RoleMapper.class);
}
Expand Down
10 changes: 0 additions & 10 deletions sonar-db/src/main/java/org/sonar/db/user/RoleMapper.java
View file
Expand Up @@ -20,22 +20,12 @@
package org.sonar.db.user;

import java.util.List;
import javax.annotation.Nullable;
import org.apache.ibatis.annotations.Param;

/**
* @since 3.2
*/
public interface RoleMapper {

List<Long> selectComponentIdsByPermissionAndUserId(@Param("permission") String permission, @Param("userId") long userId);

/**
* @return permissions from to a group
*/
List<String> selectGroupPermissions(@Param("groupName") String groupName, @Nullable @Param("resourceId") Long resourceId, @Param("isAnyOneGroup") Boolean isAnyOneGroup);

void deleteGroupRolesByGroupId(long groupId);

int countUsersWithPermission(@Param("permission") String permission, @Nullable @Param("groupId") Long groupId);
}
50 changes: 0 additions & 50 deletions sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml
View file
Expand Up @@ -23,56 +23,6 @@
ORDER by resource_id
</select>

<select id="selectGroupPermissions" parameterType="map" resultType="String">
SELECT gr.role
FROM group_roles gr
<if test="isAnyOneGroup != true">
INNER JOIN groups g ON g.id = gr.group_id
</if>
<where>
<choose>
<when test="isAnyOneGroup != true">
AND g.name = #{groupName}
</when>
<otherwise>
AND gr.group_id IS NULL
</otherwise>
</choose>
<choose>
<when test="resourceId != null">
AND resource_id=#{resourceId}
</when>
<otherwise>
AND resource_id IS NULL
</otherwise>
</choose>
</where>
</select>

<select id="countUsersWithPermission" parameterType="map" resultType="int">
SELECT count(c.id)
FROM (
SELECT DISTINCT ur.user_id as id
FROM user_roles ur
INNER JOIN users u ON u.id=ur.user_id AND u.active=${_true}
WHERE
ur.role = #{permission} and ur.resource_id IS NULL
UNION ALL
SELECT DISTINCT u.id as id
FROM users u
INNER JOIN groups_users gu ON gu.user_id = u.id
INNER JOIN group_roles gr ON gr.group_id = gu.group_id
INNER JOIN groups g ON g.id = gu.group_id
WHERE
gr.role = #{permission}
AND gr.resource_id IS NULL
AND u.active=${_true}
<if test="groupId!=null">
AND g.id!=#{groupId}
</if>
) c
</select>

<delete id="deleteGroupRolesByGroupId" parameterType="long">
delete from group_roles where group_id=#{id}
</delete>
Expand Down
30 changes: 19 additions & 11 deletions sonar-db/src/test/java/org/sonar/db/permission/PermissionRepositoryTest.java
View file
Expand Up @@ -19,6 +19,7 @@
*/
package org.sonar.db.permission;

import java.util.List;
import javax.annotation.Nullable;
import org.junit.Before;
import org.junit.Rule;
Expand All @@ -35,7 +36,6 @@
import org.sonar.db.permission.template.PermissionTemplateDbTester;
import org.sonar.db.permission.template.PermissionTemplateDto;
import org.sonar.db.user.GroupDto;
import org.sonar.db.user.RoleDao;
import org.sonar.db.user.UserDto;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -73,24 +73,32 @@ public void setUp() {
public void apply_permission_template() {
dbTester.prepareDbUnit(getClass(), "should_apply_permission_template.xml");

UserDto marius = dbTester.users().selectUserByLogin("marius").get();
RoleDao roleDao = dbTester.getDbClient().roleDao();
assertThat(roleDao.selectGroupPermissions(session, "sonar-administrators", PROJECT.getId())).isEmpty();
assertThat(roleDao.selectGroupPermissions(session, "sonar-users", PROJECT.getId())).isEmpty();
assertThat(roleDao.selectGroupPermissions(session, "Anyone", PROJECT.getId())).isEmpty();
assertThat(dbTester.getDbClient().userPermissionDao().selectProjectPermissionsOfUser(session, marius.getId(), PROJECT.getId())).isEmpty();
assertThat(selectProjectPermissionsOfGroup("org1", 100L, PROJECT)).isEmpty();
assertThat(selectProjectPermissionsOfGroup("org1", 101L, PROJECT)).isEmpty();
assertThat(selectProjectPermissionsOfGroup("org1", null, PROJECT)).isEmpty();
assertThat(selectProjectPermissionsOfUser(200L, PROJECT)).isEmpty();

PermissionTemplateDto template = dbTester.getDbClient().permissionTemplateDao().selectByUuid(session, "default_20130101_010203");
underTest.apply(session, template, PROJECT, null);

assertThat(roleDao.selectGroupPermissions(session, "sonar-administrators", PROJECT.getId())).containsOnly("admin", "issueadmin");
assertThat(roleDao.selectGroupPermissions(session, "sonar-users", PROJECT.getId())).containsOnly("user", "codeviewer");
assertThat(roleDao.selectGroupPermissions(session, "Anyone", PROJECT.getId())).containsOnly("user", "codeviewer");
assertThat(dbTester.getDbClient().userPermissionDao().selectProjectPermissionsOfUser(session, marius.getId(), PROJECT.getId())).containsOnly("admin");
assertThat(selectProjectPermissionsOfGroup("org1", 100L, PROJECT)).containsOnly("admin", "issueadmin");
assertThat(selectProjectPermissionsOfGroup("org1", 101L, PROJECT)).containsOnly("user", "codeviewer");
assertThat(selectProjectPermissionsOfGroup("org1", null, PROJECT)).containsOnly("user", "codeviewer");
assertThat(selectProjectPermissionsOfUser(200L, PROJECT)).containsOnly("admin");

checkAuthorizationUpdatedAtIsUpdated();
}

private List<String> selectProjectPermissionsOfGroup(String organizationUuid, @Nullable Long groupId, ComponentDto project) {
return dbTester.getDbClient().groupPermissionDao().selectProjectPermissionsOfGroup(session,
organizationUuid, groupId != null ? groupId : null, project.getId());
}

private List<String> selectProjectPermissionsOfUser(long userId, ComponentDto project) {
return dbTester.getDbClient().userPermissionDao().selectProjectPermissionsOfUser(session,
userId, project.getId());
}

@Test
public void apply_default_permission_template_from_component_id() {
dbTester.prepareDbUnit(getClass(), "apply_default_permission_template_by_component_id.xml");
Expand Down
23 changes: 0 additions & 23 deletions sonar-db/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java
View file
Expand Up @@ -226,29 +226,6 @@ public void selectLogins() {
assertThat(underTest.selectLogins(dbSession, query)).isEmpty();
}

@Test
public void selectPermissionsByLogin() {
addGlobalPermissionOnDefaultOrganization(SYSTEM_ADMIN, user1);
addProjectPermissionOnDefaultOrganization(USER, user1, project1);
addProjectPermissionOnDefaultOrganization(USER, user2, project1);
addProjectPermissionOnDefaultOrganization(ISSUE_ADMIN, user2, project1);
addProjectPermissionOnDefaultOrganization(ISSUE_ADMIN, user2, project2);

// user1 has one global permission and user2 has no global permissions
assertThat(underTest.selectPermissionsByLogin(dbSession, user1.getLogin(), null)).hasSize(1);
assertThat(underTest.selectPermissionsByLogin(dbSession, user2.getLogin(), null)).hasSize(0);

// user1 has one permission on project1, user2 has 2
assertThat(underTest.selectPermissionsByLogin(dbSession, user1.getLogin(), project1.uuid())).hasSize(1);
assertThat(underTest.selectPermissionsByLogin(dbSession, user2.getLogin(), project1.uuid())).hasSize(2);

// nobody has permissions on a project that does not exist!
assertThat(underTest.selectPermissionsByLogin(dbSession, user1.getLogin(), "missing")).hasSize(0);

// users who do not exist don't have permissions!
assertThat(underTest.selectPermissionsByLogin(dbSession, "missing", null)).hasSize(0);
}

@Test
public void deleteGlobalPermission() {
addGlobalPermissionOnDefaultOrganization("perm1", user1);
Expand Down
59 changes: 0 additions & 59 deletions sonar-db/src/test/java/org/sonar/db/user/RoleDaoTest.java
View file
Expand Up @@ -23,7 +23,6 @@
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.sonar.api.security.DefaultGroups;
import org.sonar.api.utils.System2;
import org.sonar.api.web.UserRole;
import org.sonar.core.permission.GlobalPermissions;
Expand Down Expand Up @@ -94,28 +93,6 @@ public void selectComponentIdsByPermissionAndUserId_group_permissions() {
assertThat(result).containsExactly(project1.getId(), project2.getId());
}

@Test
public void retrieve_global_group_permissions() {
db.prepareDbUnit(getClass(), "globalGroupPermissions.xml");

assertThat(underTest.selectGroupPermissions(db.getSession(), "sonar-administrators", null)).containsOnly(GlobalPermissions.SYSTEM_ADMIN,
GlobalPermissions.QUALITY_PROFILE_ADMIN,
GlobalPermissions.QUALITY_GATE_ADMIN);
assertThat(underTest.selectGroupPermissions(db.getSession(), "sonar-users", null)).containsOnly(GlobalPermissions.QUALITY_GATE_ADMIN);
assertThat(underTest.selectGroupPermissions(db.getSession(), DefaultGroups.ANYONE, null)).containsOnly(GlobalPermissions.PROVISIONING,
GlobalPermissions.SCAN_EXECUTION);
assertThat(underTest.selectGroupPermissions(db.getSession(), "anyone", null)).containsOnly(GlobalPermissions.PROVISIONING, GlobalPermissions.SCAN_EXECUTION);
assertThat(underTest.selectGroupPermissions(db.getSession(), "AnYoNe", null)).containsOnly(GlobalPermissions.PROVISIONING, GlobalPermissions.SCAN_EXECUTION);
}

@Test
public void retrieve_resource_group_permissions() {
db.prepareDbUnit(getClass(), "resourceGroupPermissions.xml");

assertThat(underTest.selectGroupPermissions(db.getSession(), "sonar-administrators", 1L)).containsOnly(UserRole.ADMIN, UserRole.CODEVIEWER);
assertThat(underTest.selectGroupPermissions(db.getSession(), "sonar-users", 1L)).containsOnly(UserRole.CODEVIEWER);
}

@Test
public void delete_all_group_permissions_by_group_id() {
db.prepareDbUnit(getClass(), "deleteGroupPermissionsByGroupId.xml");
Expand All @@ -125,40 +102,4 @@ public void delete_all_group_permissions_by_group_id() {

db.assertDbUnit(getClass(), "deleteGroupPermissionsByGroupId-result.xml", "group_roles");
}

@Test
public void countUserPermissions() {
db.users().insertProjectPermissionOnUser(user1, GlobalPermissions.SYSTEM_ADMIN, project1);
db.users().insertPermissionOnUser(user1, GlobalPermissions.SYSTEM_ADMIN);
db.users().insertPermissionOnUser(user1, GlobalPermissions.SCAN_EXECUTION);

int result = underTest.countUserPermissions(db.getSession(), GlobalPermissions.SYSTEM_ADMIN, null);

assertThat(result).isEqualTo(1);
}

@Test
public void countUserPermissions_counts_users_with_one_permission_when_the_last_one_is_in_a_group() {
GroupDto group1 = db.users().insertGroup(newGroupDto());
db.users().insertMember(group1, user1);
db.users().insertPermissionOnGroup(group1, GlobalPermissions.SYSTEM_ADMIN);

int resultWithoutExcludingGroup = underTest.countUserPermissions(db.getSession(), GlobalPermissions.SYSTEM_ADMIN, null);
assertThat(resultWithoutExcludingGroup).isEqualTo(1);

int resultWithGroupExclusion = underTest.countUserPermissions(db.getSession(), GlobalPermissions.SYSTEM_ADMIN, group1.getId());
assertThat(resultWithGroupExclusion).isEqualTo(0);
}

@Test
public void countUserPermissions_counts_user_twice_when_both_user_and_group_permission() {
GroupDto group1 = db.users().insertGroup(newGroupDto());
db.users().insertMember(group1, user1);
db.users().insertPermissionOnGroup(group1, GlobalPermissions.SYSTEM_ADMIN);
db.users().insertPermissionOnUser(user1, GlobalPermissions.SYSTEM_ADMIN);

int result = underTest.countUserPermissions(db.getSession(), GlobalPermissions.SYSTEM_ADMIN, null);

assertThat(result).isEqualTo(2);
}
}

0 comments on commit 612f98e

Please sign in to comment.