command/serve.go

@@ -6,17 +6,18 @@ import (
 	"fmt"
 	"gitea.illuad.fr/adrien/middleman"
 	"gitea.illuad.fr/adrien/middleman/flag"
-	"gitea.illuad.fr/adrien/middleman/pkg/fastrp"
 	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v3"
 	"golang.org/x/sync/errgroup"
 	"net"
 	"net/http"
+	"net/http/httputil"
 	"net/netip"
 	"net/url"
 	"regexp"
 	"slices"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -35,7 +36,8 @@ 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 {
-	frp *fastrp.FastRP
+	rp       *httputil.ReverseProxy
+	connPool *sync.Pool
 }
 
 // ServeCmd is the command name.
@@ -75,8 +77,8 @@ const (
 	defaultHealthEndpoint = "/healthz"
 	// defaultHealthListenAddr is the proxy health endpoint default listen address and port.
 	defaultHealthListenAddr = "127.0.0.1:5732"
-	// defaultAllowedRequests is the default allowed requests. Note that they should be sufficient to make Traefik work properly.
-	defaultAllowedRequests = "/v1.\\d{1,2}/(version|containers/(?:json|[a-zA-Z0-9]{64}/json)|events)$"
+	// defaultAllowedRequest is the proxy default allowed request.
+	defaultAllowedRequest = "^/(version|containers/.*|events.*)$"
 )
 
 var s serve
@@ -84,7 +86,7 @@ var s serve
 var (
 	containerMethodRegex = map[string]methodRegex{
 		"*": {
-			http.MethodGet: regexp.MustCompile(defaultAllowedRequests),
+			http.MethodGet: regexp.MustCompile(defaultAllowedRequest),
 		},
 	}
 	applicatorURLRegex = regexp.MustCompile(`^([a-zA-Z0-9][a-zA-Z0-9_.-]+)\(((?:(?:GET|HEAD|POST|PUT|PATCH|DELETE|CONNECT|TRACE|OPTIONS)(?:,(?:GET|HEAD|POST|PUT|PATCH|DELETE|CONNECT|TRACE|OPTIONS))*)?)\):(.*)$`)
@@ -137,7 +139,7 @@ func (ph *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, http.StatusText(code), code)
 			return
 		}
-		ph.frp.ServeHTTP(w, r)
+		ph.proxyRequest(w, r)
 		return
 	}
 	host, _, _ := net.SplitHostPort(r.RemoteAddr)
@@ -147,7 +149,7 @@ func (ph *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				http.Error(w, http.StatusText(code), code)
 				return
 			}
-			ph.frp.ServeHTTP(w, r)
+			ph.proxyRequest(w, r)
 			return
 		}
 	}
@@ -155,6 +157,13 @@ func (ph *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	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 {
@@ -217,11 +226,33 @@ func (s serve) action(ctx context.Context, command *cli.Command) error {
 		return err
 	}
 	dummyURL, _ := url.Parse("http://dummy")
-	srv := &http.Server{ // #nosec: G112
-		Handler: &ProxyHandler{
-			frp: fastrp.NewRP("unix", command.String(dockerSocketPathFlagName), dummyURL),
+	/*
+		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: 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
@@ -419,7 +450,7 @@ func addRequests() cli.Flag {
 		Usage:    "add requests",
 		Sources:  middleman.PluckEnvVar(EnvVarPrefix, addRequestsFlagName),
 		// Local:    true, // Required to trigger the Action when this flag is set via the environment variable, see https://github.com/urfave/cli/issues/2041.
-		Value:   []string{"*:" + defaultAllowedRequests},
+		Value:   []string{"*:" + defaultAllowedRequest},
 		Aliases: middleman.PluckAlias(ServeCmd, addRequestsFlagName),
 		Action: func(ctx context.Context, command *cli.Command, requests []string) error {
 			clear(containerMethodRegex)

pkg/fastrp/fastrp.go

@@ -1,41 +0,0 @@
-package fastrp
-
-import (
-	"context"
-	"net"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"sync"
-)
-
-type FastRP struct {
-	rp       *httputil.ReverseProxy
-	connPool *sync.Pool
-}
-
-func NewRP(network, address string, url *url.URL) *FastRP {
-	roundTripper := &http.Transport{
-		DialContext: func(_ context.Context, _ string, _ string) (net.Conn, error) {
-			return net.Dial(network, address)
-		},
-		MaxIdleConns: 10,
-	}
-	frp := &FastRP{
-		rp: httputil.NewSingleHostReverseProxy(url),
-		connPool: &sync.Pool{
-			New: func() any {
-				return roundTripper.Clone()
-			},
-		},
-	}
-	frp.rp.Transport = frp.connPool.Get().(http.RoundTripper)
-	return frp
-}
-
-func (frp *FastRP) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	roundTripper := frp.connPool.Get().(http.RoundTripper)
-	defer frp.connPool.Put(roundTripper)
-	frp.rp.Transport = roundTripper
-	frp.rp.ServeHTTP(w, r)
-}