Skip to content

Commit 1b1b3e0

Browse files
vgramermjuraga
authored andcommitted
MINOR: bind: add experimental ktls parameter
Signed-off-by: Vincent Gramer <vgramer@haproxy.com>
1 parent 490a311 commit 1b1b3e0

19 files changed

Lines changed: 131 additions & 6 deletions

config-parser/params/bind-options.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ var bindOptionFactoryMethods = map[string]func() BindOption{ //nolint:gochecknog
317317
"default-crt": func() BindOption { return &BindOptionValue{Name: "default-crt"} },
318318

319319
"quic-cc-algo": func() BindOption { return &BindOptionParams{Name: "quic-cc-algo"} },
320+
"ktls": func() BindOption { return &BindOptionOnOff{Name: "ktls"} },
320321
}
321322

322323
// Parse ...

config-parser/tests/bind_generated_test.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/configs/haproxy_generated.cfg.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/default-bind_generated_test.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/integration/frontend_data_test.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/integration/frontend_test.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/integration/peers_data_test.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/integration/peers_test.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/types/types.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,10 @@ type ACL struct{}
272272
//test:fail:bind :443 user mode 600 accept-proxy
273273
//test:ok:bind :443 tcp-md5sig secretpass
274274
//test:fail:bind :443 tcp-md5sig
275+
//test:ok:bind :443 ktls on
276+
//test:ok:bind :443 ktls off
277+
//test:fail:bind :443 ktls
278+
//test:fail:bind :443 ktls something
275279
type Bind struct {
276280
Path string // can be address:port or socket path
277281
Params []params.BindOption
@@ -1593,6 +1597,10 @@ type OptionHTTPRestrictReqHdrNames struct {
15931597
//test:ok:default-bind tls-ticket-keys /tmp/tls_ticket_keys
15941598
//test:ok:default-bind tcp-md5sig secretpass
15951599
//test:fail:default-bind tcp-md5sig
1600+
//test:ok:default-bind ktls on
1601+
//test:ok:default-bind ktls off
1602+
//test:fail:default-bind ktls
1603+
//test:fail:default-bind ktls something
15961604
type DefaultBind struct {
15971605
Params []params.BindOption
15981606
Comment string

configuration/bind.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,11 @@ func parseBindParams(bindOptions []params.BindOption) (models.BindParams, string
435435
}
436436
}
437437
}
438+
case *params.BindOptionOnOff:
439+
switch v.Name {
440+
case "ktls":
441+
b.Ktls = v.Value
442+
}
438443
}
439444
}
440445
return b, name
@@ -722,6 +727,9 @@ func serializeBindParams(b models.BindParams, name string, path string, opt *opt
722727
if b.Nice != 0 {
723728
options = append(options, &params.BindOptionValue{Name: "nice", Value: strconv.FormatInt(b.Nice, 10)})
724729
}
730+
if b.Ktls != "" {
731+
options = append(options, &params.BindOptionOnOff{Name: "ktls", Value: b.Ktls})
732+
}
725733
return options
726734
}
727735

0 commit comments

Comments
 (0)