Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: 修复修改项目权限验证的问题
  • Loading branch information
liuruibin committed Apr 13, 2023
1 parent 1831344 commit a7b0ca8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
@@ -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;
Expand Down Expand Up @@ -41,6 +42,9 @@ public void assertAuthorized(MethodInvocation mi) throws AuthorizationException
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");
}
Expand Down
Expand Up @@ -84,10 +84,10 @@ public Pager<List<ProjectDTO>> getProjectList(@PathVariable int goPage, @PathVar
}

@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")
Expand Down
Expand Up @@ -98,10 +98,10 @@ public void deleteProject(@PathVariable(value = "projectId") String projectId) {
}

@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")
Expand Down

0 comments on commit a7b0ca8

Please sign in to comment.