luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

acl: memdb filter of tokens-by-policy was inverted (#5575) 

The inversion wasn't noticed because the parallel execution of TokenList
tests was operating incorrectly due to variable shadowing.
This commit is contained in:
R.B. Boyer 2019-03-27 15:24:44 -05:00 committed by GitHub
parent ae509858ab
commit ab57b02ff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/consul/state/acl.go
View File

@ -523,16 +523,16 @@ func (s *Store) ACLTokenList(ws memdb.WatchSet, local, global bool, policy strin
iter = memdb.NewFilterIterator(iter, func(raw interface{}) bool {
token, ok := raw.(*structs.ACLToken)
if !ok {
return false
return true
}
if global && !token.Local {
return true
return false
} else if local && token.Local {
return true
return false
}
return false
return true
})
}
} else if global == local {

2
agent/consul/state/acl_test.go
View File

@ -769,7 +769,6 @@ func TestStateStore_ACLToken_List(t *testing.T) {
policy: "a0625e95-9b3e-42de-a8d6-ceef5b6f3286",
accessors: []string{
"47eea4da-bda1-48a6-901c-3e36d2d9262f",
"4915fc9d-3726-4171-b588-6c271f45eecd",
},
},
{
@ -788,6 +787,7 @@ func TestStateStore_ACLToken_List(t *testing.T) {
}
for _, tc := range cases {
tc := tc // capture range variable
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
_, tokens, err := s.ACLTokenList(nil, tc.local, tc.global, tc.policy)