未验证 提交 652c1a4c 编写于 作者: K KubeSphere CI Bot 提交者: GitHub

Merge pull request #3595 from LinuxSuRen/fix-pipe-input-admin

Fix that devops admin users cannot approve a Pipeline input
...@@ -209,4 +209,6 @@ const ( ...@@ -209,4 +209,6 @@ const (
VerbGet = "get" VerbGet = "get"
// VerbWatch represents the verb of watching a resource // VerbWatch represents the verb of watching a resource
VerbWatch = "watch" VerbWatch = "watch"
// VerbDelete represents the verb of deleting a resource
VerbDelete = "delete"
) )
...@@ -307,8 +307,9 @@ func (h *ProjectPipelineHandler) approvableCheck(nodes []clientDevOps.NodesDetai ...@@ -307,8 +307,9 @@ func (h *ProjectPipelineHandler) approvableCheck(nodes []clientDevOps.NodesDetai
if userInfo, ok = request.UserFrom(pipe.Context); ok { if userInfo, ok = request.UserFrom(pipe.Context); ok {
createAuth := authorizer.AttributesRecord{ createAuth := authorizer.AttributesRecord{
User: userInfo, User: userInfo,
Verb: authorizer.VerbCreate, Verb: authorizer.VerbDelete,
Workspace: pipe.Workspace, Workspace: pipe.Workspace,
DevOps: pipe.ProjectName,
Resource: "devopsprojects", Resource: "devopsprojects",
ResourceRequest: true, ResourceRequest: true,
ResourceScope: request.DevOpsScope, ResourceScope: request.DevOpsScope,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册