mirror of
https://github.com/openziti/zrok.git
synced 2025-06-24 03:31:57 +02:00
include the agent_enrollment indirection in agentPingHandler (#967)
This commit is contained in:
parent
9cff8aa1bb
commit
e11beb8f6f
@ -17,7 +17,26 @@ func newAgentPingHandler() *agentPingHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *agentPingHandler) Handle(params agent.PingParams, principal *rest_model_zrok.Principal) middleware.Responder {
|
func (h *agentPingHandler) Handle(params agent.PingParams, principal *rest_model_zrok.Principal) middleware.Responder {
|
||||||
acli, aconn, err := agentController.NewAgentClient(params.Body.EnvZID, cfg.AgentController)
|
trx, err := str.Begin()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Errorf("error starting transaction for '%v': %v", principal.Email, err)
|
||||||
|
return agent.NewPingInternalServerError()
|
||||||
|
}
|
||||||
|
defer trx.Rollback()
|
||||||
|
|
||||||
|
env, err := str.FindEnvironmentForAccount(params.Body.EnvZID, int(principal.ID), trx)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Errorf("error finding environment '%v' for '%v': %v", params.Body.EnvZID, principal.Email, err)
|
||||||
|
return agent.NewPingUnauthorized()
|
||||||
|
}
|
||||||
|
|
||||||
|
ae, err := str.FindAgentEnrollmentForEnvironment(env.Id, trx)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Errorf("error finding agent enrollment for '%v' (%v): %v", params.Body.EnvZID, principal.Email, err)
|
||||||
|
return agent.NewPingBadGateway()
|
||||||
|
}
|
||||||
|
|
||||||
|
acli, aconn, err := agentController.NewAgentClient(ae.Token, cfg.AgentController)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Errorf("error creating agent client for '%v' (%v): %v", params.Body.EnvZID, principal.Email, err)
|
logrus.Errorf("error creating agent client for '%v' (%v): %v", params.Body.EnvZID, principal.Email, err)
|
||||||
return agent.NewPingInternalServerError()
|
return agent.NewPingInternalServerError()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user