From 691bc9673a24a53dfa62cfcc77cd99234f2183a1 Mon Sep 17 00:00:00 2001 From: John Murret Date: Fri, 14 Jul 2023 14:53:44 -0600 Subject: [PATCH] add a conditional around setting LANFilter.AllSegments to make sure it is valid (#18139) ### Description This is to correct a code problem because this assumes all segments, but when you get to Enterprise, you can be in partition that is not the default partition, in which case specifying all segments does not validate and fails. This is to correct the setting of this filter with `AllSegments` to `true` to only occur when in the the `default` partition. ### Testing & Reproduction steps ### Links ### PR Checklist * [ ] updated test coverage * [ ] external facing docs updated * [ ] appropriate backport labels added * [ ] not a security concern --- agent/ui_endpoint.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/agent/ui_endpoint.go b/agent/ui_endpoint.go index 8f5184969693..5924e23f6f79 100644 --- a/agent/ui_endpoint.go +++ b/agent/ui_endpoint.go @@ -190,7 +190,10 @@ func AgentMembersMapAddrVer(s *HTTPHandlers, req *http.Request) (map[string]stri filter := consul.LANMemberFilter{ Partition: entMeta.PartitionOrDefault(), } - filter.AllSegments = true + if acl.IsDefaultPartition(filter.Partition) { + filter.AllSegments = true + } + lanMembers, err := s.agent.delegate.LANMembers(filter) if err != nil { return nil, err