Commit ef8a940
Always set and fix up SSL options in LDAP plugin
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)1 parent 40398b9 commit ef8a940
File tree
2 files changed
+18
-16
lines changed- deps
- rabbit_common/src
- rabbitmq_auth_backend_ldap/src
2 files changed
+18
-16
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
43 | 42 | | |
44 | 43 | | |
45 | 44 | | |
| |||
Lines changed: 18 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
753 | 753 | | |
754 | 754 | | |
755 | 755 | | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
756 | 759 | | |
757 | | - | |
758 | | - | |
759 | | - | |
760 | | - | |
761 | | - | |
762 | | - | |
763 | | - | |
764 | | - | |
765 | | - | |
766 | | - | |
767 | | - | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
768 | 766 | | |
769 | 767 | | |
770 | | - | |
| 768 | + | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
771 | 774 | | |
772 | 775 | | |
773 | 776 | | |
774 | 777 | | |
775 | 778 | | |
776 | | - | |
| 779 | + | |
777 | 780 | | |
778 | | - | |
| 781 | + | |
779 | 782 | | |
780 | 783 | | |
781 | 784 | | |
| |||
797 | 800 | | |
798 | 801 | | |
799 | 802 | | |
800 | | - | |
| 803 | + | |
801 | 804 | | |
802 | 805 | | |
803 | 806 | | |
| |||
0 commit comments