Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions pkg/eval/evaluator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,40 @@ func TestGetPermissions(t *testing.T) {
]
}
]
}
`,
request: adsapi.RequestContext{Subject: &alice, ServiceName: "erp", Attributes: map[string]interface{}{}},
results: []pms.Permission{},
},
{
// Deny policy with an explicit permission that has empty resource
// AND empty actions = deny everything. All granted permissions
// must be removed.
stream: `
{
"services": [
{
"name": "erp",
"policies": [
{
"id": "policy1",
"effect": "grant",
"permissions": [
{ "resource": "/node1", "actions": ["get","create"] }
],
"principals": [["user:alice"]]
},
{
"id": "policy2",
"effect": "deny",
"permissions": [
{ "resource": "", "actions": [] }
],
"principals": [["user:alice"]]
}
]
}
]
}
`,
request: adsapi.RequestContext{Subject: &alice, ServiceName: "erp", Attributes: map[string]interface{}{}},
Expand Down
8 changes: 8 additions & 0 deletions pkg/eval/evaluator_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,14 @@ func calculatePermissions(grantedPermissions, deniedPermissions []pms.Permission
var denyAllActions map[string]bool

for _, dp := range deniedPermissions {
// A denied permission with no resource and no expression matches every
// resource. If it additionally has no actions, it denies ALL actions on
// ALL resources -> no permission survives. Return empty immediately,
// matching IsAllowed's "empty resource + empty actions = deny all"
// semantics in matchResourceAction.
if len(dp.Resource) == 0 && len(dp.ResourceExpression) == 0 && len(dp.Actions) == 0 {
return nil
}
actions := make(map[string]bool, len(dp.Actions))
for _, a := range dp.Actions {
actions[a] = true
Expand Down
5 changes: 5 additions & 0 deletions pkg/store/etcd/discover.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ func (s *Store) PutRequest(request *ads.RequestContext) (int64, error) {
keys = append(keys, string(kv.Key))
}
go func() {
defer func() {
if r := recover(); r != nil {
log.Errorf("panic in DeleteRequests cleanup goroutine: %v", r)
}
}()
if err := s.DeleteRequests(keys); err != nil {
log.Errorf("failed to delete old discover requests: %v", err)
}
Expand Down
Loading