From bc3d497739444a5ce550696b7b0da36e6e3bc777 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Thu, 6 Mar 2025 08:54:40 -0700 Subject: [PATCH] caddytls: Fix broken refactor Not sure how that happened... --- caddyconfig/httpcaddyfile/options.go | 2 +- caddyconfig/httpcaddyfile/tlsapp.go | 2 +- modules/caddytls/ech.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/caddyconfig/httpcaddyfile/options.go b/caddyconfig/httpcaddyfile/options.go index 527676877..e48a52577 100644 --- a/caddyconfig/httpcaddyfile/options.go +++ b/caddyconfig/httpcaddyfile/options.go @@ -585,7 +585,7 @@ func parseOptECH(d *caddyfile.Dispenser, _ any) (any, error) { publicNames := d.RemainingArgs() for _, publicName := range publicNames { ech.Configs = append(ech.Configs, caddytls.ECHConfiguration{ - OuterSNI: publicName, + PublicName: publicName, }) } if len(ech.Configs) == 0 { diff --git a/caddyconfig/httpcaddyfile/tlsapp.go b/caddyconfig/httpcaddyfile/tlsapp.go index adac15065..8a21ca038 100644 --- a/caddyconfig/httpcaddyfile/tlsapp.go +++ b/caddyconfig/httpcaddyfile/tlsapp.go @@ -375,7 +375,7 @@ func (st ServerType) buildTLSApp( return nil, warnings, err } for _, cfg := range ech.Configs { - ap.SubjectsRaw = append(ap.SubjectsRaw, cfg.OuterSNI) + ap.SubjectsRaw = append(ap.SubjectsRaw, cfg.PublicName) } if tlsApp.Automation == nil { tlsApp.Automation = new(caddytls.AutomationConfig) diff --git a/modules/caddytls/ech.go b/modules/caddytls/ech.go index fa9d374f6..25b7a6923 100644 --- a/modules/caddytls/ech.go +++ b/modules/caddytls/ech.go @@ -136,7 +136,7 @@ func (ech *ECH) Provision(ctx caddy.Context) ([]string, error) { // current/active, so they can be used for ECH retries for _, cfg := range ech.Configs { - publicName := strings.ToLower(strings.TrimSpace(cfg.OuterSNI)) + publicName := strings.ToLower(strings.TrimSpace(cfg.PublicName)) if list, ok := ech.configs[publicName]; ok && len(list) > 0 { // at least one config with this public name was loaded, so find the