status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-09 13:26:07 +00:00
Code Issues Projects Releases Wiki Activity

acl: fix bug in 'consul members' filtering with partitions (#11263)

Browse Source
This commit is contained in:
R.B. Boyer 2021-10-13 09:18:16 -05:00 committed by GitHub
parent 585f78f35a
commit 0c94095dfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/11263.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
acl: **(Enterprise only)** Fix bug in 'consul members' filtering with partitions.
```

2
agent/acl.go
View File

@ -150,11 +150,11 @@ func (a *Agent) filterMembers(token string, members *[]serf.Member) error {
} }
var authzContext acl.AuthorizerContext var authzContext acl.AuthorizerContext
a.agentEnterpriseMeta().FillAuthzContext(&authzContext)
// Filter out members based on the node policy. // Filter out members based on the node policy.
m := *members m := *members
for i := 0; i < len(m); i++ { for i := 0; i < len(m); i++ {
node := m[i].Name node := m[i].Name
serfMemberFillAuthzContext(&m[i], &authzContext)
if authz.NodeRead(node, &authzContext) == acl.Allow { if authz.NodeRead(node, &authzContext) == acl.Allow {
continue continue
} }

13
agent/acl_oss.go Normal file
View File

@ -0,0 +1,13 @@
// +build !consulent
package agent
import (
"github.com/hashicorp/serf/serf"
"github.com/hashicorp/consul/acl"
)
func serfMemberFillAuthzContext(m *serf.Member, ctx *acl.AuthorizerContext) {
// no-op
}