-
Notifications
You must be signed in to change notification settings - Fork 3.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix a bug that causes LDAP TLS connection flags to not be set properly #4190
fix a bug that causes LDAP TLS connection flags to not be set properly #4190
Conversation
Build succeeded.
|
awx/sso/backends.py
Outdated
# | ||
# see: https://github.com/python-ldap/python-ldap/issues/55 | ||
self.CONNECTION_OPTIONS = OrderedDict( | ||
(k, v) for k, v in sorted(self.CONNECTION_OPTIONS.items()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like there are at least a couple of OPT_X_TLS..
options that come after OPT_X_TLS_NEWCTX
(here's the list I get when looking at python-ldap). These would get put after OPT_X_TLS_NEWCTX
if we apply the above sort.
Should we form an OrderedDict then explicitly append OPT_X_TLS_NEWCTX
to the end? Something like this maybe:
(k, v) for k, v in sorted(self.CONNECTION_OPTIONS.items()) | |
newctx_option = self.CONNECTION_OPTIONS.pop(ldap.OPT_X_TLS_NEWCTX, None) | |
self.CONNECTION_OPTIONS = OrderedDict(self.CONNECTION_OPTIONS) | |
if newctx_option: | |
self.CONNECTION_OPTIONS[dap.OPT_X_TLS_NEWCTX] = newctx_option |
d2f98bd
to
caf1f3e
Compare
co-authored-by: Jim Ladd <jladd@redhat.com>
caf1f3e
to
11b3698
Compare
Build succeeded.
|
Build succeeded (gate pipeline).
|
co-authored-by: Jim Ladd jladd@redhat.com