mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-16 21:56:40 -05:00
chore: add warn logs when using deprecated fields (#6276)
This commit is contained in:
parent
2fc620d38d
commit
87c7127c28
3 changed files with 4 additions and 2 deletions
|
@ -69,8 +69,7 @@ func parseBind(h Helper) ([]ConfigValue, error) {
|
||||||
// curves <curves...>
|
// curves <curves...>
|
||||||
// client_auth {
|
// client_auth {
|
||||||
// mode [request|require|verify_if_given|require_and_verify]
|
// mode [request|require|verify_if_given|require_and_verify]
|
||||||
// trusted_ca_cert <base64_der>
|
// trust_pool <module_name> [...]
|
||||||
// trusted_ca_cert_file <filename>
|
|
||||||
// trusted_leaf_cert <base64_der>
|
// trusted_leaf_cert <base64_der>
|
||||||
// trusted_leaf_cert_file <filename>
|
// trusted_leaf_cert_file <filename>
|
||||||
// }
|
// }
|
||||||
|
|
|
@ -1112,6 +1112,7 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
|
||||||
h.TLS.HandshakeTimeout = caddy.Duration(dur)
|
h.TLS.HandshakeTimeout = caddy.Duration(dur)
|
||||||
|
|
||||||
case "tls_trusted_ca_certs":
|
case "tls_trusted_ca_certs":
|
||||||
|
caddy.Log().Warn("The 'tls_trusted_ca_certs' field is deprecated. Use the 'tls_trust_pool' field instead.")
|
||||||
args := d.RemainingArgs()
|
args := d.RemainingArgs()
|
||||||
if len(args) == 0 {
|
if len(args) == 0 {
|
||||||
return d.ArgErr()
|
return d.ArgErr()
|
||||||
|
|
|
@ -443,6 +443,7 @@ func (ca *ClientAuthentication) UnmarshalCaddyfile(d *caddyfile.Dispenser) error
|
||||||
return d.ArgErr()
|
return d.ArgErr()
|
||||||
}
|
}
|
||||||
case "trusted_ca_cert":
|
case "trusted_ca_cert":
|
||||||
|
caddy.Log().Warn("The 'trusted_ca_cert' field is deprecated. Use the 'trust_pool' field instead.")
|
||||||
if len(ca.CARaw) != 0 {
|
if len(ca.CARaw) != 0 {
|
||||||
return d.Err("cannot specify both 'trust_pool' and 'trusted_ca_cert' or 'trusted_ca_cert_file'")
|
return d.Err("cannot specify both 'trust_pool' and 'trusted_ca_cert' or 'trusted_ca_cert_file'")
|
||||||
}
|
}
|
||||||
|
@ -456,6 +457,7 @@ func (ca *ClientAuthentication) UnmarshalCaddyfile(d *caddyfile.Dispenser) error
|
||||||
}
|
}
|
||||||
ca.TrustedLeafCerts = append(ca.TrustedLeafCerts, d.Val())
|
ca.TrustedLeafCerts = append(ca.TrustedLeafCerts, d.Val())
|
||||||
case "trusted_ca_cert_file":
|
case "trusted_ca_cert_file":
|
||||||
|
caddy.Log().Warn("The 'trusted_ca_cert_file' field is deprecated. Use the 'trust_pool' field instead.")
|
||||||
if len(ca.CARaw) != 0 {
|
if len(ca.CARaw) != 0 {
|
||||||
return d.Err("cannot specify both 'trust_pool' and 'trusted_ca_cert' or 'trusted_ca_cert_file'")
|
return d.Err("cannot specify both 'trust_pool' and 'trusted_ca_cert' or 'trusted_ca_cert_file'")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue