extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-22 18:51:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

more http listen improvements (#32)

Browse Source
This commit is contained in:
Michael Quigley 2022-08-18 17:09:38 -04:00
parent 20aface112
commit 1e49cbe243
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
endpoints/listen/http.go
View File

@ -35,17 +35,17 @@ func NewHTTP(cfg *Config) (*httpListen, error) {
} }
zCfg.ConfigTypes = []string{model.ZrokProxyConfig} zCfg.ConfigTypes = []string{model.ZrokProxyConfig}
zCtx := ziti.NewContextWithConfig(zCfg) zCtx := ziti.NewContextWithConfig(zCfg)
zDialCtx := ZitiDialContext{Context: zCtx} zDialCtx := zitiDialContext{ctx: zCtx}
zTransport := http.DefaultTransport.(*http.Transport).Clone() zTransport := http.DefaultTransport.(*http.Transport).Clone()
zTransport.DialContext = zDialCtx.Dial zTransport.DialContext = zDialCtx.Dial
proxy, err := NewServiceProxy(zCtx, &resolver{}) proxy, err := NewServiceProxy(zCtx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
proxy.Transport = zTransport proxy.Transport = zTransport
handler := basicAuth(util.NewProxyHandler(proxy), "zrok", &resolver{}, zCtx) handler := basicAuth(util.NewProxyHandler(proxy), "zrok", zCtx)
return &httpListen{ return &httpListen{
cfg: cfg, cfg: cfg,
zCtx: zCtx, zCtx: zCtx,
@ -57,21 +57,17 @@ func (self *httpListen) Run() error {
return http.ListenAndServe(self.cfg.Address, self.handler) return http.ListenAndServe(self.cfg.Address, self.handler)
} }
type ZitiDialContext struct { type zitiDialContext struct {
Context ziti.Context ctx ziti.Context
} }
func (self *ZitiDialContext) Dial(_ context.Context, _ string, addr string) (net.Conn, error) { func (self *zitiDialContext) Dial(_ context.Context, _ string, addr string) (net.Conn, error) {
svcName := strings.Split(addr, ":")[0] // ignore :port (we get passed 'host:port') svcName := strings.Split(addr, ":")[0] // ignore :port (we get passed 'host:port')
return self.Context.Dial(svcName) return self.ctx.Dial(svcName)
} }
type ProxyServiceResolver interface { func NewServiceProxy(ctx ziti.Context) (*httputil.ReverseProxy, error) {
Service(host string) string proxy := hostTargetReverseProxy(ctx)
}
func NewServiceProxy(ctx ziti.Context, p ProxyServiceResolver) (*httputil.ReverseProxy, error) {
proxy := hostTargetReverseProxy(ctx, p)
director := proxy.Director director := proxy.Director
proxy.Director = func(req *http.Request) { proxy.Director = func(req *http.Request) {
director(req) director(req)
@ -88,9 +84,9 @@ func NewServiceProxy(ctx ziti.Context, p ProxyServiceResolver) (*httputil.Revers
return proxy, nil return proxy, nil
} }
func hostTargetReverseProxy(ctx ziti.Context, r ProxyServiceResolver) *httputil.ReverseProxy { func hostTargetReverseProxy(ctx ziti.Context) *httputil.ReverseProxy {
director := func(req *http.Request) { director := func(req *http.Request) {
targetSvc := r.Service(req.Host) targetSvc := resolveService(req.Host)
if svc, found := getRefreshedService(targetSvc, ctx); found { if svc, found := getRefreshedService(targetSvc, ctx); found {
if cfg, found := svc.Configs[model.ZrokProxyConfig]; found { if cfg, found := svc.Configs[model.ZrokProxyConfig]; found {
logrus.Infof("auth model: %v", cfg) logrus.Infof("auth model: %v", cfg)
@ -152,21 +148,9 @@ func singleJoiningSlash(a, b string) string {
return a + b return a + b
} }
func getRefreshedService(name string, ctx ziti.Context) (*edge.Service, bool) { func basicAuth(handler http.Handler, realm string, ctx ziti.Context) http.HandlerFunc {
svc, found := ctx.GetService(name)
if !found {
if err := ctx.RefreshServices(); err != nil {
logrus.Errorf("error refreshing services: %v", err)
return nil, false
}
return ctx.GetService(name)
}
return svc, found
}
func basicAuth(handler http.Handler, realm string, rslv ProxyServiceResolver, ctx ziti.Context) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
svcName := rslv.Service(r.Host) svcName := resolveService(r.Host)
if svc, found := getRefreshedService(svcName, ctx); found { if svc, found := getRefreshedService(svcName, ctx); found {
if cfg, found := svc.Configs[model.ZrokProxyConfig]; found { if cfg, found := svc.Configs[model.ZrokProxyConfig]; found {
if scheme, found := cfg["auth_scheme"]; found { if scheme, found := cfg["auth_scheme"]; found {
@ -242,9 +226,7 @@ func writeUnauthorizedResponse(w http.ResponseWriter, realm string) {
w.Write([]byte("No Authorization\n")) w.Write([]byte("No Authorization\n"))
} }
type resolver struct{} func resolveService(host string) string {
func (r *resolver) Service(host string) string {
logrus.Debugf("host = '%v'", host) logrus.Debugf("host = '%v'", host)
tokens := strings.Split(host, ".") tokens := strings.Split(host, ".")
if len(tokens) > 0 { if len(tokens) > 0 {
@ -252,3 +234,15 @@ func (r *resolver) Service(host string) string {
} }
return "zrok" return "zrok"
} }
func getRefreshedService(name string, ctx ziti.Context) (*edge.Service, bool) {
svc, found := ctx.GetService(name)
if !found {
if err := ctx.RefreshServices(); err != nil {
logrus.Errorf("error refreshing services: %v", err)
return nil, false
}
return ctx.GetService(name)
}
return svc, found
}