Always set and fix up TLS options in LDAP plugin (backport #14937) #14940
+18
−16
Conversation
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
There's an edge case in LDAP SSL configuration. If you set...
```
auth_ldap.use_ssl = true
```
...but nothing else, you'll eventually hit this error:
```
{error, {options, incompatible,
[{verify, verify_peer}, {cacerts, undefined}]}}
```
This is due to the fact that without any SSL options, the
`rabbit_ssl_options:fix_client/1` function won't be hit, and thus system
certs won't be added via `public_key:cacerts_get/0` and `cacerts`
option.
This PR adds `verify, verify_peer` as the default SSL option and ensures
that `rabbit_ssl_options:fix_client/1` is always called. Since
`verify_peer` is the default since OTP 26, we can just add it here.
(cherry picked from commit 0f3e5b4)
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.
There's an edge case in LDAP SSL configuration. If you set...
...but nothing else, you'll eventually hit this error:
This is due to the fact that without any SSL options, the
rabbit_ssl_options:fix_client/1function won't be hit, and thus system certs won't be added viapublic_key:cacerts_get/0andcacertsoption.This PR adds
verify, verify_peeras the default SSL option and ensures thatrabbit_ssl_options:fix_client/1is always called. Sinceverify_peeris the default since OTP 26, we can just add it here.This is an automatic backport of pull request #14937 done by Mergify.