Mirrors/sonarqube
1
0
Fork 0
mirror of https://github.com/SonarSource/sonarqube.git synced 2024-09-13 15:45:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

SONAR-8271 organization in WS api/permissions/add_user_to_template

Browse Source
This commit is contained in:
Simon Brandhof 2016-10-16 23:05:42 +02:00
parent c550a843f2
commit eeec0fa9d6
3 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java
View File

@ -20,6 +20,7 @@
package org.sonar.server.permission.ws.template;
import java.util.List;
import java.util.Optional;
import org.sonar.api.server.ws.Request;
import org.sonar.api.server.ws.Response;
import org.sonar.api.server.ws.WebService;
@ -33,11 +34,12 @@ import org.sonar.server.permission.ws.PermissionsWsAction;
import org.sonar.server.user.UserSession;
import org.sonarqube.ws.client.permission.AddUserToTemplateWsRequest;
import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser;
import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdmin;
import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createProjectPermissionParameter;
import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createTemplateParameters;
import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createUserLoginParameter;
import static org.sonar.server.permission.ws.template.WsTemplateRef.newTemplateRef;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION_KEY;
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;
@ -71,7 +73,6 @@ public class AddUserToTemplateAction implements PermissionsWsAction {
@Override
public void handle(Request request, Response response) throws Exception {
checkGlobalAdminUser(userSession);
doHandle(toAddUserToTemplateWsRequest(request));
response.noContent();
}
@ -81,7 +82,10 @@ public class AddUserToTemplateAction implements PermissionsWsAction {
String userLogin = request.getLogin();
try (DbSession dbSession = dbClient.openSession(false)) {
PermissionTemplateDto template = wsSupport.findTemplate(dbSession, newTemplateRef(request.getTemplateId(), request.getTemplateName()));
PermissionTemplateDto template = wsSupport.findTemplate(dbSession, newTemplateRef(
request.getTemplateId(), request.getOrganization(), request.getTemplateName()));
checkProjectAdmin(userSession, template.getOrganizationUuid(), Optional.empty());
UserId user = wsSupport.findUser(dbSession, userLogin);
if (!isUserAlreadyAdded(dbSession, template.getId(), userLogin, permission)) {
@ -96,6 +100,7 @@ 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_KEY))
.setTemplateName(request.param(PARAM_TEMPLATE_NAME));
}

39
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java
View File

@ -30,13 +30,13 @@ import org.sonar.db.user.UserDto;
import org.sonar.server.exceptions.BadRequestException;
import org.sonar.server.exceptions.ForbiddenException;
import org.sonar.server.exceptions.NotFoundException;
import org.sonar.server.exceptions.UnauthorizedException;
import org.sonar.server.permission.ws.BasePermissionWsTest;
import org.sonar.server.ws.WsTester;
import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.api.web.UserRole.CODEVIEWER;
import static org.sonar.api.web.UserRole.ISSUE_ADMIN;
import static org.sonar.core.permission.GlobalPermissions.QUALITY_PROFILE_ADMIN;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.CONTROLLER;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;
@ -56,14 +56,14 @@ public class AddUserToTemplateActionTest extends BasePermissionWsTest<AddUserToT
@Before
public void setUp() {
loginAsAdmin();
user = db.users().insertUser("user-login");
permissionTemplate = insertTemplate();
}
@Test
public void add_user_to_template() throws Exception {
loginAsAdminOnDefaultOrganization();
newRequest(user.getLogin(), permissionTemplate.getUuid(), CODEVIEWER);
assertThat(getLoginsInTemplateAndPermission(permissionTemplate.getId(), CODEVIEWER)).containsExactly(user.getLogin());
@ -71,6 +71,8 @@ public class AddUserToTemplateActionTest extends BasePermissionWsTest<AddUserToT
@Test
public void add_user_to_template_by_name() throws Exception {
loginAsAdminOnDefaultOrganization();
wsTester.newPostRequest(CONTROLLER, ACTION)
.setParam(PARAM_USER_LOGIN, user.getLogin())
.setParam(PARAM_PERMISSION, CODEVIEWER)
@ -82,6 +84,8 @@ public class AddUserToTemplateActionTest extends BasePermissionWsTest<AddUserToT
@Test
public void does_not_add_a_user_twice() throws Exception {
loginAsAdminOnDefaultOrganization();
newRequest(user.getLogin(), permissionTemplate.getUuid(), ISSUE_ADMIN);
newRequest(user.getLogin(), permissionTemplate.getUuid(), ISSUE_ADMIN);
@ -90,29 +94,26 @@ public class AddUserToTemplateActionTest extends BasePermissionWsTest<AddUserToT
@Test
public void fail_if_not_a_project_permission() throws Exception {
loginAsAdminOnDefaultOrganization();
expectedException.expect(IllegalArgumentException.class);
newRequest(user.getLogin(), permissionTemplate.getUuid(), GlobalPermissions.PROVISIONING);
}
@Test
public void fail_if_insufficient_privileges() throws Exception {
public void fail_if_not_admin_of_default_organization() throws Exception {
userSession.login().addOrganizationPermission(db.getDefaultOrganization().getUuid(), QUALITY_PROFILE_ADMIN);
expectedException.expect(ForbiddenException.class);
userSession.setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN);
newRequest(user.getLogin(), permissionTemplate.getUuid(), CODEVIEWER);
}
@Test
public void fail_if_not_logged_in() throws Exception {
expectedException.expect(UnauthorizedException.class);
userSession.anonymous();
newRequest(user.getLogin(), permissionTemplate.getUuid(), CODEVIEWER);
}
@Test
public void fail_if_user_missing() throws Exception {
loginAsAdminOnDefaultOrganization();
expectedException.expect(IllegalArgumentException.class);
newRequest(null, permissionTemplate.getUuid(), CODEVIEWER);
@ -120,6 +121,8 @@ public class AddUserToTemplateActionTest extends BasePermissionWsTest<AddUserToT
@Test
public void fail_if_permission_missing() throws Exception {
loginAsAdminOnDefaultOrganization();
expectedException.expect(IllegalArgumentException.class);
newRequest(user.getLogin(), permissionTemplate.getUuid(), null);
@ -127,6 +130,8 @@ public class AddUserToTemplateActionTest extends BasePermissionWsTest<AddUserToT
@Test
public void fail_if_template_uuid_and_name_are_missing() throws Exception {
loginAsAdminOnDefaultOrganization();
expectedException.expect(BadRequestException.class);
newRequest(user.getLogin(), null, CODEVIEWER);
@ -134,6 +139,8 @@ public class AddUserToTemplateActionTest extends BasePermissionWsTest<AddUserToT
@Test
public void fail_if_user_does_not_exist() throws Exception {
loginAsAdminOnDefaultOrganization();
expectedException.expect(NotFoundException.class);
expectedException.expectMessage("User with login 'unknown-login' is not found");
@ -142,6 +149,8 @@ public class AddUserToTemplateActionTest extends BasePermissionWsTest<AddUserToT
@Test
public void fail_if_template_key_does_not_exist() throws Exception {
loginAsAdminOnDefaultOrganization();
expectedException.expect(NotFoundException.class);
expectedException.expectMessage("Permission template with id 'unknown-key' is not found");
@ -168,8 +177,4 @@ public class AddUserToTemplateActionTest extends BasePermissionWsTest<AddUserToT
return db.getDbClient().permissionTemplateDao()
.selectUserLoginsByQueryAndTemplate(db.getSession(), permissionQuery, templateId);
}
private void loginAsAdmin() {
userSession.login().setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
}
}

11
sonar-ws/src/main/java/org/sonarqube/ws/client/permission/AddUserToTemplateWsRequest.java
View File

@ -28,6 +28,7 @@ public class AddUserToTemplateWsRequest {
private String login;
private String permission;
private String templateId;
private String organization;
private String templateName;
public String getLogin() {
@ -67,4 +68,14 @@ public class AddUserToTemplateWsRequest {
this.templateName = templateName;
return this;
}
@CheckForNull
public String getOrganization() {
return organization;
}
public AddUserToTemplateWsRequest setOrganization(@Nullable String s) {
this.organization = s;
return this;
}
}