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

tui; broken proxy on second attempt :(

Browse Source
This commit is contained in:
Michael Quigley
2022-08-09 13:57:45 -04:00
parent eaa0d1e9b5
commit a863fd63f8
5 changed files with 110 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
util/proxy.go
View File

@ -7,6 +7,7 @@ import (
"net/http/httputil"
"net/url"
"strings"
"sync/atomic"
)
type ProxyServiceResolver interface {
@ -23,7 +24,7 @@ func NewProxy(target string) (*httputil.ReverseProxy, error) {
director := proxy.Director
proxy.Director = func(req *http.Request) {
director(req)
logrus.Infof("-> %v", req.URL.String())
logrus.Debugf("-> %v", req.URL.String())
req.Header.Set("X-Proxy", "zrok")
}
proxy.ModifyResponse = func(resp *http.Response) error {
@ -41,7 +42,7 @@ func NewServiceProxy(p ProxyServiceResolver) (*httputil.ReverseProxy, error) {
director := proxy.Director
proxy.Director = func(req *http.Request) {
director(req)
logrus.Infof("-> %v", req.URL.String())
logrus.Debugf("-> %v", req.URL.String())
req.Header.Set("X-Proxy", "zrok")
}
proxy.ModifyResponse = func(resp *http.Response) error {
@ -55,11 +56,24 @@ func NewServiceProxy(p ProxyServiceResolver) (*httputil.ReverseProxy, error) {
}
type proxyHandler struct {
proxy *httputil.ReverseProxy
proxy *httputil.ReverseProxy
requests int32
}
func NewProxyHandler(proxy *httputil.ReverseProxy) *proxyHandler {
return &proxyHandler{proxy}
handler := &proxyHandler{proxy: proxy}
director := proxy.Director
proxy.Director = func(req *http.Request) {
atomic.AddInt32(&handler.requests, 1)
director(req)
}
return handler
}
func (self *proxyHandler) Requests() int32 {
return atomic.LoadInt32(&self.requests)
}
func (self *proxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@ -83,6 +97,8 @@ func hostTargetReverseProxy(r ProxyServiceResolver) *httputil.ReverseProxy {
// explicitly disable User-Agent so it's not set to default value
req.Header.Set("User-Agent", "")
}
} else {
logrus.Errorf("error proxying: %v", err)
}
}
return &httputil.ReverseProxy{Director: director}