fix: trusted_leaf_cert_file now works correctly#7601
Open
xingzihai wants to merge 1 commit intocaddyserver:masterfrom
Open
fix: trusted_leaf_cert_file now works correctly#7601xingzihai wants to merge 1 commit intocaddyserver:masterfrom
xingzihai wants to merge 1 commit intocaddyserver:masterfrom
Conversation
Issue caddyserver#4518 reported that trusted_leaf_cert_file does not behave as documented. The root cause was twofold: 1. In verifyConnection(), verifiers were called with nil as rawCerts instead of the actual peer certificates. This caused LeafCertClientAuth.VerifyClientCertificate to fail immediately with "no client certificate provided" because rawCerts was nil. 2. When only TrustedLeafCerts were specified (no CA certs), the default mode was set to RequireAndVerifyClientCert, which requires CA verification. Since no CA certs were provided, CA verification would fail and the handshake would abort before VerifyConnection (which does leaf verification) was ever called. Fixes: - Pass cs.PeerCertificatesRaw to verifiers in verifyConnection() - Only default to RequireAndVerifyClientCert when CA certs are actually provided, not when only TrustedLeafCerts are specified Fixes caddyserver#4518
|
|
Member
|
Missing the AI disclosure section (part of the PR template), and CLA needs to be signed. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #4518:
trusted_leaf_cert_filenow works correctly as documented.Root Cause
The issue had two root causes:
In
verifyConnection(), verifiers were called withnilasrawCertsinstead of the actual peer certificates. This causedLeafCertClientAuth.VerifyClientCertificateto fail immediately with "no client certificate provided".When only
TrustedLeafCertswere specified (no CA certs), the default mode was set toRequireAndVerifyClientCert, which requires CA verification. Since no CA certs were provided, CA verification would fail beforeVerifyConnectionwas called.Changes
cs.PeerCertificatesRawto verifiers inverifyConnection()RequireAndVerifyClientCertwhen CA certs are actually provided, not when onlyTrustedLeafCertsare specifiedFiles Changed
modules/caddytls/connpolicy.go: Fixed the two issues aboveCloses #4518