feat: Add flag to disable server|client keep-alives

Author: achetronic

api/config_types.go

@@ -40,6 +40,7 @@ type ListenerOptionsT struct {
 	ReadTimeout              string `yaml:"readTimeout"`
 	WriteTimeout             string `yaml:"writeTimeout"`
 	MaxConcurrentConnections int    `yaml:"maxConcurrentConnections"`
+	DisableKeepAlives        bool   `yaml:"disableKeepAlives"`
 
 	// Carry stuff
 	ReadTimeoutDuration  *time.Duration
@@ -105,8 +106,9 @@ type TargetTlsT struct {
 }
 
 type TargetOptionsT struct {
-	DialTimeout string `yaml:"dialTimeout"`
-	KeepAlive   string `yaml:"keepAlive"`
+	DialTimeout       string `yaml:"dialTimeout"`
+	KeepAlive         string `yaml:"keepAlive"`
+	DisableKeepAlives bool   `yaml:"disableKeepAlives"`
 
 	// Carry stuff
 	DialTimeoutDuration *time.Duration

charts/bifrost/Chart.yaml

@@ -5,8 +5,8 @@ type: application
 description: >-
   A Helm chart for bifrost, a lightweight S3 proxy that re-signs requests between
   your customers and buckets, supporting multiple client authentication methods.
-version:  0.6.0 # chart version
-appVersion: 0.6.0 # application version
+version:  0.7.0 # chart version
+appVersion: 0.7.0 # application version
 kubeVersion: ">=1.22.0-0" # kubernetes version
 home: https://github.com/freepik-company/bifrost
 sources:

docs/samples/bifrost.yaml

@@ -10,9 +10,8 @@ listener:
   options:
     readTimeout: 10s
     writeTimeout: 10s
-
-    # A value of 0 means no limit
-    maxConcurrentConnections: 1000
+    maxConcurrentConnections: 1000 # Zero (0) means no limit
+    disableKeepAlives: false
 
 # (Optional) Authentication configuration
 authentication:
@@ -65,3 +64,4 @@ target:
   options:
     dialTimeout: 10s
     keepAlive: 30s
+    disableKeepAlives: false

internal/httpserver/httpserver.go

@@ -294,6 +294,8 @@ func (s *HttpServer) handleRequest(response http.ResponseWriter, request *http.R
 			TLSClientConfig: &tls.Config{
 				InsecureSkipVerify: globals.Application.Config.Target.Tls.SkipVerify,
 			},
+
+			DisableKeepAlives: globals.Application.Config.Target.Options.DisableKeepAlives,
 		},
 	}
 
@@ -382,12 +384,13 @@ func (s *HttpServer) Run(httpAddr string) {
 
 	globals.Application.Logger.Infof("Starting HTTP server on %s", httpAddr)
 
-	// TODO: Configure and use the server previously crafted
+	// Configure and use the server previously crafted
 	s.SetAddr(httpAddr)
 	s.SetHandler(mux)
+	s.SetKeepAlivesEnabled(!globals.Application.Config.Listener.Options.DisableKeepAlives)
 
 	//
-	listener, err := net.Listen("tcp", s.Server.Addr)
+	listener, err := net.Listen("tcp", s.Addr)
 	if err != nil {
 		globals.Application.Logger.Errorf("Server failed. Reason: %s", err.Error())
 	}
@@ -397,7 +400,7 @@ func (s *HttpServer) Run(httpAddr string) {
 		limitedListener = netutil.LimitListener(listener, globals.Application.Config.Listener.Options.MaxConcurrentConnections)
 	}
 
-	err = s.Server.Serve(limitedListener)
+	err = s.Serve(limitedListener)
 	if err != nil {
 		globals.Application.Logger.Errorf("Server failed. Reason: %s", err.Error())
 	}