extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-20 09:48:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

share public cleanup+organization lint

Browse Source
This commit is contained in:
Michael Quigley 2023-08-28 13:54:03 -04:00
parent 9e48da7bad
commit ce06804a0f
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
1 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
cmd/zrok/sharePublic.go
View File

@ -9,7 +9,6 @@ import (
"github.com/openziti/zrok/environment/env_core" "github.com/openziti/zrok/environment/env_core"
"github.com/openziti/zrok/sdk" "github.com/openziti/zrok/sdk"
"github.com/openziti/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"os" "os"
@ -106,7 +105,7 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
signal.Notify(c, os.Interrupt, syscall.SIGTERM) signal.Notify(c, os.Interrupt, syscall.SIGTERM)
go func() { go func() {
<-c <-c
cmd.destroy(env, shr) cmd.shutdown(env, shr)
os.Exit(0) os.Exit(0)
}() }()
@ -121,14 +120,21 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
Insecure: cmd.insecure, Insecure: cmd.insecure,
RequestsChan: requests, RequestsChan: requests,
} }
_, err = cmd.proxyBackendMode(cfg)
be, err := proxy.NewBackend(cfg)
if err != nil { if err != nil {
if !panicInstead { if !panicInstead {
tui.Error("unable to create proxy backend handler", err) tui.Error("error creating proxy backend", err)
} }
panic(err) panic(err)
} }
go func() {
if err := be.Run(); err != nil {
logrus.Errorf("error running http proxy backend: %v", err)
}
}()
case "web": case "web":
cfg := &proxy.CaddyWebBackendConfig{ cfg := &proxy.CaddyWebBackendConfig{
IdentityPath: zif, IdentityPath: zif,
@ -136,14 +142,21 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
ShrToken: shr.Token, ShrToken: shr.Token,
Requests: requests, Requests: requests,
} }
_, err = cmd.webBackendMode(cfg)
be, err := proxy.NewCaddyWebBackend(cfg)
if err != nil { if err != nil {
if !panicInstead { if !panicInstead {
tui.Error("unable to create web backend handler", err) tui.Error("unable to create web backend", err)
} }
panic(err) panic(err)
} }
go func() {
if err := be.Run(); err != nil {
logrus.Errorf("error running http web backend: %v", err)
}
}()
default: default:
tui.Error("invalid backend mode", nil) tui.Error("invalid backend mode", nil)
} }
@ -176,41 +189,11 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
} }
close(requests) close(requests)
cmd.destroy(env, shr) cmd.shutdown(env, shr)
} }
} }
func (cmd *sharePublicCommand) proxyBackendMode(cfg *proxy.BackendConfig) (endpoints.RequestHandler, error) { func (cmd *sharePublicCommand) shutdown(root env_core.Root, shr *sdk.Share) {
be, err := proxy.NewBackend(cfg)
if err != nil {
return nil, errors.Wrap(err, "error creating http proxy backend")
}
go func() {
if err := be.Run(); err != nil {
logrus.Errorf("error running http proxy backend: %v", err)
}
}()
return be, nil
}
func (cmd *sharePublicCommand) webBackendMode(cfg *proxy.CaddyWebBackendConfig) (endpoints.RequestHandler, error) {
be, err := proxy.NewCaddyWebBackend(cfg)
if err != nil {
return nil, errors.Wrap(err, "error creating http web backend")
}
go func() {
if err := be.Run(); err != nil {
logrus.Errorf("error running http web backend: %v", err)
}
}()
return be, nil
}
func (cmd *sharePublicCommand) destroy(root env_core.Root, shr *sdk.Share) {
logrus.Debugf("shutting down '%v'", shr.Token) logrus.Debugf("shutting down '%v'", shr.Token)
if err := sdk.DeleteShare(root, shr); err != nil { if err := sdk.DeleteShare(root, shr); err != nil {
logrus.Errorf("error shutting down '%v': %v", shr.Token, err) logrus.Errorf("error shutting down '%v': %v", shr.Token, err)