extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-17 11:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not call 'ziti.NewContext' multiple times (#1023)

Browse Source
This commit is contained in:
Michael Quigley
2025-08-06 10:46:24 -04:00
parent 14c849f62d
commit 788418cff7
9 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controller/agentRemoteShare.go
View File

@ -2,9 +2,9 @@ package controller
import (
"context"
"github.com/go-openapi/runtime/middleware"
"github.com/openziti/zrok/agent/agentGrpc"
"github.com/openziti/zrok/controller/agentController"
"github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti/zrok/rest_server_zrok/operations/agent"
"github.com/sirupsen/logrus"
@ -37,17 +37,17 @@ func (h *agentRemoteShareHandler) Handle(params agent.RemoteShareParams, princip
}
_ = trx.Rollback() // ...or will block share trx on sqlite
acli, aconn, err := agentController.NewAgentClient(ae.Token, cfg.AgentController)
agentClient, agentConn, err := agentCtrl.NewClient(ae.Token)
if err != nil {
logrus.Errorf("error creating agent client for '%v' (%v): %v", params.Body.EnvZID, principal.Email, err)
return agent.NewRemoteShareInternalServerError()
}
defer aconn.Close()
defer agentConn.Close()
out := &agent.RemoteShareOKBody{}
switch params.Body.ShareMode {
case "public":
token, frontendEndpoints, err := h.publicShare(params, acli)
token, frontendEndpoints, err := h.publicShare(params, agentClient)
if err != nil {
logrus.Errorf("error creating public remote agent share for '%v' (%v): %v", params.Body.EnvZID, principal.Email, err)
return agent.NewRemoteShareBadGateway()
@ -56,7 +56,7 @@ func (h *agentRemoteShareHandler) Handle(params agent.RemoteShareParams, princip
out.FrontendEndpoints = frontendEndpoints
case "private":
token, err := h.privateShare(params, acli)
token, err := h.privateShare(params, agentClient)
if err != nil {
logrus.Errorf("error creating private remote agent share for '%v' (%v): %v", params.Body.EnvZID, principal.Email, err)
return agent.NewRemoteShareBadGateway()
@ -64,7 +64,7 @@ func (h *agentRemoteShareHandler) Handle(params agent.RemoteShareParams, princip
out.Token = token
case "reserved":
token, err := h.reservedShare(params, acli)
token, err := h.reservedShare(params, agentClient)
if err != nil {
logrus.Errorf("error creating reserved remote agent share for '%v' (%v): %v", params.Body.EnvZID, principal.Email, err)
return agent.NewRemoteShareBadGateway()