blackbeard420/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-03-09 15:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fill out Caddyfile support

Browse Source
This commit is contained in:
Matthew Holt 2025-02-26 20:50:08 -08:00
parent d527ac3486
commit 29a8776a82
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
caddyconfig/httpcaddyfile/options.go
View File

@ -580,26 +580,6 @@ func parseOptDNS(d *caddyfile.Dispenser, _ any) (any, error) {
func parseOptECH(d *caddyfile.Dispenser, _ any) (any, error) {
d.Next() // consume option name
// outers := d.RemainingArgs()
// for nesting := d.Nesting(); d.NextBlock(nesting); {
// switch d.Val() {
// case "dns":
// if !d.Next() { // get the DNS module name
// return nil, d.ArgErr()
// }
// modID := "dns.providers." + d.Val()
// unm, err := caddyfile.UnmarshalModule(d, modID)
// if err != nil {
// return nil, err
// }
// rs, ok := unm.(libdns.RecordSetter)
// if !ok {
// return nil, d.Errf("module %s (%T) is not a libdns.RecordSetter", modID, unm)
// }
// }
// }
ech := new(caddytls.ECH)
publicNames := d.RemainingArgs()

19
caddyconfig/httpcaddyfile/tlsapp.go
View File

@ -359,9 +359,28 @@ func (st ServerType) buildTLSApp(
tlsApp.Automation.OnDemand = onDemand
}
// set up "global" (to the TLS app) DNS provider config
if globalDNS, ok := options["dns"]; ok && globalDNS != nil {
tlsApp.DNSRaw = caddyconfig.JSONModuleObject(globalDNS, "name", globalDNS.(caddy.Module).CaddyModule().ID.Name(), nil)
}
// set up ECH from Caddyfile options
if ech, ok := options["ech"].(*caddytls.ECH); ok {
tlsApp.EncryptedClientHello = ech
// outer server names will need certificates, so make sure they're included
// in an automation policy for them that applies any global options
ap, err := newBaseAutomationPolicy(options, warnings, true)
if err != nil {
return nil, warnings, err
}
for _, cfg := range ech.Configs {
ap.SubjectsRaw = append(ap.SubjectsRaw, cfg.OuterSNI)
}
if tlsApp.Automation == nil {
tlsApp.Automation = new(caddytls.AutomationConfig)
}
tlsApp.Automation.Policies = append(tlsApp.Automation.Policies, ap)
}
// if the storage clean interval is a boolean, then it's "off" to disable cleaning