test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复修改项目权限验证的问题

This commit is contained in:
CaptainB 2023-04-13 12:35:39 +08:00 committed by 刘瑞斌
parent 1831344840
commit a7b0ca8192
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/sdk-parent/sdk/src/main/java/io/metersphere/security/MsPermissionAnnotationMethodInterceptor.java
View File

@ -1,5 +1,6 @@
package io.metersphere.security;
import io.metersphere.base.domain.Project;
import io.metersphere.commons.utils.SessionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
@ -41,6 +42,9 @@ public class MsPermissionAnnotationMethodInterceptor extends PermissionAnnotatio
if (StringUtils.isEmpty(projectId) && isExistField(argument, "projectId")) {
projectId = (String) MethodUtils.invokeMethod(argument, "getProjectId");
}
if (StringUtils.equals(parameters[i].getName(), "project") && argument instanceof Project) {
projectId = ((Project) argument).getId();
}
if (StringUtils.isEmpty(workspaceId) && isExistField(argument, "workspaceId")) {
workspaceId = (String) MethodUtils.invokeMethod(argument, "getWorkspaceId");
}

6
project-management/backend/src/main/java/io/metersphere/controller/ProjectController.java
View File

@ -84,10 +84,10 @@ public class ProjectController {
}
@PostMapping("/update")
@MsAuditLog(module = OperLogModule.PROJECT_PROJECT_MANAGER, type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#Project.id)", content = "#msClass.getLogDetails(#Project.id)", msClass = BaseProjectService.class)
@MsAuditLog(module = OperLogModule.PROJECT_PROJECT_MANAGER, type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#project.id)", content = "#msClass.getLogDetails(#project.id)", msClass = BaseProjectService.class)
@RequiresPermissions(value = {PermissionConstants.WORKSPACE_PROJECT_MANAGER_READ_EDIT, PermissionConstants.PROJECT_MANAGER_READ_EDIT}, logical = Logical.OR)
public void updateProject(@RequestBody AddProjectRequest Project) {
projectService.updateProject(Project);
public void updateProject(@RequestBody AddProjectRequest project) {
projectService.updateProject(project);
}
@PostMapping("/member/update")

6
system-setting/backend/src/main/java/io/metersphere/controller/SystemProjectController.java
View File

@ -98,10 +98,10 @@ public class SystemProjectController {
}
@PostMapping("/update")
@MsAuditLog(module = OperLogModule.PROJECT_PROJECT_MANAGER, type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#Project.id)", content = "#msClass.getLogDetails(#Project.id)", msClass = BaseProjectService.class)
@MsAuditLog(module = OperLogModule.PROJECT_PROJECT_MANAGER, type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#project.id)", content = "#msClass.getLogDetails(#project.id)", msClass = BaseProjectService.class)
@RequiresPermissions(value = {PermissionConstants.WORKSPACE_PROJECT_MANAGER_READ_EDIT, PermissionConstants.PROJECT_MANAGER_READ_EDIT}, logical = Logical.OR)
public void updateProject(@RequestBody AddProjectRequest Project) {
systemProjectService.updateProject(Project);
public void updateProject(@RequestBody AddProjectRequest project) {
systemProjectService.updateProject(project);
}
@PostMapping("/member/update")