extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-02-08 22:40:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

proxyBackend lint and cleanup (#170)

Browse Source
This commit is contained in:
Michael Quigley 2023-04-14 13:09:54 -04:00
parent ec6ffa72a4
commit 3ec7e4253c
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
5 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zrok/sharePrivate.go
View File

@ -208,7 +208,7 @@ func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) {
} }
func (cmd *sharePrivateCommand) proxyBackendMode(cfg *proxyBackend.Config) (endpoints.RequestHandler, error) { func (cmd *sharePrivateCommand) proxyBackendMode(cfg *proxyBackend.Config) (endpoints.RequestHandler, error) {
be, err := proxyBackend.NewBackend(cfg) be, err := proxyBackend.New(cfg)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error creating http proxy backend") return nil, errors.Wrap(err, "error creating http proxy backend")
} }

2
cmd/zrok/sharePublic.go
View File

@ -210,7 +210,7 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
} }
func (cmd *sharePublicCommand) proxyBackendMode(cfg *proxyBackend.Config) (endpoints.RequestHandler, error) { func (cmd *sharePublicCommand) proxyBackendMode(cfg *proxyBackend.Config) (endpoints.RequestHandler, error) {
be, err := proxyBackend.NewBackend(cfg) be, err := proxyBackend.New(cfg)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error creating http proxy backend") return nil, errors.Wrap(err, "error creating http proxy backend")
} }

2
cmd/zrok/shareReserved.go
View File

@ -188,7 +188,7 @@ func (cmd *shareReservedCommand) run(_ *cobra.Command, args []string) {
} }
func (cmd *shareReservedCommand) proxyBackendMode(cfg *proxyBackend.Config) (endpoints.RequestHandler, error) { func (cmd *shareReservedCommand) proxyBackendMode(cfg *proxyBackend.Config) (endpoints.RequestHandler, error) {
be, err := proxyBackend.NewBackend(cfg) be, err := proxyBackend.New(cfg)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error creating http proxy backend") return nil, errors.Wrap(err, "error creating http proxy backend")
} }

14
endpoints/proxyBackend/http.go
View File

@ -24,14 +24,14 @@ type Config struct {
RequestsChan chan *endpoints.Request RequestsChan chan *endpoints.Request
} }
type backend struct { type Backend struct {
cfg *Config cfg *Config
requests func() int32 requests func() int32
listener edge.Listener listener edge.Listener
handler http.Handler handler http.Handler
} }
func NewBackend(cfg *Config) (*backend, error) { func New(cfg *Config) (*Backend, error) {
options := ziti.ListenOptions{ options := ziti.ListenOptions{
ConnectTimeout: 5 * time.Minute, ConnectTimeout: 5 * time.Minute,
MaxConnections: 64, MaxConnections: 64,
@ -51,7 +51,7 @@ func NewBackend(cfg *Config) (*backend, error) {
} }
handler := util.NewProxyHandler(proxy) handler := util.NewProxyHandler(proxy)
return &backend{ return &Backend{
cfg: cfg, cfg: cfg,
requests: handler.Requests, requests: handler.Requests,
listener: listener, listener: listener,
@ -59,15 +59,15 @@ func NewBackend(cfg *Config) (*backend, error) {
}, nil }, nil
} }
func (self *backend) Run() error { func (b *Backend) Run() error {
if err := http.Serve(self.listener, self.handler); err != nil { if err := http.Serve(b.listener, b.handler); err != nil {
return err return err
} }
return nil return nil
} }
func (self *backend) Requests() func() int32 { func (b *Backend) Requests() func() int32 {
return self.requests return b.requests
} }
func newReverseProxy(cfg *Config) (*httputil.ReverseProxy, error) { func newReverseProxy(cfg *Config) (*httputil.ReverseProxy, error) {

16
endpoints/tunnelBackend/tunnel.go Normal file
View File

@ -0,0 +1,16 @@
package tunnelBackend
import "github.com/openziti/sdk-golang/ziti/edge"
type Config struct {
IdentityPath string
EndpointAddress string
ShrToken string
}
type Backend struct {
cfg *Config
listener edge.Listener
}
func New