extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-09 16:15:04 +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

34
controller/agentController/controller.go
View File

@ -2,27 +2,37 @@ package agentController
import (
"context"
"net"
"time"
"github.com/openziti/sdk-golang/ziti"
"github.com/openziti/zrok/agent/agentGrpc"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/resolver"
"net"
"time"
)
func NewAgentClient(serviceName string, cfg *Config) (client agentGrpc.AgentClient, conn *grpc.ClientConn, err error) {
type Controller struct {
zCfg *ziti.Config
zCtx ziti.Context
}
func NewAgentController(cfg *Config) (*Controller, error) {
zCfg, err := ziti.NewConfigFromFile(cfg.IdentityPath)
if err != nil {
return nil, err
}
zCtx, err := ziti.NewContext(zCfg)
if err != nil {
return nil, err
}
return &Controller{zCfg: zCfg, zCtx: zCtx}, nil
}
func (ctrl *Controller) NewClient(serviceName string) (client agentGrpc.AgentClient, conn *grpc.ClientConn, err error) {
opts := []grpc.DialOption{
grpc.WithContextDialer(func(_ context.Context, addr string) (net.Conn, error) {
zcfg, err := ziti.NewConfigFromFile(cfg.IdentityPath)
if err != nil {
return nil, err
}
zctx, err := ziti.NewContext(zcfg)
if err != nil {
return nil, err
}
conn, err := zctx.DialWithOptions(addr, &ziti.DialOptions{ConnectTimeout: 30 * time.Second})
conn, err := ctrl.zCtx.DialWithOptions(addr, &ziti.DialOptions{ConnectTimeout: 30 * time.Second})
if err != nil {
return nil, err
}

8
controller/agentPing.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"
@ -36,14 +36,14 @@ func (h *agentPingHandler) Handle(params agent.PingParams, principal *rest_model
return agent.NewPingBadGateway()
}
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.NewPingInternalServerError()
}
defer aconn.Close()
defer agentConn.Close()
resp, err := acli.Version(context.Background(), &agentGrpc.VersionRequest{})
resp, err := agentClient.Version(context.Background(), &agentGrpc.VersionRequest{})
if err != nil {
logrus.Errorf("error retrieving agent version for '%v' (%v): %v", params.Body.EnvZID, principal.Email, err)
return agent.NewPingBadGateway()

8
controller/agentRemoteAccess.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,12 +37,12 @@ func (h *agentRemoteAccessHandler) Handle(params agent.RemoteAccessParams, princ
}
_ = trx.Rollback() // ...or will block the access 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.NewRemoteAccessInternalServerError()
}
defer aconn.Close()
defer agentConn.Close()
req := &agentGrpc.AccessPrivateRequest{
Token: params.Body.Token,
@ -53,7 +53,7 @@ func (h *agentRemoteAccessHandler) Handle(params agent.RemoteAccessParams, princ
AutoEndPort: uint32(params.Body.AutoEndPort),
ResponseHeaders: params.Body.ResponseHeaders,
}
resp, err := acli.AccessPrivate(context.Background(), req)
resp, err := agentClient.AccessPrivate(context.Background(), req)
if err != nil {
logrus.Errorf("error creating remote agent private access for '%v' (%v): %v", params.Body.EnvZID, principal.Email, err)
return agent.NewRemoteAccessBadGateway()

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()

8
controller/agentRemoteStatus.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"
@ -36,14 +36,14 @@ func (h *agentRemoteStatusHandler) Handle(params agent.RemoteStatusParams, princ
return agent.NewRemoteStatusBadGateway()
}
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.NewRemoteStatusInternalServerError()
}
defer aconn.Close()
defer agentConn.Close()
resp, err := acli.Status(context.Background(), &agentGrpc.StatusRequest{})
resp, err := agentClient.Status(context.Background(), &agentGrpc.StatusRequest{})
if err != nil {
logrus.Errorf("error retrieving remote agent status for '%v' (%v): %v", params.Body.EnvZID, principal.Email, err)
return agent.NewRemoteStatusBadGateway()

8
controller/agentRemoteUnaccess.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,15 +37,15 @@ func (h *agentRemoteUnaccessHandler) Handle(params agent.RemoteUnaccessParams, p
}
_ = trx.Rollback() // ...or will block unshare 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.NewRemoteUnshareInternalServerError()
}
defer aconn.Close()
defer agentConn.Close()
req := &agentGrpc.ReleaseAccessRequest{FrontendToken: params.Body.FrontendToken}
_, err = acli.ReleaseAccess(context.Background(), req)
_, err = agentClient.ReleaseAccess(context.Background(), req)
if err != nil {
logrus.Errorf("error releasing access '%v' for '%v' (%v): %v", params.Body.FrontendToken, params.Body.EnvZID, principal.Email, err)
return agent.NewRemoteUnaccessBadGateway()

8
controller/agentRemoteUnshare.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,15 +37,15 @@ func (h *agentRemoteUnshareHandler) Handle(params agent.RemoteUnshareParams, pri
}
_ = trx.Rollback() // ...or will block unshare 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.NewRemoteUnshareInternalServerError()
}
defer aconn.Close()
defer agentConn.Close()
req := &agentGrpc.ReleaseShareRequest{Token: params.Body.Token}
_, err = acli.ReleaseShare(context.Background(), req)
_, err = agentClient.ReleaseShare(context.Background(), req)
if err != nil {
logrus.Errorf("error releasing share '%v' for '%v' (%v): %v", params.Body.Token, params.Body.EnvZID, principal.Email, err)
return agent.NewRemoteUnshareBadGateway()

7
controller/agentShareHttpHealthcheck.go
View File

@ -5,7 +5,6 @@ import (
"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"
@ -38,12 +37,12 @@ func (h *agentShareHttpHealthcheckHandler) Handle(params agent.ShareHTTPHealthch
}
_ = 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.NewShareHTTPHealthcheckInternalServerError()
}
defer aconn.Close()
defer agentConn.Close()
req := &agentGrpc.ShareHttpHealthcheckRequest{
Token: params.Body.ShareToken,
@ -52,7 +51,7 @@ func (h *agentShareHttpHealthcheckHandler) Handle(params agent.ShareHTTPHealthch
ExpectedHttpResponse: uint32(params.Body.ExpectedHTTPResponse),
TimeoutMs: uint64(params.Body.TimeoutMs),
}
resp, err := acli.ShareHttpHealthcheck(context.Background(), req)
resp, err := agentClient.ShareHttpHealthcheck(context.Background(), req)
if err != nil {
logrus.Infof("error invoking remoted share '%v' http healthcheck for '%v': %v", params.Body.ShareToken, params.Body.EnvZID, err)
return agent.NewShareHTTPHealthcheckBadGateway()

8
controller/controller.go
View File

@ -9,6 +9,7 @@ import (
"github.com/go-openapi/loads"
influxdb2 "github.com/influxdata/influxdb-client-go/v2"
"github.com/jessevdk/go-flags"
"github.com/openziti/zrok/controller/agentController"
"github.com/openziti/zrok/controller/config"
"github.com/openziti/zrok/controller/limits"
"github.com/openziti/zrok/controller/metrics"
@ -26,6 +27,7 @@ var (
str *store.Store
idb influxdb2.Client
limitsAgent *limits.Agent
agentCtrl *agentController.Controller
)
func Run(inCfg *config.Config) error {
@ -71,6 +73,12 @@ func Run(inCfg *config.Config) error {
api.AdminRemoveOrganizationMemberHandler = newRemoveOrganizationMemberHandler()
api.AdminUpdateFrontendHandler = newUpdateFrontendHandler()
if cfg.AgentController != nil {
if i, err := agentController.NewAgentController(cfg.AgentController); err == nil {
agentCtrl = i
logrus.Infof("created new agent controller")
} else {
return errors.Wrap(err, "error creating agent controller")
}
api.AgentEnrollHandler = newAgentEnrollHandler()
api.AgentPingHandler = newAgentPingHandler()
api.AgentRemoteAccessHandler = newAgentRemoteAccessHandler()