Skip to content

Commit

Permalink
backport of commit ec7a800 (#17282)
Browse files Browse the repository at this point in the history
Co-authored-by: Derek Menteer <[email protected]>
  • Loading branch information
hc-github-team-consul-core and hashi-derek authored May 10, 2023
1 parent 734d7a2 commit 9b5f872
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions agent/consul/health_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,14 @@ func (h *Health) ServiceNodes(args *structs.ServiceSpecificRequest, reply *struc
f = h.serviceNodesDefault
}

authzContext := acl.AuthorizerContext{
Peer: args.PeerName,
}
authz, err := h.srv.ResolveTokenAndDefaultMeta(args.Token, &args.EnterpriseMeta, &authzContext)
if err != nil {
return err
}

if err := h.srv.validateEnterpriseRequest(&args.EnterpriseMeta, false); err != nil {
return err
}
Expand All @@ -236,14 +244,6 @@ func (h *Health) ServiceNodes(args *structs.ServiceSpecificRequest, reply *struc
return err
}

authzContext := acl.AuthorizerContext{
Peer: args.PeerName,
}
authz, err := h.srv.ResolveTokenAndDefaultMeta(args.Token, &args.EnterpriseMeta, &authzContext)
if err != nil {
return err
}

// If we're doing a connect or ingress query, we need read access to the service
// we're trying to find proxies for, so check that.
if args.Connect || args.Ingress {
Expand Down

0 comments on commit 9b5f872

Please sign in to comment.