github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-22 12:08:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

doc: remove docs of deprecated directives (#6566)
Some checks are pending
Tests / goreleaser-check (push) Waiting to run
Details
Tests / test (./cmd/caddy/caddy, ~1.22.3, macos-14, 0, 1.22, mac) (push) Waiting to run
Details
Tests / test (./cmd/caddy/caddy, ~1.22.3, ubuntu-latest, 0, 1.22, linux) (push) Waiting to run
Details
Tests / test (./cmd/caddy/caddy, ~1.23.0, macos-14, 0, 1.23, mac) (push) Waiting to run
Details
Tests / test (./cmd/caddy/caddy, ~1.23.0, ubuntu-latest, 0, 1.23, linux) (push) Waiting to run
Details
Tests / test (./cmd/caddy/caddy.exe, ~1.22.3, windows-latest, True, 1.22, windows) (push) Waiting to run
Details
Tests / test (./cmd/caddy/caddy.exe, ~1.23.0, windows-latest, True, 1.23, windows) (push) Waiting to run
Details
Tests / test (s390x on IBM Z) (push) Waiting to run
Details
Cross-Build / build (~1.22.3, 1.22, aix) (push) Waiting to run
Details
Cross-Build / build (~1.22.3, 1.22, darwin) (push) Waiting to run
Details
Cross-Build / build (~1.22.3, 1.22, dragonfly) (push) Waiting to run
Details
Cross-Build / build (~1.22.3, 1.22, freebsd) (push) Waiting to run
Details
Cross-Build / build (~1.22.3, 1.22, illumos) (push) Waiting to run
Details
Cross-Build / build (~1.22.3, 1.22, linux) (push) Waiting to run
Details
Cross-Build / build (~1.22.3, 1.22, netbsd) (push) Waiting to run
Details
Cross-Build / build (~1.22.3, 1.22, openbsd) (push) Waiting to run
Details
Cross-Build / build (~1.22.3, 1.22, solaris) (push) Waiting to run
Details
Cross-Build / build (~1.22.3, 1.22, windows) (push) Waiting to run
Details
Cross-Build / build (~1.23.0, 1.23, aix) (push) Waiting to run
Details
Cross-Build / build (~1.23.0, 1.23, darwin) (push) Waiting to run
Details
Cross-Build / build (~1.23.0, 1.23, dragonfly) (push) Waiting to run
Details
Cross-Build / build (~1.23.0, 1.23, freebsd) (push) Waiting to run
Details
Cross-Build / build (~1.23.0, 1.23, illumos) (push) Waiting to run
Details
Cross-Build / build (~1.23.0, 1.23, linux) (push) Waiting to run
Details
Cross-Build / build (~1.23.0, 1.23, netbsd) (push) Waiting to run
Details
Cross-Build / build (~1.23.0, 1.23, openbsd) (push) Waiting to run
Details
Cross-Build / build (~1.23.0, 1.23, solaris) (push) Waiting to run
Details
Cross-Build / build (~1.23.0, 1.23, windows) (push) Waiting to run
Details
Lint / lint (windows-latest, windows) (push) Waiting to run
Details
Lint / govulncheck (push) Waiting to run
Details
Lint / lint (macos-14, mac) (push) Waiting to run
Details
Lint / lint (ubuntu-latest, linux) (push) Waiting to run
Details

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