mirror of
https://github.com/goharbor/harbor.git
synced 2024-12-18 14:47:38 +01:00
Add "delete" into the action map if the action in token is "*"
Fixes #11563, add "delete" into the action map if the action in token is "*" Signed-off-by: Wenkai Yin <yinw@vmware.com>
This commit is contained in:
parent
56b404bfb7
commit
847a513cea
@ -94,13 +94,16 @@ func New(ctx context.Context, name string, access []*registry_token.ResourceActi
|
||||
}
|
||||
actionMap := make(map[types.Action]struct{})
|
||||
for _, a := range ac.Actions {
|
||||
if a == "pull" || a == "*" {
|
||||
switch a {
|
||||
case "pull":
|
||||
actionMap[rbac.ActionPull] = struct{}{}
|
||||
}
|
||||
if a == "push" || a == "*" {
|
||||
case "push":
|
||||
actionMap[rbac.ActionPush] = struct{}{}
|
||||
}
|
||||
if a == "scanner-pull" {
|
||||
case "*":
|
||||
actionMap[rbac.ActionPull] = struct{}{}
|
||||
actionMap[rbac.ActionPush] = struct{}{}
|
||||
actionMap[rbac.ActionDelete] = struct{}{}
|
||||
case "scanner-pull":
|
||||
actionMap[rbac.ActionScannerPull] = struct{}{}
|
||||
}
|
||||
}
|
||||
|
@ -69,6 +69,11 @@ func TestAll(t *testing.T) {
|
||||
action: rbac.ActionPush,
|
||||
expect: true,
|
||||
},
|
||||
{
|
||||
resource: rbac.NewProjectNamespace(2).Resource(rbac.ResourceRepository),
|
||||
action: rbac.ActionDelete,
|
||||
expect: true,
|
||||
},
|
||||
{
|
||||
resource: rbac.NewProjectNamespace(2).Resource(rbac.ResourceRepository),
|
||||
action: rbac.ActionScannerPull,
|
||||
|
Loading…
Reference in New Issue
Block a user