adrien/middleman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use a sync.Pool to reuse connexions

Browse Source
This commit is contained in:
Adrien PONSIN 2025-04-17 18:41:32 +02:00
parent 17aa156fa5
commit c55dec6bc4
No known key found for this signature in database
GPG Key ID: 7B4D4A32C05C475E
1 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
command/serve.go
View File

@ -17,6 +17,7 @@ import (
"regexp"
"slices"
"strings"
"sync"
"time"
)
@ -36,24 +37,7 @@ type methodRegex = map[string]*regexp.Regexp
// ProxyHandler takes an incoming request and sends it to another server, proxying the response back to the client.
type ProxyHandler struct {
rp *httputil.ReverseProxy
}
// ErrHTTPMethodNotAllowed is returned if the request's HTTP method is not allowed for this container.
type ErrHTTPMethodNotAllowed struct {
httpMethod string
}
// ErrNoMatch is returned if the request's URL path is not allowed for this container.
type ErrNoMatch struct {
path, httpMethod string
}
func (e ErrHTTPMethodNotAllowed) Error() string {
return fmt.Sprintf("%s is not in the list of HTTP methods allowed this container", e.httpMethod)
}
func (e ErrNoMatch) Error() string {
return fmt.Sprintf("%s does not match any registered regular expression for this HTTP method (%s)", e.path, e.httpMethod)
connPool *sync.Pool
}
// ServeCmd is the command name.
@ -155,7 +139,7 @@ func (ph *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
http.Error(w, http.StatusText(code), code)
return
}
ph.rp.ServeHTTP(w, r)
ph.proxyRequest(w, r)
return
}
host, _, _ := net.SplitHostPort(r.RemoteAddr)
@ -165,32 +149,21 @@ func (ph *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
http.Error(w, http.StatusText(code), code)
return
}
ph.rp.ServeHTTP(w, r)
ph.proxyRequest(w, r)
return
}
}
/*
for containerName, mr = range containerMethodRegex {
resolvedIPs, err := net.LookupIP(containerName)
if err != nil {
continue
}
for _, resolvedIP := range resolvedIPs {
if resolvedIP.Equal(net.ParseIP(host)) {
if code := ph.checkMethodAndRegex(mr, r, containerName); code != http.StatusOK {
http.Error(w, http.StatusText(code), code)
return
}
ph.rp.ServeHTTP(w, r)
return
}
}
}
*/
logDeniedRequest(r, http.StatusUnauthorized, "this container is not on the list of authorized ones")
http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
}
func (ph *ProxyHandler) proxyRequest(w http.ResponseWriter, r *http.Request) {
transport := ph.connPool.Get().(*http.Transport)
defer ph.connPool.Put(transport)
ph.rp.Transport = transport
ph.rp.ServeHTTP(w, r)
}
func (ph *ProxyHandler) isContainerAuthorized(containerName, host string) bool {
resolvedIPs, err := net.LookupIP(containerName)
if err != nil {
@ -253,15 +226,33 @@ func (s serve) action(ctx context.Context, command *cli.Command) error {
return err
}
dummyURL, _ := url.Parse("http://dummy")
/*
rp := httputil.NewSingleHostReverseProxy(dummyURL)
rp.Transport = &http.Transport{
DialContext: func(_ context.Context, _ string, _ string) (net.Conn, error) {
return net.Dial("unix", command.String(dockerSocketPathFlagName))
},
MaxIdleConns: 10,
}
*/
transport := &http.Transport{
DialContext: func(_ context.Context, _ string, _ string) (net.Conn, error) {
return net.Dial("unix", command.String(dockerSocketPathFlagName))
},
MaxIdleConns: 10,
}
ph := &ProxyHandler{
rp: httputil.NewSingleHostReverseProxy(dummyURL),
connPool: &sync.Pool{
New: func() any {
return transport.Clone()
},
},
}
srv := &http.Server{ // #nosec: G112
Handler: &ProxyHandler{rp: rp},
Handler: ph,
}
ph.rp.Transport = ph.connPool.Get().(*http.Transport)
s.group.Go(func() error {
if err = srv.Serve(l); err != nil && !errors.Is(err, http.ErrServerClosed) {
return err