Skip to content

Commit

Permalink
fix robot account access issue (#19627)
Browse files Browse the repository at this point in the history
fixes #19622
Resolve the 403 issue occurring when a robot account, equipped with both system and project scope, attempts to access project resources.

Signed-off-by: wang yan <wangyan@vmware.com>
  • Loading branch information
wy65701436 committed Nov 27, 2023
1 parent 4fbcf92 commit 3f72604
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/common/security/robot/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@ func (s *SecurityContext) Can(ctx context.Context, action types.Action, resource
}
if len(sysPolicies) != 0 {
evaluators = evaluators.Add(system.NewEvaluator(s.GetUsername(), sysPolicies))
} else if len(proPolicies) != 0 {
}
if len(proPolicies) != 0 {
evaluators = evaluators.Add(rbac_project.NewEvaluator(s.ctl, rbac_project.NewBuilderForPolicies(s.GetUsername(), proPolicies)))
}
s.evaluator = evaluators
} else {
s.evaluator = rbac_project.NewEvaluator(s.ctl, rbac_project.NewBuilderForPolicies(s.GetUsername(), accesses, filterRobotPolicies))
}
})

return s.evaluator != nil && s.evaluator.HasPermission(ctx, resource, action)
}

Expand Down
52 changes: 52 additions & 0 deletions src/common/security/robot/context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (

"github.com/goharbor/harbor/src/common/rbac"
"github.com/goharbor/harbor/src/common/rbac/project"
"github.com/goharbor/harbor/src/common/rbac/system"
"github.com/goharbor/harbor/src/controller/robot"
"github.com/goharbor/harbor/src/pkg/permission/types"
proModels "github.com/goharbor/harbor/src/pkg/project/models"
Expand Down Expand Up @@ -198,6 +199,57 @@ func TestHasPushPullPerm(t *testing.T) {
assert.True(t, ctx.Can(context.TODO(), rbac.ActionPush, resource) && ctx.Can(context.TODO(), rbac.ActionPull, resource))
}

func TestSysAndProPerm(t *testing.T) {
robot := &robot.Robot{
Level: "system",
Robot: model.Robot{
Name: "test_robot_4",
Description: "desc",
},
Permissions: []*robot.Permission{
{
Kind: "system",
Namespace: "/",
Access: []*types.Policy{
{
Resource: rbac.Resource(fmt.Sprintf("system/%s", rbac.ResourceRepository)),
Action: rbac.ActionList,
},
{
Resource: rbac.Resource(fmt.Sprintf("system/%s", rbac.ResourceGarbageCollection)),
Action: rbac.ActionCreate,
},
},
},
{
Kind: "project",
Namespace: "library",
Access: []*types.Policy{
{
Resource: rbac.Resource(fmt.Sprintf("project/%d/repository", private.ProjectID)),
Action: rbac.ActionPush,
},
{
Resource: rbac.Resource(fmt.Sprintf("project/%d/repository", private.ProjectID)),
Action: rbac.ActionPull,
},
},
},
},
}

ctl := &projecttesting.Controller{}
mock.OnAnything(ctl, "Get").Return(private, nil)

ctx := NewSecurityContext(robot)
ctx.ctl = ctl
resource := project.NewNamespace(private.ProjectID).Resource(rbac.ResourceRepository)
assert.True(t, ctx.Can(context.TODO(), rbac.ActionPush, resource) && ctx.Can(context.TODO(), rbac.ActionPull, resource))

resource = system.NewNamespace().Resource(rbac.ResourceGarbageCollection)
assert.True(t, ctx.Can(context.TODO(), rbac.ActionCreate, resource))
}

func Test_filterRobotPolicies(t *testing.T) {
type args struct {
p *proModels.Project
Expand Down

0 comments on commit 3f72604

Please sign in to comment.