status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

kv: support `ResultsFilteredByACLs` in list/list keys (#11593)

This commit is contained in:
Dan Upton 2021-12-03 17:31:48 +00:00 committed by GitHub
parent cf1bd585f6
commit 474ef7cc1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/consul/kvs_endpoint.go
View File

@ -204,7 +204,10 @@ func (k *KVS) List(args *structs.KeyRequest, reply *structs.IndexedDirEntries) e
if err != nil {
return err
}
total := len(ent)
ent = FilterDirEnt(authz, ent)
reply.QueryMeta.ResultsFilteredByACLs = total != len(ent)
if len(ent) == 0 {
// Must provide non-zero index to prevent blocking
@ -263,7 +266,9 @@ func (k *KVS) ListKeys(args *structs.KeyListRequest, reply *structs.IndexedKeyLi
reply.Index = index
}
total := len(entries)
entries = FilterDirEnt(authz, entries)
reply.QueryMeta.ResultsFilteredByACLs = total != len(entries)
// Collect the keys from the filtered entries
prefixLen := len(args.Prefix)

12
agent/consul/kvs_endpoint_test.go
View File

@ -287,6 +287,9 @@ func TestKVSEndpoint_List(t *testing.T) {
t.Fatalf("bad: %v", d)
}
}
if dirent.QueryMeta.ResultsFilteredByACLs {
t.Fatal("ResultsFilteredByACLs should not be true")
}
// Try listing a nonexistent prefix
getR.Key = "/nope"
@ -475,6 +478,9 @@ func TestKVSEndpoint_List_ACLDeny(t *testing.T) {
}
}
}
if !dirent.QueryMeta.ResultsFilteredByACLs {
t.Fatal("ResultsFilteredByACLs should be true")
}
}
func TestKVSEndpoint_List_ACLEnableKeyListPolicy(t *testing.T) {
@ -652,6 +658,9 @@ func TestKVSEndpoint_ListKeys(t *testing.T) {
if dirent.Keys[2] != "/test/sub/" {
t.Fatalf("Bad: %v", dirent.Keys)
}
if dirent.QueryMeta.ResultsFilteredByACLs {
t.Fatal("ResultsFilteredByACLs should not be true")
}
// Try listing a nonexistent prefix
getR.Prefix = "/nope"
@ -734,6 +743,9 @@ func TestKVSEndpoint_ListKeys_ACLDeny(t *testing.T) {
if dirent.Keys[1] != "test" {
t.Fatalf("Bad: %v", dirent.Keys)
}
if !dirent.QueryMeta.ResultsFilteredByACLs {
t.Fatal("ResultsFilteredByACLs should be true")
}
}
func TestKVS_Apply_LockDelay(t *testing.T) {