Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

doc: remove docs of deprecated directives (#6566)

Browse source 
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
This commit is contained in:
Mohammed Al Sahaf 2024-09-29 12:12:52 +03:00 committed by GitHub
parent 22c98ea165
commit 1a345b4fa6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/caddytls/connpolicy.go
View file

@ -555,16 +555,10 @@ type ClientAuthentication struct {
// trust_pool <module> { // trust_pool <module> {
// ... // ...
// } // }
// trusted_leaf_cert <base64_der>
// trusted_leaf_cert_file <filename>
// verifier <module> // verifier <module>
// } // }
// //
// If `mode` is not provided, it defaults to `require_and_verify` if any of the following are provided: // If `mode` is not provided, it defaults to `require_and_verify` if `trust_pool` is provided.
// - `trusted_leaf_certs`
// - `trusted_leaf_cert_file`
// - `trust_pool`
//
// Otherwise, it defaults to `require`. // Otherwise, it defaults to `require`.
func (ca *ClientAuthentication) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { func (ca *ClientAuthentication) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
for d.NextArg() { for d.NextArg() {
@ -768,7 +762,7 @@ func (clientauth *ClientAuthentication) ConfigureTLSConfig(cfg *tls.Config) erro
if len(clientauth.TrustedCACerts) > 0 || if len(clientauth.TrustedCACerts) > 0 ||
len(clientauth.TrustedCACertPEMFiles) > 0 || len(clientauth.TrustedCACertPEMFiles) > 0 ||
len(clientauth.TrustedLeafCerts) > 0 || len(clientauth.TrustedLeafCerts) > 0 ||
clientauth.CARaw != nil { clientauth.CARaw != nil || clientauth.ca != nil {
cfg.ClientAuth = tls.RequireAndVerifyClientCert cfg.ClientAuth = tls.RequireAndVerifyClientCert
} else { } else {
cfg.ClientAuth = tls.RequireAnyClientCert cfg.ClientAuth = tls.RequireAnyClientCert