MEDIUM: add new server/bind options

Added: server pool-conn-name +1 server hash-key +1 bind ssl default-crt +1
haproxytech · Jun 24, 2024 · eb3d3b1 · eb3d3b1
1 parent 359262a
commit eb3d3b1
Show file tree

Hide file tree

Showing 16 changed files with 172 additions and 13 deletions.
diff --git a/configuration/bind.go b/configuration/bind.go
@@ -324,6 +324,11 @@ func parseBindParams(bindOptions []params.BindOption) (b models.BindParams) { //
 				b.CrtIgnoreErr = v.Value
 			case "crt-list":
 				b.CrtList = v.Value
+			case "default-crt":
+				if b.DefaultCrtList == nil {
+					b.DefaultCrtList = []string{}
+				}
+				b.DefaultCrtList = append(b.DefaultCrtList, v.Value)
 			case "gid":
 				gid, err := strconv.ParseInt(v.Value, 10, 64)
 				if err == nil {
@@ -485,6 +490,11 @@ func serializeBindParams(b models.BindParams, path string) (options []params.Bin
 	if b.CrtList != "" {
 		options = append(options, &params.BindOptionValue{Name: "crt-list", Value: b.CrtList})
 	}
+	if b.DefaultCrtList != nil {
+		for _, dc := range b.DefaultCrtList {
+			options = append(options, &params.BindOptionValue{Name: "default-crt", Value: dc})
+		}
+	}
 	if b.DeferAccept {
 		options = append(options, &params.BindOptionWord{Name: "defer-accept"})
 	}

diff --git a/configuration/server.go b/configuration/server.go
@@ -480,6 +480,10 @@ func parseServerParams(serverOptions []params.ServerOption, serverParams *models
 				}
 			case "ws":
 				serverParams.Ws = v.Value
+			case "pool-conn-name":
+				serverParams.PoolConnName = v.Value
+			case "hash-key":
+				serverParams.HashKey = v.Value
 			}
 		case *params.ServerOptionIDValue:
 			if v.Name == "set-proxy-v2-tlv-fmt" {
@@ -837,6 +841,12 @@ func serializeServerParams(s models.ServerParams) (options []params.ServerOption
 	if s.Ws != "" {
 		options = append(options, &params.ServerOptionValue{Name: "ws", Value: s.Ws})
 	}
+	if s.PoolConnName != "" {
+		options = append(options, &params.ServerOptionValue{Name: "pool-conn-name", Value: s.PoolConnName})
+	}
+	if s.HashKey != "" {
+		options = append(options, &params.ServerOptionValue{Name: "hash-key", Value: s.HashKey})
+	}
 	return options
 }
 

diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/google/go-cmp v0.6.0
 	github.com/google/renameio v1.0.1
 	github.com/google/uuid v1.6.0
-	github.com/haproxytech/config-parser/v5 v5.1.1-0.20240619192607-9ef3696c6fec
+	github.com/haproxytech/config-parser/v5 v5.1.1-0.20240624075631-c75eaad880c2
 	github.com/json-iterator/go v1.1.12
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/mitchellh/mapstructure v1.5.0

diff --git a/go.sum b/go.sum
@@ -32,8 +32,8 @@ github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU
 github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/haproxytech/config-parser/v5 v5.1.1-0.20240619192607-9ef3696c6fec h1:3tOw7lSODKXfZa+kZA+lCpmoucV9qrme0cIOX6dvLtc=
-github.com/haproxytech/config-parser/v5 v5.1.1-0.20240619192607-9ef3696c6fec/go.mod h1:uzi0JXWJYW31M1AzGsczaJtEaoG54qP0LX8B1A2iQRw=
+github.com/haproxytech/config-parser/v5 v5.1.1-0.20240624075631-c75eaad880c2 h1:sdgelGYw2i16OL47z2bYEiwjuH7KDWC4P9WLQ0BFZd0=
+github.com/haproxytech/config-parser/v5 v5.1.1-0.20240624075631-c75eaad880c2/go.mod h1:uzi0JXWJYW31M1AzGsczaJtEaoG54qP0LX8B1A2iQRw=
 github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=
 github.com/haproxytech/go-logger v1.1.0/go.mod h1:OekUd8HCb7ubxMplzHUPBTHNxZmddOWfOjWclZsqIeM=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=

diff --git a/models/bind_params.go b/models/bind_params.go
diff --git a/models/bind_params_compare.go b/models/bind_params_compare.go
diff --git a/models/bind_params_compare_test.go b/models/bind_params_compare_test.go
diff --git a/models/server_params.go b/models/server_params.go
diff --git a/models/server_params_compare.go b/models/server_params_compare.go
diff --git a/models/server_params_compare_test.go b/models/server_params_compare_test.go
diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml
@@ -281,6 +281,12 @@ definitions:
               x-dependency:
                   ssl:
                       value: true
+          default_crt_list:
+              items:
+                  pattern: ^[^\s]+$
+                  type: string
+              type: array
+              x-omitempty: true
           defer_accept:
               type: boolean
           ecdhe:
@@ -618,6 +624,9 @@ definitions:
           guid:
               pattern: ^[A-Za-z0-9-_.:]+$
               type: string
+          hash_key:
+              pattern: ^[^\s]+$
+              type: string
           health_check_address:
               pattern: ^[^\s]+$
               type: string
@@ -720,6 +729,9 @@ definitions:
               enum:
                   - shutdown-backup-sessions
               type: string
+          pool_conn_name:
+              pattern: ^[^\s]+$
+              type: string
           pool_low_conn:
               type: integer
               x-nullable: true

diff --git a/specification/models/configuration/bind_params.yaml b/specification/models/configuration/bind_params.yaml
@@ -80,6 +80,12 @@ bind_params:
       x-dependency:
         ssl:
           value: true
+    default_crt_list:
+      type: array
+      x-omitempty: true
+      items:
+        type: string
+        pattern: '^[^\s]+$'
     defer_accept:
       type: boolean
     expose_fd_listeners: