certloader: Correctly support RequestClientCert in WatchedClientConfig #26812
Conversation
This file contains 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
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
chancez
added
the
release-note/misc
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
|
Went with release-note/misc since it seems the only user of the modified method (within cilium/cilium) is in our tests. |
rolinh
approved these changes
Jul 14, 2023
rolinh
added
the
needs-backport/1.14
|
This is technically a bug, marking for backport to v1.14 and v1.13 as per our backport policy. |
rolinh
added
the
needs-backport/1.13
kaworu
requested changes
Jul 14, 2023
Only configure GetClientCertificate if client keypair is configured, allowing servers to Request ClientCertificates without requiring them. In docs for `GetClientCertificate` it specifies: > GetClientCertificate must return a non-nil Certificate. If > Certificate.Certificate is empty then no certificate will be sent to the > server. If a nil certificate is sent when the server requests a client certificate, the client will return an error. Instead, only configure GetClientCertificate if certificates are provided and the server may choose to how to handle the lack of a client certificate. This is needed primarily for when the server is using RequestClientCert, which requests a certificate, but does not require the client to send one. Previously, you would see this log message: ``` transport: authentication handshake failed: mTLS client certificate requested, but not provided ``` Now, if a server requires a client certificate it should reject the TLS connection and the client will receive the error from the server. Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com>
chancez
force-pushed
the
pr/chancez/tls_fix_clientconfig
branch
from
2d16f87
to
2d4e4d9
Compare
|
@kaworu good point. I wrote a simple unit test verifying GetClientCertificate is nil when no keypair is provided. I considered doing an httpserver test, but wasn't sure that much was needed since this behavior is well documented and should be tested in the stdlib. |
|
/test |
aditighag
reviewed
Jul 17, 2023
maintainer-s-little-helper
bot
added
the
ready-to-merge
gandro
added
backport-pending/1.14
gandro
removed
the
backport-pending/1.14
gandro
added
the
backport-done/1.14
gandro
added
backport-pending/1.13
maintainer-s-little-helper
bot
moved this from Needs backport from main
to Backport done to v1.14
in 1.14.0
maintainer-s-little-helper
bot
moved this from Needs backport from main
to Backport pending to v1.13
in 1.13.5
gandro
added
backport-done/1.13
maintainer-s-little-helper
bot
moved this from Backport pending to v1.13
to Backport done to v1.13
in 1.13.5
maintainer-s-little-helper
bot
moved this from Backport pending to v1.13
to Backport done to v1.13
in 1.13.5
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Only configure GetClientCertificate if client keypair is configured, allowing servers to Request ClientCertificates without requiring them.
In docs for
GetClientCertificateit specifies:If a nil certificate is sent when the server requests a client certificate, the client will return an error. Instead, only configure GetClientCertificate if certificates are provided and the server may choose to how to handle the lack of a client certificate.
This is needed primarily for when the server is using RequestClientCert, which requests a certificate, but does not require the client to send one.
Previously, you would see this log message produced by the clients using
WatchedClientConfig.GetClientCertificate:Now, if a server requires a client certificate it should reject the TLS connection and the client will receive the error from the server.
I also discovered the same issue in Hubble CLI here: cilium/hubble#1123, though it doesn't use this package.