diff options
3 files changed, 124 insertions, 10 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java index 54372f30fe1..8aab8b8ec70 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java @@ -31,20 +31,26 @@ import org.sonar.db.permission.PermissionTemplateDto; import org.sonar.db.user.GroupDto; import org.sonar.server.permission.ws.PermissionDependenciesFinder; import org.sonar.server.permission.ws.PermissionsWsAction; -import org.sonar.server.usergroups.ws.WsGroupRef; -import org.sonar.server.permission.ws.WsTemplateRef; import org.sonar.server.user.UserSession; +import org.sonar.server.usergroups.ws.WsGroupRef; +import org.sonarqube.ws.client.permission.AddGroupToTemplateWsRequest; import static org.sonar.api.security.DefaultGroups.ANYONE; import static org.sonar.db.user.GroupMembershipQuery.IN; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateNotAnyoneAndAdminPermission; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPermission; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_GROUP_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_GROUP_NAME; import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_UUID; import static org.sonar.server.permission.ws.PermissionsWsParameters.createGroupIdParameter; import static org.sonar.server.permission.ws.PermissionsWsParameters.createGroupNameParameter; import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectPermissionParameter; import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateParameters; +import static org.sonar.server.permission.ws.WsTemplateRef.newTemplateRef; +import static org.sonar.server.usergroups.ws.WsGroupRef.newWsGroupRef; public class AddGroupToTemplateAction implements PermissionsWsAction { private final DbClient dbClient; @@ -75,18 +81,23 @@ public class AddGroupToTemplateAction implements PermissionsWsAction { } @Override - public void handle(Request wsRequest, Response wsResponse) throws Exception { + public void handle(Request wsRequest, Response wsResponse) { checkGlobalAdminUser(userSession); + doHandle(toAddGroupToTemplateWsRequest(wsRequest)); + wsResponse.noContent(); + } - String permission = wsRequest.mandatoryParam(PARAM_PERMISSION); - WsGroupRef group = WsGroupRef.newWsGroupRefFromPermissionRequest(wsRequest); + private void doHandle(AddGroupToTemplateWsRequest wsRequest) { + String permission = wsRequest.getPermission(); + Long requestGroupId = wsRequest.getGroupId() == null ? null : Long.valueOf(wsRequest.getGroupId()); + WsGroupRef group = newWsGroupRef(requestGroupId, wsRequest.getGroupName()); DbSession dbSession = dbClient.openSession(false); try { validateProjectPermission(permission); validateNotAnyoneAndAdminPermission(permission, group.name()); - PermissionTemplateDto template = dependenciesFinder.getTemplate(dbSession, WsTemplateRef.fromRequest(wsRequest)); + PermissionTemplateDto template = dependenciesFinder.getTemplate(dbSession, newTemplateRef(wsRequest.getTemplateId(), wsRequest.getTemplateName())); GroupDto groupDto = dependenciesFinder.getGroup(dbSession, group); if (!groupAlreadyAdded(dbSession, template.getId(), groupDto, permission)) { @@ -96,8 +107,6 @@ public class AddGroupToTemplateAction implements PermissionsWsAction { } finally { dbClient.closeSession(dbSession); } - - wsResponse.noContent(); } private boolean groupAlreadyAdded(DbSession dbSession, long templateId, @Nullable GroupDto group, String permission) { @@ -105,4 +114,13 @@ public class AddGroupToTemplateAction implements PermissionsWsAction { PermissionQuery permissionQuery = PermissionQuery.builder().membership(IN).permission(permission).build(); return dbClient.permissionTemplateDao().hasGroup(dbSession, permissionQuery, templateId, groupName); } + + private static AddGroupToTemplateWsRequest toAddGroupToTemplateWsRequest(Request request) { + return new AddGroupToTemplateWsRequest() + .setPermission(request.mandatoryParam(PARAM_PERMISSION)) + .setGroupId(request.param(PARAM_GROUP_ID)) + .setGroupName(request.param(PARAM_GROUP_NAME)) + .setTemplateId(request.param(PARAM_TEMPLATE_UUID)) + .setTemplateName(request.param(PARAM_TEMPLATE_NAME)); + } } diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/AddGroupToTemplateWsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/AddGroupToTemplateWsRequest.java new file mode 100644 index 00000000000..2fff2a6928f --- /dev/null +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/AddGroupToTemplateWsRequest.java @@ -0,0 +1,81 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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.sonarqube.ws.client.permission; + +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; + +public class AddGroupToTemplateWsRequest { + private String groupId; + private String groupName; + private String permission; + private String templateId; + private String templateName; + + @CheckForNull + public String getGroupId() { + return groupId; + } + + public AddGroupToTemplateWsRequest setGroupId(@Nullable String groupId) { + this.groupId = groupId; + return this; + } + + @CheckForNull + public String getGroupName() { + return groupName; + } + + public AddGroupToTemplateWsRequest setGroupName(@Nullable String groupName) { + this.groupName = groupName; + return this; + } + + public String getPermission() { + return permission; + } + + public AddGroupToTemplateWsRequest setPermission(String permission) { + this.permission = permission; + return this; + } + + @CheckForNull + public String getTemplateId() { + return templateId; + } + + public AddGroupToTemplateWsRequest setTemplateId(@Nullable String templateId) { + this.templateId = templateId; + return this; + } + + @CheckForNull + public String getTemplateName() { + return templateName; + } + + public AddGroupToTemplateWsRequest setTemplateName(@Nullable String templateName) { + this.templateName = templateName; + return this; + } +} diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsClient.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsClient.java index ecbb68a06b6..27c898a614b 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsClient.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsClient.java @@ -27,6 +27,8 @@ import static org.sonarqube.ws.client.WsRequest.newGetRequest; import static org.sonarqube.ws.client.WsRequest.newPostRequest; public class PermissionsWsClient { + private static final String ENDPOINT = "api/permissions/"; + private final WsClient wsClient; public PermissionsWsClient(WsClient wsClient) { @@ -34,7 +36,7 @@ public class PermissionsWsClient { } public WsPermissions.WsGroupsResponse groups(GroupsWsRequest request) { - return wsClient.execute(newGetRequest("api/permissions/groups") + return wsClient.execute(newGetRequest(action("groups")) .setParam("permission", request.getPermission()) .setParam("projectId", request.getProjectId()) .setParam("projectKey", request.getProjectKey()) @@ -46,11 +48,24 @@ public class PermissionsWsClient { } public void addGroup(AddGroupWsRequest request) { - wsClient.execute(newPostRequest("api/permissions/add_group") + wsClient.execute(newPostRequest(action("add_group")) .setParam("permission", request.getPermission()) .setParam("projectId", request.getProjectId()) .setParam("projectKey", request.getProjectKey()) .setParam("groupId", request.getGroupId()) .setParam("groupName", request.getGroupName())); } + + public void addGroupToTemplate(AddGroupToTemplateWsRequest request) { + wsClient.execute(newPostRequest(action("add_group_to_template")) + .setParam("groupId", request.getGroupId()) + .setParam("groupName", request.getGroupName()) + .setParam("permission", request.getPermission()) + .setParam("templateId", request.getTemplateId()) + .setParam("templateName", request.getTemplateName())); + } + + private static String action(String action) { + return ENDPOINT + action; + } } |