Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-08-30 23:02:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

httpcaddyfile: Fix acme_dns regression (#7199)

Browse Source
This commit is contained in:
Francis Lavoie 2025-08-22 17:09:25 -04:00 committed by GitHub
parent 16fe83c7af
commit 4564261d83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 92 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
caddyconfig/httpcaddyfile/tlsapp.go
View File

@ -564,21 +564,22 @@ func fillInGlobalACMEDefaults(issuer certmagic.Issuer, options map[string]any) e
if globalACMECARoot != nil && !slices.Contains(acmeIssuer.TrustedRootsPEMFiles, globalACMECARoot.(string)) { if globalACMECARoot != nil && !slices.Contains(acmeIssuer.TrustedRootsPEMFiles, globalACMECARoot.(string)) {
acmeIssuer.TrustedRootsPEMFiles = append(acmeIssuer.TrustedRootsPEMFiles, globalACMECARoot.(string)) acmeIssuer.TrustedRootsPEMFiles = append(acmeIssuer.TrustedRootsPEMFiles, globalACMECARoot.(string))
} }
if globalACMEDNSok && (acmeIssuer.Challenges == nil || acmeIssuer.Challenges.DNS == nil) { if globalACMEDNSok {
if globalACMEDNS == nil { globalDNS := options["dns"]
globalACMEDNS = options["dns"] if globalDNS != nil {
if globalACMEDNS == nil { // If global `dns` is set, do NOT set provider in issuer, just set empty dns config
return fmt.Errorf("acme_dns specified without DNS provider config, but no provider specified with 'dns' global option") acmeIssuer.Challenges = &caddytls.ChallengesConfig{
DNS: &caddytls.DNSChallengeConfig{},
} }
} } else if globalACMEDNS != nil {
acmeIssuer.Challenges = &caddytls.ChallengesConfig{ // Set a global DNS provider if `acme_dns` is set and `dns` is NOT set
DNS: new(caddytls.DNSChallengeConfig), acmeIssuer.Challenges = &caddytls.ChallengesConfig{
} DNS: &caddytls.DNSChallengeConfig{
} else if globalACMEDNS != nil { ProviderRaw: caddyconfig.JSONModuleObject(globalACMEDNS, "name", globalACMEDNS.(caddy.Module).CaddyModule().ID.Name(), nil),
acmeIssuer.Challenges = &caddytls.ChallengesConfig{ },
DNS: &caddytls.DNSChallengeConfig{ }
ProviderRaw: caddyconfig.JSONModuleObject(globalACMEDNS, "name", globalACMEDNS.(caddy.Module).CaddyModule().ID.Name(), nil), } else {
}, return fmt.Errorf("acme_dns specified without DNS provider config, but no provider specified with 'dns' global option")
} }
} }
if globalACMEEAB != nil && acmeIssuer.ExternalAccount == nil { if globalACMEEAB != nil && acmeIssuer.ExternalAccount == nil {

68
caddytest/integration/caddyfile_adapt/acme_dns_configured.caddyfiletest Normal file
View File

@ -0,0 +1,68 @@
{
acme_dns mock foo
}
example.com {
respond "Hello World"
}
----------
{
"apps": {
"http": {
"servers": {
"srv0": {
"listen": [
":443"
],
"routes": [
{
"match": [
{
"host": [
"example.com"
]
}
],
"handle": [
{
"handler": "subroute",
"routes": [
{
"handle": [
{
"body": "Hello World",
"handler": "static_response"
}
]
}
]
}
],
"terminal": true
}
]
}
}
},
"tls": {
"automation": {
"policies": [
{
"issuers": [
{
"challenges": {
"dns": {
"provider": {
"name": "mock"
}
}
},
"module": "acme"
}
]
}
]
}
}
}
}

9
caddytest/integration/caddyfile_adapt/acme_dns_naked_without_dns.caddyfiletest Normal file
View File

@ -0,0 +1,9 @@
{
acme_dns
}
example.com {
respond "Hello World"
}
----------
acme_dns specified without DNS provider config, but no provider specified with 'dns' global option